You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hu...@apache.org on 2022/10/20 02:27:07 UTC
[iotdb] 01/01: Merge remote-tracking branch 'origin/master' into lmh/intoOperator
This is an automated email from the ASF dual-hosted git repository.
hui pushed a commit to branch lmh/intoOperator
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 25dd212c8b513f79e456d6e8c6756f176e71175f
Merge: 3c38bebe90 723ecb42cf
Author: Minghui Liu <li...@foxmail.com>
AuthorDate: Thu Oct 20 10:25:11 2022 +0800
Merge remote-tracking branch 'origin/master' into lmh/intoOperator
# Conflicts:
# server/src/main/java/org/apache/iotdb/db/mpp/common/header/ColumnHeaderConstant.java
.gitignore | 1 +
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 6 +-
.../main/java/org/apache/iotdb/tool/ImportCsv.java | 20 +-
.../resources/conf/iotdb-confignode.properties | 29 +-
.../confignode/client/DataNodeRequestType.java | 1 +
.../client/async/AsyncDataNodeClientPool.java | 7 +
.../client/async/handlers/AsyncClientHandler.java | 1 +
.../iotdb/confignode/conf/ConfigNodeConfig.java | 180 ++++++++-
.../confignode/conf/ConfigNodeDescriptor.java | 96 ++++-
.../confignode/conf/ConfigNodeRemoveCheck.java | 4 +-
.../confignode/conf/SystemPropertiesUtils.java | 24 +-
.../consensus/request/ConfigPhysicalPlan.java | 22 +-
.../consensus/request/ConfigPhysicalPlanType.java | 8 +-
.../{GetRoutingPlan.java => GetRegionIdPlan.java} | 10 +-
...ePlan.java => GetTransferringTriggersPlan.java} | 8 +-
.../request/read/GetTriggerTablePlan.java | 22 +-
.../sync/DropPipePlan.java} | 28 +-
.../write/trigger/UpdateTriggerLocationPlan.java | 76 ++++
.../trigger/UpdateTriggersOnTransferNodesPlan.java | 75 ++++
.../{GetRoutingResp.java => GetRegionIdResp.java} | 10 +-
.../response/TransferringTriggersResp.java | 27 +-
.../statemachine/PartitionRegionStateMachine.java | 16 +-
.../iotdb/confignode/manager/ConfigManager.java | 56 ++-
.../iotdb/confignode/manager/ConsensusManager.java | 27 +-
.../apache/iotdb/confignode/manager/IManager.java | 12 +-
.../iotdb/confignode/manager/SyncManager.java | 8 +-
.../iotdb/confignode/manager/TriggerManager.java | 95 ++++-
.../iotdb/confignode/manager/load/LoadManager.java | 6 +-
.../manager/load/balancer/RouteBalancer.java | 6 +-
.../manager/load/balancer/router/IRouter.java | 2 +-
.../load/balancer/router/LazyGreedyRouter.java | 2 +-
.../manager/load/balancer/router/LeaderRouter.java | 2 +-
.../balancer/router/LoadScoreGreedyRouter.java | 2 +-
.../iotdb/confignode/manager/node/NodeManager.java | 128 ++++++-
.../manager/partition/PartitionManager.java | 8 +-
.../iotdb/confignode/persistence/NodeInfo.java | 2 -
.../iotdb/confignode/persistence/TriggerInfo.java | 50 ++-
.../persistence/executor/ConfigPlanExecutor.java | 24 +-
.../persistence/partition/PartitionInfo.java | 12 +-
.../partition/StorageGroupPartitionTable.java | 6 +-
.../persistence/sync/ClusterSyncInfo.java | 43 +--
.../confignode/procedure/ProcedureExecutor.java | 2 +-
.../procedure/env/ConfigNodeProcedureEnv.java | 19 -
.../procedure/impl/CreateTriggerProcedure.java | 5 +-
.../impl/node/AddConfigNodeProcedure.java | 7 +-
.../impl/sync/AbstractOperatePipeProcedure.java | 6 +-
.../procedure/impl/sync/CreatePipeProcedure.java | 3 +-
.../procedure/impl/sync/DropPipeProcedure.java | 12 +-
.../iotdb/confignode/service/ConfigNode.java | 19 +-
.../confignode/service/ConfigNodeCommandLine.java | 5 +-
.../thrift/ConfigNodeRPCServiceProcessor.java | 30 +-
.../request/ConfigPhysicalPlanSerDeTest.java | 87 ++++-
.../load/balancer/router/LazyGreedyRouterTest.java | 8 +-
.../load/balancer/router/LeaderRouterTest.java | 6 +-
.../balancer/router/LoadScoreGreedyRouterTest.java | 2 +-
.../thrift/ConfigNodeRPCServiceProcessorTest.java | 338 ----------------
.../confignode1conf/iotdb-confignode.properties | 3 +-
.../confignode2conf/iotdb-confignode.properties | 3 +-
.../confignode3conf/iotdb-confignode.properties | 1 +
consensus/pom.xml | 2 +-
.../apache/iotdb/consensus/config/RatisConfig.java | 122 +++++-
.../multileader/logdispatcher/LogDispatcher.java | 18 +-
.../multileader/logdispatcher/PendingBatch.java | 11 +-
.../ratis/FileInfoWithDelayedMd5Computing.java | 75 ----
.../iotdb/consensus/ratis/RatisConsensus.java | 7 +-
.../iotdb/consensus/ratis/SnapshotStorage.java | 2 +-
.../org/apache/iotdb/consensus/ratis/Utils.java | 8 +
.../multileader/logdispatcher/SyncStatusTest.java | 25 +-
.../apache/iotdb/consensus/ratis/SnapshotTest.java | 3 +
docs/UserGuide/Cluster/Cluster-Concept.md | 18 +-
docs/UserGuide/Cluster/Cluster-Setup.md | 12 +-
docs/UserGuide/Delete-Data/TTL.md | 16 +-
.../Maintenance-Tools/Maintenance-Command.md | 100 ++++-
docs/zh/UserGuide/Cluster/Cluster-Setup.md | 12 +-
docs/zh/UserGuide/Delete-Data/TTL.md | 18 +-
.../Maintenance-Tools/Maintenance-Command.md | 99 ++++-
example/kafka/pom.xml | 2 +-
.../iotdb/trigger/ClusterAlertingExample.java | 8 +-
.../org/apache/iotdb/trigger/LoggerTrigger.java | 86 +++++
.../util/TSFileConfigUtilCompletenessTest.java | 3 +-
integration-test/checkstyle.xml | 8 +-
integration-test/import-control.xml | 81 ++--
.../trigger/example/TriggerFireTimesCounter.java | 87 +++++
.../java/org/apache/iotdb/it/env/AbstractEnv.java | 76 +++-
.../java/org/apache/iotdb/it/env/MppConfig.java | 11 +-
.../org/apache/iotdb/it/env/RemoteServerEnv.java | 14 +-
.../org/apache/iotdb/it/utils/TsFileGenerator.java | 232 +++++++++++
.../org/apache/iotdb/itbase/env/BaseConfig.java | 8 +-
.../java/org/apache/iotdb/itbase/env/BaseEnv.java | 8 +-
.../{ => it}/IoTDBClusterPartitionIT.java | 117 ++++--
.../iotdb/confignode/it/IoTDBClusterRestartIT.java | 88 +++++
.../confignode/{ => it}/IoTDBConfigNodeIT.java | 10 +-
.../{ => it}/IoTDBConfigNodeSnapshotIT.java | 8 +-
.../iotdb/confignode/it/IoTDBStorageGroupIT.java | 183 +++++++++
.../org/apache/iotdb/db/it/IOTDBLoadTsFileIT.java | 340 +++++++----------
.../java/org/apache/iotdb/db/it/IoTDBFilterIT.java | 24 +-
.../org/apache/iotdb/db/it/IoTDBFilterNullIT.java | 3 +
.../it/aggregation/IoTDBAggregationByLevelIT.java | 3 +
.../it/aggregation/IoTDBAggregationDeleteIT.java | 3 +
.../aggregation/IoTDBAggregationScanOrderIT.java | 3 +
.../aggregation/IoTDBAggregationSmallDataIT.java | 3 +
.../db/it/aggregation/IoTDBTagAggregationIT.java | 3 +
.../aligned/IoTDBAggregationWithDeletion2IT.java | 1 +
.../it/aligned/IoTDBAggregationWithDeletionIT.java | 1 +
.../db/it/aligned/IoTDBAlignedLastQuery2IT.java | 1 +
.../db/it/aligned/IoTDBAlignedLastQuery3IT.java | 1 +
.../db/it/aligned/IoTDBAlignedLastQueryIT.java | 1 +
.../db/it/aligned/IoTDBAlignedSeriesQuery2IT.java | 1 +
.../db/it/aligned/IoTDBAlignedSeriesQuery3IT.java | 1 +
.../db/it/aligned/IoTDBAlignedSeriesQueryIT.java | 1 +
.../IoTDBAlignedSeriesQueryWithDeletionIT.java | 1 +
.../db/it/aligned/IoTDBGroupByLevelQueryIT.java | 1 +
...GroupByQueryWithValueFilterWithDeletion2IT.java | 1 +
...BGroupByQueryWithValueFilterWithDeletionIT.java | 1 +
...upByQueryWithoutValueFilterWithDeletion2IT.java | 1 +
...oupByQueryWithoutValueFilterWithDeletionIT.java | 1 +
.../it/aligned/IoTDBLastQueryWithDeletion2IT.java | 1 +
.../it/aligned/IoTDBLastQueryWithDeletionIT.java | 1 +
.../aligned/IoTDBLastQueryWithoutLastCache2IT.java | 1 +
.../aligned/IoTDBLastQueryWithoutLastCacheIT.java | 1 +
...DBLastQueryWithoutLastCacheWithDeletion2IT.java | 1 +
...TDBLastQueryWithoutLastCacheWithDeletionIT.java | 1 +
...BRawQueryWithoutValueFilterWithDeletion2IT.java | 1 +
...DBRawQueryWithoutValueFilterWithDeletionIT.java | 1 +
.../org/apache/iotdb/db/it/env/StandaloneEnv.java | 14 +-
.../org/apache/iotdb/db/it/sync/IoTDBPipeIT.java | 69 +++-
.../apache/iotdb/db/it/sync/IoTDBPipeSinkIT.java | 7 +-
.../db/it/trigger/IoTDBTriggerExecutionIT.java | 265 +++++++++++++
.../db/it/{aligned => utils}/AlignedWriteUtil.java | 2 +-
.../db/it/withoutNull/IoTDBWithoutAllNullIT.java | 3 +
.../db/it/withoutNull/IoTDBWithoutAnyNullIT.java | 3 +
.../withoutNull/IoTDBWithoutNullAllFilterIT.java | 3 +
.../withoutNull/IoTDBWithoutNullAnyFilterIT.java | 3 +
.../{ => it}/IoTDBSessionAlignedInsertIT.java | 4 +-
.../session/{ => it}/IoTDBSessionComplexIT.java | 4 +-
.../{ => it}/IoTDBSessionDisableMemControlIT.java | 4 +-
.../session/{ => it}/IoTDBSessionInsertNulIT.java | 6 +-
.../IoTDBSessionInsertWithTriggerExecutionIT.java | 337 ++++++++++++++++
.../session/{ => it}/IoTDBSessionSimpleIT.java | 4 +-
.../{ => it}/IoTDBSessionSyntaxConventionIT.java | 4 +-
.../{SessionTest.java => it/SessionIT.java} | 9 +-
.../src/test/resources/TriggerFireTimesCounter.jar | Bin 0 -> 1324 bytes
...IoTDBLoadExternalTsFileWithTimePartitionIT.java | 329 ----------------
.../db/integration/IoTDBRepeatPatternNameIT.java | 67 ++++
...ception.java => PipeAlreadyExistException.java} | 12 +-
.../exception/sync/PipeNotExistException.java | 4 -
.../sync/PipeSinkAlreadyExistException.java} | 16 +-
...eption.java => PipeSinkBeingUsedException.java} | 12 +-
.../sync/PipeSinkNotExistException.java} | 16 +-
.../commons/executable/ExecutableManager.java | 11 +
.../commons/partition/DataPartitionTable.java | 4 +-
.../commons/partition/SchemaPartitionTable.java | 2 +-
.../commons/partition/SeriesPartitionTable.java | 2 +-
.../apache/iotdb/commons/path/PatternTreeMap.java | 44 ++-
.../iotdb/commons/sync/metadata/SyncMetadata.java | 122 +++---
.../commons/sync/persistence/SyncLogReader.java | 31 +-
.../apache/iotdb/commons/sync/pipe/PipeStatus.java | 1 -
.../iotdb/commons/trigger/TriggerInformation.java | 15 +
.../apache/iotdb/commons/trigger/TriggerTable.java | 40 ++
.../commons/sync/metedata/SyncMetadataTest.java | 189 +++++++++
.../java/org/apache/iotdb/RewriteTsFileTool.java | 249 +++++++++++-
.../resources/conf/iotdb-datanode.properties | 28 ++
.../apache/iotdb/db/client/ConfigNodeClient.java | 43 ++-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 138 +++++++
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 35 ++
.../db/consensus/DataRegionConsensusImpl.java | 25 ++
.../db/consensus/SchemaRegionConsensusImpl.java | 25 ++
.../impl/ReadChunkCompactionPerformer.java | 21 +-
.../iotdb/db/engine/flush/MemTableFlushTask.java | 10 +-
.../iotdb/db/engine/load/AlignedChunkData.java | 9 +-
.../org/apache/iotdb/db/engine/load/ChunkData.java | 14 +-
.../apache/iotdb/db/engine/load/DeletionData.java | 72 ++++
.../iotdb/db/engine/load/LoadTsFileManager.java | 29 +-
.../iotdb/db/engine/load/NonAlignedChunkData.java | 1 +
.../load/{ChunkData.java => TsFileData.java} | 42 +-
.../iotdb/db/engine/storagegroup/DataRegion.java | 16 +-
.../db/engine/storagegroup/TsFileManager.java | 5 +-
.../db/engine/storagegroup/TsFileProcessor.java | 6 +-
.../storagegroup/timeindex/DeviceTimeIndex.java | 5 +-
.../query/QueryTimeoutRuntimeException.java | 9 +
.../db/mpp/common/header/ColumnHeaderConstant.java | 18 +-
.../db/mpp/common/header/DatasetHeaderFactory.java | 4 +-
.../execution/exchange/MPPDataExchangeService.java | 8 +-
.../execution/executor/RegionWriteExecutor.java | 36 +-
.../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java | 15 +-
.../db/mpp/plan/execution/QueryExecution.java | 15 +-
.../plan/execution/config/ConfigTaskVisitor.java | 9 +-
.../config/executor/ClusterConfigTaskExecutor.java | 30 +-
.../config/executor/IConfigTaskExecutor.java | 4 +-
.../executor/StandaloneConfigTaskExecutor.java | 4 +-
.../{GetRegionTask.java => GetRegionIdTask.java} | 22 +-
.../mpp/plan/expression/leaf/ConstantOperand.java | 4 +-
.../plan/expression/leaf/TimeSeriesOperand.java | 9 +
.../iotdb/db/mpp/plan/parser/ASTVisitor.java | 12 +-
.../plan/node/load/LoadSingleTsFileNode.java | 69 +++-
.../planner/plan/node/load/LoadTsFileNode.java | 3 +
.../plan/node/load/LoadTsFilePieceNode.java | 35 +-
.../plan/scheduler/load/LoadTsFileScheduler.java | 7 +
.../db/mpp/plan/statement/StatementVisitor.java | 6 +-
.../plan/statement/crud/LoadTsFileStatement.java | 4 +-
...ionStatement.java => GetRegionIdStatement.java} | 6 +-
.../dag/input/ConstantInputReader.java | 3 +-
.../transformation/dag/util/TransformUtils.java | 3 +-
.../metadata/DiskAlignedChunkMetadataLoader.java | 2 +-
.../chunk/metadata/DiskChunkMetadataLoader.java | 2 +-
.../org/apache/iotdb/db/rescon/SystemInfo.java | 7 +-
.../java/org/apache/iotdb/db/service/DataNode.java | 4 -
.../impl/DataNodeInternalRPCServiceImpl.java | 52 +++
.../java/org/apache/iotdb/db/sync/SyncService.java | 170 ++++-----
.../db/sync/common/ClusterSyncInfoFetcher.java | 7 +-
.../iotdb/db/sync/common/ISyncInfoFetcher.java | 4 +-
.../apache/iotdb/db/sync/common/LocalSyncInfo.java | 22 +-
.../iotdb/db/sync/common/LocalSyncInfoFetcher.java | 11 +-
.../org/apache/iotdb/db/sync/sender/pipe/Pipe.java | 7 +
.../iotdb/db/sync/sender/pipe/TsFilePipe.java | 49 ++-
.../db/sync/transport/client/SenderManager.java | 2 +
.../iotdb/db/trigger/executor/TriggerExecutor.java | 41 +-
.../db/trigger/executor/TriggerFireResult.java | 57 +++
.../db/trigger/executor/TriggerFireVisitor.java | 423 +++++++++++++++++++++
.../trigger/service/TriggerManagementService.java | 85 +++++
.../java/org/apache/iotdb/db/utils/QueryUtils.java | 16 +-
.../apache/iotdb/db/utils/sync/SyncPipeUtil.java | 2 +-
.../ReadChunkCompactionPerformerAlignedTest.java | 79 ++++
.../db/engine/storagegroup/DataRegionTest.java | 40 ++
.../iotdb/db/metadata/path/PatternTreeMapTest.java | 88 +++--
.../db/mpp/common/schematree/NodeRefTest.java | 47 +++
.../manager => persistence}/LocalSyncInfoTest.java | 23 +-
.../recovery => persistence}/SyncLogTest.java | 36 +-
.../java/org/apache/iotdb/rpc/TSStatusCode.java | 2 +
.../src/main/thrift/confignode.thrift | 81 ++--
thrift/src/main/thrift/datanode.thrift | 30 ++
.../iotdb/tsfile/common/conf/TSFileConfig.java | 10 +
.../file/metadata/AlignedTimeSeriesMetadata.java | 15 +
.../iotdb/tsfile/file/metadata/ChunkMetadata.java | 18 +
.../tsfile/file/metadata/TimeseriesMetadata.java | 7 +
.../iotdb/tsfile/read/filter/operator/Regexp.java | 48 ++-
.../tsfile/write/chunk/AlignedChunkWriterImpl.java | 12 +
.../apache/iotdb/tsfile/write/record/Tablet.java | 341 ++++++++++++++++-
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 4 +
.../iotdb/tsfile/write/record/TabletTest.java | 65 ++++
240 files changed, 6385 insertions(+), 1990 deletions(-)