This is an automated email from the ASF dual-hosted git repository. cdutz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit c84581ad20bf061583bdebef61a06bd2df317df1 Merge: d650a88fa62 b07fafe3954 Author: Christofer Dutz <[email protected]> AuthorDate: Tue Jan 23 14:06:55 2024 +0100 Merge remote-tracking branch 'upstream/master' example/client-cpp-example/README.md | 2 +- .../it/cluster/IoTDBClusterRestartIT.java | 70 ++ .../IoTDBOrderByLimitOffsetAlignByDeviceIT.java | 37 + .../apache/iotdb/pipe/it/IoTDBPipeDataSinkIT.java | 46 - .../apache/iotdb/pipe/it/IoTDBPipeNullValueIT.java | 320 +++++++ .../src/assembly/resources/tools/collect-info.bat | 267 ++++++ .../tools/{collection-info.sh => collect-info.sh} | 212 +++-- .../assembly/resources/tools/collection-info.bat | 275 ------ iotdb-client/client-cpp/README.md | 20 +- .../src/assembly/resources/conf/confignode-env.bat | 2 +- .../resources/conf/iotdb-confignode.properties | 5 - ...register-confignode.sh => daemon-confignode.sh} | 24 +- .../heartbeat/DataNodeHeartbeatHandler.java | 2 +- .../iotdb/confignode/conf/ConfigNodeConfig.java | 17 +- .../confignode/conf/ConfigNodeDescriptor.java | 8 - .../iotdb/confignode/manager/ConfigManager.java | 79 +- .../manager/consensus/ConsensusManager.java | 2 - .../confignode/manager/load/cache/LoadCache.java | 2 +- .../manager/load/cache/node/BaseNodeCache.java | 2 +- .../load/cache/node/ConfigNodeHeartbeatCache.java | 2 +- .../load/cache/node/DataNodeHeartbeatCache.java | 2 +- .../load/cache/node/NodeHeartbeatSample.java | 6 +- .../manager/load/cache/node/NodeStatistics.java | 2 +- .../manager/load/cache/region/RegionCache.java | 5 +- .../load/cache/region/RegionHeartbeatSample.java | 2 +- .../manager/load/service/HeartbeatService.java | 4 +- .../pipe/coordinator/runtime/PipeMetaSyncer.java | 3 + .../iotdb/confignode/persistence/AuthorInfo.java | 5 - .../persistence/executor/ConfigPlanExecutor.java | 9 +- .../partition/DatabasePartitionTable.java | 11 + .../persistence/partition/PartitionInfo.java | 22 +- .../persistence/partition/RegionGroup.java | 15 + .../procedure/env/ConfigNodeProcedureEnv.java | 2 +- .../iotdb/confignode/service/ConfigNode.java | 2 +- .../thrift/ConfigNodeRPCServiceProcessor.java | 2 +- .../router/priority/GreedyPriorityTest.java | 6 +- .../priority/LeaderPriorityBalancerTest.java | 6 +- .../manager/load/cache/LoadCacheTest.java | 2 +- .../manager/load/cache/NodeCacheTest.java | 6 +- .../manager/load/cache/RegionGroupCacheTest.java | 6 +- .../manager/load/cache/RegionRouteCacheTest.java | 2 +- .../iotdb/consensus/config/IoTConsensusConfig.java | 16 - .../apache/iotdb/consensus/config/RatisConfig.java | 30 - .../exception/RatisReadUnavailableException.java | 13 +- .../iot/client/IoTConsensusClientPool.java | 2 - .../consensus/iot/logdispatcher/LogDispatcher.java | 24 +- .../iotdb/consensus/ratis/RatisConsensus.java | 20 +- .../apache/iotdb/consensus/ratis/utils/Utils.java | 6 +- .../iotdb/consensus/ratis/RatisConsensusTest.java | 50 +- .../iotdb/consensus/ratis/RecoverReadTest.java | 6 +- .../src/assembly/resources/conf/datanode-env.bat | 2 +- .../resources/conf/iotdb-datanode.properties | 7 +- .../{register-datanode.sh => daemon-datanode.sh} | 24 +- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 53 +- .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 44 +- .../db/consensus/DataRegionConsensusImpl.java | 2 - .../db/consensus/SchemaRegionConsensusImpl.java | 1 - .../agent/runtime/PipePeriodicalJobExecutor.java | 5 + .../db/pipe/agent/runtime/PipeRuntimeAgent.java | 9 +- .../db/pipe/agent/task/PipeTaskDataNodeAgent.java | 118 ++- .../builder/PipeTransferBatchReqBuilder.java | 75 +- .../request/PipeTransferTabletBatchReq.java | 60 +- .../protocol/airgap/IoTDBAirGapConnector.java | 9 +- .../thrift/async/IoTDBThriftAsyncConnector.java | 47 +- .../PipeTransferTabletBatchEventHandler.java | 3 +- .../thrift/sync/IoTDBThriftSyncConnector.java | 8 +- .../protocol/writeback/WriteBackConnector.java | 11 +- .../apache/iotdb/db/pipe/event/EnrichedEvent.java | 41 +- .../tablet/PipeInsertNodeTabletInsertionEvent.java | 13 +- .../common/tablet/PipeRawTabletInsertionEvent.java | 11 + .../tablet/TabletInsertionDataContainer.java | 152 +++- .../common/tsfile/PipeTsFileInsertionEvent.java | 19 +- .../pipe/extractor/IoTDBDataRegionExtractor.java | 34 +- .../PipeHistoricalDataRegionTsFileExtractor.java | 54 +- .../PipeRealtimeDataRegionHybridExtractor.java | 9 +- .../iotdb/db/pipe/metric/PipeExtractorMetrics.java | 7 +- .../resource/tsfile/PipeTsFileResourceManager.java | 33 +- .../pipe/resource/wal/PipeWALResourceManager.java | 41 +- .../iotdb/db/pipe/task/PipeDataNodeTask.java | 30 + .../db/pipe/task/subtask/PipeDataNodeSubtask.java | 105 ++- .../subtask/connector/PipeConnectorSubtask.java | 166 ++-- .../subtask/processor/PipeProcessorSubtask.java | 14 +- .../protocol/client/DataNodeClientPoolFactory.java | 2 - .../common/header/ColumnHeaderConstant.java | 1 + .../queryengine/execution/driver/DataDriver.java | 1 + .../execution/driver/DataDriverContext.java | 16 +- .../fragment/FragmentInstanceContext.java | 4 + .../execution/load/LoadTsFileManager.java | 148 ++- .../execution/operator/AggregationUtil.java | 6 + .../process/join/LeftOuterTimeJoinOperator.java | 11 +- .../execution/schedule/DriverScheduler.java | 7 +- .../db/queryengine/plan/analyze/Analysis.java | 10 +- .../queryengine/plan/execution/QueryExecution.java | 3 + .../execution/config/metadata/ShowRegionTask.java | 7 +- .../OrderByExpressionWithLimitChangeToTopK.java | 309 +++++++ .../plan/planner/LocalExecutionPlanner.java | 7 +- .../plan/planner/LogicalPlanBuilder.java | 119 ++- .../plan/planner/LogicalPlanVisitor.java | 21 +- .../plan/planner/OperatorTreeGenerator.java | 4 +- .../plan/planner/TemplatedLogicalPlan.java | 22 +- .../planner/distribution/DistributionPlanner.java | 11 +- .../planner/distribution/ExchangeNodeAdder.java | 2 +- .../plan/planner/distribution/SourceRewriter.java | 21 +- .../plan/planner/plan/LogicalQueryPlan.java | 6 +- .../plan/planner/plan/PlanFragment.java | 5 + .../plan/planner/plan/node/process/FillNode.java | 5 + .../plan/planner/plan/node/process/OffsetNode.java | 5 + .../plan/planner/plan/node/process/SortNode.java | 5 + .../plan/planner/plan/node/process/TopKNode.java | 6 +- .../plan/parameter/AggregationDescriptor.java | 14 +- .../scheduler/FixedRateFragInsStateTracker.java | 8 +- .../scheduler/FragmentInstanceDispatcherImpl.java | 30 +- .../plan/scheduler/load/LoadTsFileScheduler.java | 8 +- .../plan/statement/crud/QueryStatement.java | 2 +- .../mtree/impl/mem/mnode/info/LogicalViewInfo.java | 2 +- .../mtree/impl/pbtree/MTreeBelowSGCachedImpl.java | 2 +- .../mtree/impl/pbtree/flush/Scheduler.java | 192 ++-- .../impl/pbtree/memory/ReleaseFlushMonitor.java | 5 +- .../mtree/impl/pbtree/schemafile/RecordUtils.java | 55 +- .../mtree/impl/pbtree/schemafile/SchemaFile.java | 7 +- .../impl/pbtree/schemafile/WrappedSegment.java | 13 +- .../schemafile/pagemgr/BTreePageManager.java | 18 +- .../pbtree/schemafile/pagemgr/IPageManager.java | 3 + .../pbtree/schemafile/pagemgr/PageIOChannel.java | 184 ++++ .../schemafile/pagemgr/PageIndexSortBuckets.java | 129 +++ .../pbtree/schemafile/pagemgr/PageManager.java | 476 +--------- .../impl/pbtree/schemafile/pagemgr/PagePool.java | 152 ++++ .../schemafile/pagemgr/SchemaPageContext.java | 109 +++ .../db/service/metrics/DataNodeMetricsHelper.java | 2 +- .../iotdb/db/service/metrics/WritingMetrics.java | 49 +- .../iotdb/db/storageengine/StorageEngine.java | 23 +- .../db/storageengine/dataregion/DataRegion.java | 68 +- .../impl/ReadChunkCompactionPerformer.java | 19 +- .../execute/task/CompactionTaskSummary.java | 44 +- .../execute/task/CrossSpaceCompactionTask.java | 6 +- .../execute/task/InnerSpaceCompactionTask.java | 7 +- .../task/InsertionCrossSpaceCompactionTask.java | 8 +- .../execute/utils/MultiTsFileDeviceIterator.java | 4 + .../execute/utils/executor/ModifiedStatus.java} | 15 +- .../fast/AlignedSeriesCompactionExecutor.java | 1 + .../fast/NonAlignedSeriesCompactionExecutor.java | 1 + .../executor/fast/SeriesCompactionExecutor.java | 6 +- .../ReadChunkAlignedSeriesCompactionExecutor.java | 466 ++++++++++ .../readchunk/SingleSeriesCompactionExecutor.java | 4 +- .../executor/readchunk/loader/ChunkLoader.java | 104 +++ .../readchunk/loader/InstantChunkLoader.java | 105 +++ .../readchunk/loader/InstantPageLoader.java | 103 +++ .../executor/readchunk/loader/PageLoader.java | 107 +++ .../execute/utils/reader/PointPriorityReader.java | 2 +- .../compaction/io/CompactionTsFileReader.java | 18 + .../compaction/schedule/CompactionScheduler.java | 2 +- .../compaction/schedule/CompactionTaskManager.java | 3 +- .../compaction/schedule/CompactionWorker.java | 3 + .../estimator/CompactionEstimateUtils.java | 43 +- .../impl/SizeTieredCompactionSelector.java | 41 +- .../InsertionCrossCompactionTaskResource.java | 25 + .../dataregion/memtable/AbstractMemTable.java | 18 + .../dataregion/memtable/IMemTable.java | 2 + .../dataregion/memtable/TsFileProcessor.java | 7 + .../dataregion/tsfile/TsFileResource.java | 26 +- .../dataregion/utils/TsFileResourceUtils.java | 75 +- .../dataregion/wal/buffer/WALBuffer.java | 59 +- .../wal/checkpoint/CheckpointManager.java | 50 +- .../dataregion/wal/checkpoint/MemTableInfo.java | 22 +- .../dataregion/wal/io/WALByteBufReader.java | 26 +- .../dataregion/wal/io/WALMetaData.java | 76 +- .../storageengine/dataregion/wal/node/WALNode.java | 213 ++--- .../dataregion/wal/recover/WALNodeRecoverTask.java | 41 +- .../wal/recover/file/TsFilePlanRedoer.java | 2 + .../db/tools/schema/PBTreeFileSketchTool.java | 2 +- .../org/apache/iotdb/db/utils/SchemaUtils.java | 27 +- .../metadata/mtree/schemafile/SchemaFileTest.java | 2 +- .../connector/PipeDataNodeThriftRequestTest.java | 69 ++ .../pipe/event/PipeTabletInsertionEventTest.java | 93 +- .../join/LeftOuterTimeJoinOperatorTest.java | 290 +++++- .../plan/planner/PipelineBuilderTest.java | 55 ++ .../distribution/AggregationDistributionTest.java | 33 +- .../AlignByDeviceOrderByLimitOffsetTest.java | 988 ++++++++++++++++++--- .../AlignByTimeOrderByLimitOffsetTest.java | 316 +++++++ .../storageengine/dataregion/DataRegionTest.java | 48 +- .../compaction/CompactionValidationTest.java | 103 +++ .../FastInnerCompactionPerformerTest.java | 108 +++ .../compaction/ReadChunkInnerCompactionTest.java | 144 +++ .../InsertionCrossSpaceCompactionSelectorTest.java | 4 +- .../cross/InsertionCrossSpaceCompactionTest.java | 6 +- ...nkCompactionPerformerWithAlignedSeriesTest.java | 715 +++++++++++++++ .../compaction/utils/CompactionCheckerUtils.java | 8 +- .../compaction/utils/CompactionTestFileWriter.java | 8 +- .../dataregion/wal/node/WALEntryHandlerTest.java | 13 +- .../wal/node/WalDeleteOutdatedNewTest.java | 585 ++++++++++++ .../wal/recover/WALRecoverWriterTest.java | 9 +- .../resources/conf/iotdb-cluster.properties | 5 +- .../resources/conf/iotdb-common.properties | 49 +- .../sbin/{clean-all.bat => destroy-all.bat} | 22 +- .../sbin/{clean-all.sh => destroy-all.sh} | 59 +- ...clean-confignode.bat => destroy-confignode.bat} | 34 +- .../{clean-confignode.sh => destroy-confignode.sh} | 7 +- .../{clean-datanode.bat => destroy-datanode.bat} | 14 +- .../{clean-datanode.sh => destroy-datanode.sh} | 7 +- .../src/assembly/resources/sbin/start-all.sh | 9 +- .../src/assembly/resources/sbin/stop-all.sh | 15 +- .../commons/auth/authorizer/BasicAuthorizer.java | 1 - .../iotdb/commons/auth/role/BasicRoleManager.java | 6 + .../commons/auth/role/LocalFileRoleAccessor.java | 12 +- .../commons/auth/role/LocalFileRoleManager.java | 6 + .../iotdb/commons/auth/user/BasicUserManager.java | 1 + .../commons/auth/user/LocalFileUserAccessor.java | 23 +- .../commons/auth/user/LocalFileUserManager.java | 5 + .../iotdb/commons/client/ClientPoolFactory.java | 29 +- .../client/property/ClientPoolProperty.java | 35 +- .../apache/iotdb/commons/conf/CommonConfig.java | 48 +- .../iotdb/commons/conf/CommonDescriptor.java | 33 +- .../commons/pipe/agent/task/PipeTaskAgent.java | 90 +- .../iotdb/commons/pipe/config/PipeConfig.java | 20 +- .../commons/pipe/task/meta/PipeMetaKeeper.java | 4 + .../commons/pipe/task/subtask/PipeSubtask.java | 15 +- .../schema/view/viewExpression/ViewExpression.java | 18 + .../service/metric/JvmGcMonitorMetrics.java | 10 +- .../service/metric}/cpu/CpuUsageMetrics.java | 23 +- .../org/apache/iotdb/commons/utils/FileUtils.java | 8 +- .../iotdb/commons/client/ClientManagerTest.java | 47 +- .../file/metadata/AlignedTimeSeriesMetadata.java | 1 + .../iotdb/tsfile/read/TsFileSequenceReader.java | 3 +- .../tsfile/read/reader/page/AlignedPageReader.java | 7 +- .../apache/iotdb/tsfile/write/record/Tablet.java | 26 +- .../src/main/thrift/confignode.thrift | 1 + pom.xml | 2 +- 227 files changed, 8699 insertions(+), 2579 deletions(-)
