This is an automated email from the ASF dual-hosted git repository. zyk pushed a commit to branch table-model-debug in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit f3efdc23967151226d462affd83dd87643fc1450 Merge: 691823c0dcf 4392c97a181 Author: MarcosZyk <[email protected]> AuthorDate: Sun Apr 28 10:09:27 2024 +0800 Merge branch 'ty/TableModelGrammar' into table-model-debug .../org/apache/iotdb/db/it/IoTDBTimeZoneIT.java | 2 +- .../apache/iotdb/tools/it/ExportDataTestIT.java | 6 +- .../apache/iotdb/tools/it/ImportDataTestIT.java | 4 +- .../cli/src/assembly/resources/tools/backup.bat | 125 +++ .../cli/src/assembly/resources/tools/backup.sh | 134 +++ .../org/apache/iotdb/tool/AbstractDataTool.java | 1 + .../java/org/apache/iotdb/tool/ExportData.java | 21 +- .../java/org/apache/iotdb/tool/ImportData.java | 73 +- .../org/apache/iotdb/tool/IoTDBDataBackTool.java | 985 +++++++++++++++++++++ .../confignode/conf/ConfigNodeDescriptor.java | 1 + .../confignode/conf/ConfigNodeRemoveCheck.java | 5 +- .../confignode/conf/SystemPropertiesUtils.java | 3 +- .../consensus/request/ConfigPhysicalPlan.java | 1 + .../consensus/request/ConfigPhysicalPlanType.java | 1 + .../request/ConfigPhysicalPlanVisitor.java | 6 + .../consensus/request/auth/AuthorPlan.java | 3 + .../response/pipe/task/PipeTableResp.java | 8 +- .../confignode/manager/PermissionManager.java | 3 +- .../iotdb/confignode/manager/ProcedureManager.java | 93 +- .../iotdb/confignode/manager/load/LoadManager.java | 8 +- .../manager/load/balancer/PartitionBalancer.java | 10 +- .../manager/load/balancer/RouteBalancer.java | 32 +- .../manager/partition/PartitionManager.java | 14 +- .../receiver/IoTDBConfigNodeReceiverAgent.java | 6 +- .../protocol/IoTDBConfigRegionAirGapConnector.java | 5 +- .../pipe/event/PipeConfigRegionSnapshotEvent.java | 53 +- .../pipe/event/PipeConfigRegionWritePlanEvent.java | 46 +- .../extractor/ConfigRegionListeningFilter.java | 5 +- .../pipe/extractor/IoTDBConfigRegionExtractor.java | 13 +- .../receiver/protocol/IoTDBConfigNodeReceiver.java | 1 + .../PipeConfigPhysicalPlanTSStatusVisitor.java | 9 + .../iotdb/confignode/persistence/AuthorInfo.java | 3 + .../persistence/executor/ConfigPlanExecutor.java | 1 + .../partition/DatabasePartitionTable.java | 11 +- .../persistence/partition/PartitionInfo.java | 11 +- .../schema/CNPhysicalPlanGenerator.java | 9 +- .../procedure/env/RegionMaintainHandler.java | 122 ++- .../impl/pipe/task/AlterPipeProcedureV2.java | 2 +- .../impl/region/AddRegionPeerProcedure.java | 28 +- .../impl/region/RemoveRegionPeerProcedure.java | 2 +- .../confignode/persistence/AuthorInfoTest.java | 21 + .../persistence/CNPhysicalPlanGeneratorTest.java | 3 + .../consensus/iot/IoTConsensusServerImpl.java | 47 +- .../consensus/iot/logdispatcher/LogDispatcher.java | 8 + .../apache/iotdb/consensus/iot/ReplicateTest.java | 36 +- .../src/assembly/resources/conf/datanode-env.bat | 3 - .../src/assembly/resources/conf/datanode-env.sh | 3 - .../assembly/resources/conf/logback-datanode.xml | 15 - .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 2 +- .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 12 +- .../db/conf/rest/IoTDBRestServiceDescriptor.java | 1 + .../metadata/view/BrokenViewException.java | 13 +- .../PipeDataRegionProcessorConstructor.java | 3 + .../agent/receiver/PipeDataNodeReceiverAgent.java | 5 - .../db/pipe/agent/task/PipeDataNodeTaskAgent.java | 9 + .../request/PipeTransferTabletInsertNodeReq.java | 46 +- .../airgap/IoTDBDataRegionAirGapConnector.java | 9 +- .../airgap/IoTDBSchemaRegionAirGapConnector.java | 5 +- .../protocol/legacy/IoTDBLegacyPipeConnector.java | 14 +- .../connector/protocol/opcua/OpcUaConnector.java | 4 +- .../thrift/sync/IoTDBDataRegionSyncConnector.java | 10 +- .../protocol/websocket/WebSocketConnector.java | 17 +- .../websocket/WebSocketConnectorServer.java | 5 +- .../db/pipe/event/common/row/PipeRowCollector.java | 4 +- .../schema/PipeSchemaRegionSnapshotEvent.java | 64 +- .../schema/PipeSchemaRegionWritePlanEvent.java | 44 +- .../tablet/PipeInsertNodeTabletInsertionEvent.java | 122 ++- .../common/tablet/PipeRawTabletInsertionEvent.java | 5 + .../tablet/TabletInsertionDataContainer.java | 15 +- .../common/tsfile/PipeTsFileInsertionEvent.java | 34 + .../common/tsfile/TsFileInsertionPointCounter.java | 169 ++++ .../common/watermark/PipeWatermarkEvent.java} | 23 +- .../dataregion/DataRegionWatermarkInjector.java | 76 ++ .../dataregion/IoTDBDataRegionExtractor.java | 82 +- .../PipeHistoricalDataRegionTsFileExtractor.java | 24 +- .../realtime/PipeRealtimeDataRegionExtractor.java | 6 +- .../schemaregion/IoTDBSchemaRegionExtractor.java | 13 +- .../processor/aggregate/AggregateProcessor.java | 3 +- .../pipe/processor/twostage/combiner/Combiner.java | 107 +++ .../twostage/combiner/PipeCombineHandler.java | 198 +++++ .../combiner/PipeCombineHandlerManager.java | 163 ++++ .../twostage/exchange/payload/CombineRequest.java | 139 +++ .../payload/FetchCombineResultRequest.java | 119 +++ .../payload/FetchCombineResultResponse.java | 99 +++ .../twostage/exchange/payload/RequestType.java} | 36 +- .../receiver/TwoStageAggregateReceiver.java | 82 ++ .../exchange/sender/TwoStageAggregateSender.java | 235 +++++ .../processor/twostage/operator/CountOperator.java | 52 ++ .../processor/twostage/operator/Operator.java} | 16 +- .../twostage/plugin/TwoStageCountProcessor.java | 391 ++++++++ .../pipe/processor/twostage/state/CountState.java} | 36 +- .../db/pipe/processor/twostage/state/State.java} | 18 +- .../legacy/IoTDBLegacyPipeReceiverAgent.java | 1 - .../protocol/thrift/IoTDBDataNodeReceiver.java | 72 +- .../thrift/IoTDBDataNodeReceiverAgent.java | 3 + .../visitor/PipePlanToStatementVisitor.java | 105 ++- .../visitor/PipeStatementTSStatusVisitor.java | 57 +- .../visitor/PipeStatementToBatchVisitor.java | 185 ++++ .../pipe/task/connection/PipeEventCollector.java | 3 +- .../subtask/processor/PipeProcessorSubtask.java | 57 +- .../rest/utils/InsertTabletSortDataUtils.java | 16 +- .../protocol/thrift/impl/ClientRPCServiceImpl.java | 4 +- .../execution/executor/RegionWriteExecutor.java | 12 +- .../execution/operator/AggregationUtil.java | 2 +- .../process/join/merge/MergeSortComparator.java | 20 + .../relational/ColumnTransformerBuilder.java | 512 +++++++---- .../db/queryengine/plan/analyze/TypeProvider.java | 80 +- .../analyze/cache/partition/PartitionCache.java | 1 + .../visitor/ColumnTransformerVisitor.java | 2 +- .../visitor/CompleteMeasurementSchemaVisitor.java | 6 +- .../predicate/ConvertPredicateToFilterVisitor.java | 2 +- .../plan/planner/LocalExecutionPlanner.java | 6 +- .../plan/planner/LogicalPlanBuilder.java | 24 +- .../plan/planner/LogicalPlanVisitor.java | 6 +- .../plan/planner/OperatorTreeGenerator.java | 20 +- .../plan/planner/SubPlanTypeExtractor.java | 11 +- .../plan/planner/TableOperatorGenerator.java | 181 +++- .../plan/planner/TemplatedLogicalPlan.java | 4 +- .../plan/planner/distribution/SourceRewriter.java | 2 +- .../planner/plan/node/write/InsertRowsNode.java | 9 +- .../ConvertPredicateToTimeFilterVisitor.java | 3 +- .../relational/metadata/TableMetadataImpl.java | 51 +- .../plan/relational/planner/LogicalPlanner.java | 12 +- .../plan/relational/planner/PlanBuilder.java | 74 +- .../plan/relational/planner/QueryPlanner.java | 91 +- .../plan/relational/planner/RelationPlanner.java | 13 +- .../TableModelTypeProviderExtractor.java | 46 +- .../relational/planner/ir/ExpressionRewriter.java | 14 +- .../planner/ir/ExpressionTranslateVisitor.java | 147 +++ .../planner/ir/ExpressionTreeRewriter.java | 84 +- .../ExtractCommonPredicatesExpressionRewriter.java | 22 +- .../ir/GlobalTimePredicateExtractVisitor.java | 247 ++++++ .../plan/relational/planner/ir/IrVisitor.java | 25 - .../planner/ir/NormalizeOrExpressionRewriter.java | 10 +- .../relational/planner/ir/RewritingVisitor.java | 221 +++++ .../plan/relational/planner/node/LimitNode.java | 8 +- .../relational/planner/node/MergeSortNode.java | 33 +- .../plan/relational/planner/node/OffsetNode.java | 8 +- .../plan/relational/planner/node/SortNode.java | 12 +- .../plan/relational/planner/node/TopKNode.java | 43 +- .../planner/optimizations/IndexScan.java | 10 +- .../ternary/CompareTernaryColumnTransformer.java | 24 - .../column/ternary/TernaryColumnTransformer.java | 23 + .../column/unary/scalar/DiffColumnTransformer.java | 73 ++ .../unary/scalar/Replace2ColumnTransformer.java | 66 ++ .../scalar/Replace3ColumnTransformer.java} | 71 +- .../unary/scalar/RoundColumnTransformer.java | 78 ++ .../unary/scalar/SubString2ColumnTransformer.java | 63 ++ .../unary/scalar/SubString3ColumnTransformer.java | 78 ++ .../iotdb/db/service/RegionMigrateService.java | 10 +- .../impl/ReadChunkCompactionPerformer.java | 12 +- .../execute/utils/MultiTsFileDeviceIterator.java | 146 +-- .../dataregion/snapshot/SnapshotLoader.java | 12 +- .../dataregion/tsfile/TsFileResource.java | 2 +- .../storageengine/dataregion/wal/node/WALNode.java | 7 +- .../broker/SubscriptionPrefetchingQueue.java | 28 +- .../db/tools/schema/SRStatementGenerator.java | 104 ++- .../db/auth/user/LocalFileUserManagerTest.java | 8 + .../extractor/IoTDBDataRegionExtractorTest.java | 32 +- .../execution/operator/OperatorMemoryTest.java | 18 +- .../plan/planner/PipelineBuilderTest.java | 22 +- .../plan/relational/analyzer/AnalyzerTest.java | 2 + .../utils/MultiTsFileDeviceIteratorTest.java | 70 ++ .../dataregion/wal/WALManagerTest.java | 5 + .../dataregion/wal/node/WALNodeTest.java | 5 + .../wal/node/WalDeleteOutdatedNewTest.java | 5 + .../db/utils/SchemaRegionSnapshotParserTest.java | 86 +- .../src/assembly/resources/sbin/start-all.sh | 2 +- .../src/assembly/resources/sbin/stop-all.sh | 2 +- .../commons/auth/authorizer/BasicAuthorizer.java | 12 +- .../iotdb/commons/auth/authorizer/IAuthorizer.java | 2 + .../iotdb/commons/auth/user/BasicUserManager.java | 16 +- .../iotdb/commons/auth/user/IUserManager.java | 3 +- .../commons/concurrent/IoTDBThreadPoolFactory.java | 12 - .../apache/iotdb/commons/conf/CommonConfig.java | 41 + .../iotdb/commons/conf/CommonDescriptor.java | 22 + .../commons/consensus/index/ProgressIndex.java | 7 +- .../commons/consensus/index/ProgressIndexType.java | 7 +- .../consensus/index/impl/HybridProgressIndex.java | 4 + .../consensus/index/impl/MetaProgressIndex.java | 2 +- .../consensus/index/impl/StateProgressIndex.java | 234 +++++ .../iotdb/commons/pipe/config/PipeConfig.java | 30 + .../config/constant/PipeExtractorConstant.java | 4 + .../config/constant/PipeProcessorConstant.java | 2 + .../request/IoTDBConnectorRequestVersion.java | 1 + .../commons/pipe/event/PipeSnapshotEvent.java | 19 +- .../commons/pipe/event/PipeWritePlanEvent.java | 35 +- .../pipe/plugin/builtin/BuiltinPipePlugin.java | 2 + .../twostage/TwoStageCountProcessor.java} | 23 +- .../commons/pipe/receiver/IoTDBFileReceiver.java | 20 +- .../commons/pipe/task/meta/PipeStaticMeta.java | 29 +- .../iotdb/commons/pipe/task/meta/PipeTaskMeta.java | 28 +- .../org/apache/iotdb/commons/utils/FileUtils.java | 18 + iotdb-doap.rdf | 26 +- pom.xml | 2 +- 195 files changed, 7255 insertions(+), 1509 deletions(-)
