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/11/29 12:20:14 UTC
[iotdb] 02/03: merge master
This is an automated email from the ASF dual-hosted git repository.
hui pushed a commit to branch lmh/scanOpBatchProcess
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit d04cb5992cb336583b6bb9c2529b79f05d150220
Merge: 52a78f284b 40de3ad14e
Author: Minghui Liu <li...@foxmail.com>
AuthorDate: Tue Nov 29 11:58:21 2022 +0800
merge master
.github/workflows/client-go.yml | 4 +-
.github/workflows/client-python.yml | 4 +-
.github/workflows/site-build.yml | 33 +-
.../iotdb/confignode/conf/ConfigNodeConfig.java | 104 +-
.../confignode/conf/ConfigNodeDescriptor.java | 65 +-
.../confignode/conf/SystemPropertiesUtils.java | 6 +-
.../confignode/manager/ClusterSchemaManager.java | 14 +
.../iotdb/confignode/manager/ConfigManager.java | 44 +-
.../iotdb/confignode/manager/ConsensusManager.java | 21 +-
.../manager/load/balancer/RegionBalancer.java | 4 +-
.../manager/load/balancer/RouteBalancer.java | 4 +-
.../iotdb/confignode/manager/node/NodeManager.java | 2 +-
.../partition/DataRegionGroupExtensionPolicy.java | 36 +-
.../manager/partition/PartitionManager.java | 192 +-
.../procedure/env/ConfigNodeProcedureEnv.java | 2 +-
.../procedure/env/DataNodeRemoveHandler.java | 15 +-
.../procedure/state/CreateRegionGroupsState.java | 2 +-
.../iotdb/confignode/service/ConfigNode.java | 2 +-
consensus/pom.xml | 7 -
.../common/request/IndexedConsensusRequest.java | 2 +-
.../consensus/iot/wal/ConsensusReqReader.java | 4 +-
.../org/apache/iotdb/consensus/ratis/Utils.java | 4 +
docs/UserGuide/Cluster/Cluster-Concept.md | 2 +-
docs/UserGuide/Cluster/Cluster-Setup.md | 68 +-
docs/UserGuide/FAQ/Frequently-asked-questions.md | 4 +
docs/UserGuide/Monitor-Alert/Metric-Tool.md | 56 +-
docs/UserGuide/QuickStart/QuickStart.md | 49 +-
docs/UserGuide/Reference/Common-Config-Manual.md | 281 +-
docs/zh/UserGuide/Cluster/Cluster-Concept.md | 2 +-
docs/zh/UserGuide/Cluster/Cluster-Setup.md | 59 +-
.../zh/UserGuide/FAQ/Frequently-asked-questions.md | 5 +
docs/zh/UserGuide/Monitor-Alert/Metric-Tool.md | 74 +-
docs/zh/UserGuide/QuickStart/QuickStart.md | 38 +-
.../zh/UserGuide/Reference/Common-Config-Manual.md | 304 +-
...json => Apache IoTDB ConfigNode Dashboard.json} | 1440 ++++-
...0.json => Apache IoTDB DataNode Dashboard.json} | 2377 +++++--
.../standalone/Apache IoTDB Dashboard v0.14.0.json | 1519 -----
.../java/org/apache/iotdb/it/env/MppConfig.java | 25 +-
.../org/apache/iotdb/itbase/env/BaseConfig.java | 26 +-
.../it/IoTDBClusterRegionLeaderBalancingIT.java | 19 +-
.../it/partition/IoTDBPartitionDurableIT.java | 4 +-
.../it/partition/IoTDBPartitionGetterIT.java | 82 +-
.../it/partition/IoTDBRegionGroupExtensionIT.java | 156 +
.../resources/conf/iotdb-common.properties | 79 +-
.../src/assembly/resources/sbin/iotdb-common.sh | 2 +-
.../assembly/resources/sbin/start-standalone.bat | 42 +
.../assembly/resources/sbin/start-standalone.sh | 43 +
.../assembly/resources/sbin/stop-standalone.bat | 40 +
.../src/assembly/resources/sbin/stop-standalone.sh | 40 +
.../apache/iotdb/commons/service/ServiceType.java | 2 +-
.../apache/iotdb/db/client/ConfigNodeClient.java | 8 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 16 +-
.../compaction/CompactionExceptionHandler.java | 6 +-
.../db/engine/compaction/CompactionUtils.java | 91 +-
.../constant/CrossCompactionPerformer.java | 11 +-
.../constant/InnerSeqCompactionPerformer.java | 11 +-
.../constant/InnerUnseqCompactionPerformer.java | 12 +-
.../compaction/cross/CrossSpaceCompactionTask.java | 27 +-
.../RewriteCrossSpaceCompactionSelector.java | 13 +-
.../task/FastCompactionPerformerSubTask.java | 146 +
.../utils/AlignedSeriesCompactionExecutor.java | 339 +
.../cross/utils/ChunkMetadataElement.java | 56 +
.../compaction/cross/utils/FileElement.java} | 25 +-
.../utils/NonAlignedSeriesCompactionExecutor.java | 208 +
.../engine/compaction/cross/utils/PageElement.java | 101 +
.../compaction/cross/utils/PointElement.java | 50 +
.../cross/utils/SeriesCompactionExecutor.java | 591 ++
.../compaction/inner/InnerSpaceCompactionTask.java | 23 +-
.../inner/utils/MultiTsFileDeviceIterator.java | 110 +-
.../compaction/performer/ICompactionPerformer.java | 8 +-
.../performer/impl/FastCompactionPerformer.java | 294 +
.../impl/ReadPointCompactionPerformer.java | 93 +-
.../compaction/reader/PointPriorityReader.java | 152 +
.../compaction/task/SubCompactionTaskSummary.java | 40 +
.../writer/AbstractCompactionWriter.java | 289 +-
.../writer/AbstractCrossCompactionWriter.java | 233 +
.../writer/AbstractInnerCompactionWriter.java | 108 +
.../writer/CrossSpaceCompactionWriter.java | 256 -
.../writer/FastCrossCompactionWriter.java | 203 +
.../writer/FastInnerCompactionWriter.java | 212 +
.../writer/InnerSpaceCompactionWriter.java | 140 -
.../writer/ReadPointCrossCompactionWriter.java | 94 +
.../writer/ReadPointInnerCompactionWriter.java | 79 +
.../iotdb/db/engine/storagegroup/DataRegion.java | 2 +-
.../db/engine/storagegroup/TsFileManager.java | 12 +-
.../iotdb/db/mpp/execution/driver/DataDriver.java | 2 +-
.../execution/exchange/MPPDataExchangeManager.java | 8 +-
.../process/join/merge/MultiColumnMerger.java | 18 +-
.../iotdb/db/mpp/plan/parser/ASTVisitor.java | 2 +-
.../db/mpp/plan/parser/StatementGenerator.java | 4 -
.../plan/planner/plan/node/write/InsertNode.java | 2 +-
.../org/apache/iotdb/db/rescon/SystemInfo.java | 18 +-
.../iotdb/db/service/RegionMigrateService.java | 367 +-
.../impl/DataNodeInternalRPCServiceImpl.java | 22 +-
.../db/tools/validate/TsFileValidationTool.java | 7 +-
.../apache/iotdb/db/utils/ErrorHandlingUtils.java | 4 +-
.../java/org/apache/iotdb/db/wal/WALManager.java | 4 +-
.../org/apache/iotdb/db/wal/buffer/WALEntry.java | 4 +-
.../java/org/apache/iotdb/db/wal/node/WALNode.java | 4 +-
.../engine/compaction/AbstractCompactionTest.java | 208 +-
.../compaction/CompactionTaskComparatorTest.java | 4 +-
.../compaction/CompactionTaskManagerTest.java | 74 +-
.../compaction/FastAlignedCrossCompactionTest.java | 6689 ++++++++++++++++++++
....java => FastCrossCompactionPerformerTest.java} | 4215 ++++--------
.../FastInnerCompactionPerformerTest.java | 1824 ++++++
.../FastNonAlignedCrossCompactionTest.java | 6655 +++++++++++++++++++
.../ReadPointCompactionPerformerTest.java | 929 ++-
.../cross/CrossSpaceCompactionValidationTest.java | 98 +-
.../cross/RewriteCrossSpaceCompactionTest.java | 10 +-
...ava => FastCompactionPerformerAlignedTest.java} | 43 +-
...a => FastCompactionPerformerNoAlignedTest.java} | 64 +-
...> InnerSeqCompactionWithFastPerformerTest.java} | 99 +-
...erSeqCompactionWithReadChunkPerformerTest.java} | 14 +-
.../inner/InnerSpaceCompactionExceptionTest.java | 26 +-
...InnerUnseqCompactionWithFastPerformerTest.java} | 17 +-
...UnseqCompactionWithReadPointPerformerTest.java} | 11 +-
.../ReadChunkCompactionPerformerAlignedTest.java | 36 +-
.../ReadChunkCompactionPerformerNoAlignedTest.java | 48 +-
.../inner/ReadChunkCompactionPerformerOldTest.java | 7 +-
.../SizeTieredCompactionRecoverTest.java | 48 +-
...eCrossSpaceCompactionRecoverCompatibleTest.java | 33 +-
.../SizeTieredCompactionRecoverCompatibleTest.java | 26 +-
.../recover/SizeTieredCompactionRecoverTest.java | 38 +-
.../compaction/utils/TsFileGeneratorUtils.java | 257 +
.../db/engine/storagegroup/DataRegionTest.java | 7 +-
.../engine/storagegroup/TsFileProcessorV2Test.java | 16 +-
.../iotdb/db/mpp/execution/DataDriverTest.java | 48 +-
.../operator/AlignedSeriesScanOperatorTest.java | 191 +-
.../operator/DeviceMergeOperatorTest.java | 73 +-
.../execution/operator/DeviceViewOperatorTest.java | 18 +-
.../mpp/execution/operator/LimitOperatorTest.java | 42 +-
.../mpp/execution/operator/OffsetOperatorTest.java | 90 +-
.../operator/RawDataAggregationOperatorTest.java | 41 +-
.../execution/operator/SeriesScanOperatorTest.java | 29 +-
.../execution/operator/TimeJoinOperatorTest.java | 115 +-
.../iotdb/db/tools/TsFileSelfCheckToolTest.java | 2 +-
.../datastructure/PrimitiveArrayManagerTest.java | 18 +-
site/src/main/.vuepress/config.js | 2 +
thrift-iot-consensus/pom.xml | 4 +-
.../iotdb/tsfile/common/conf/TSFileConfig.java | 4 +-
.../tsfile/common/constant/TsFileConstant.java | 3 +
.../tsfile/file/metadata/TimeseriesMetadata.java | 15 +-
.../iotdb/tsfile/read/TsFileSequenceReader.java | 69 +-
.../read/common/block/column/BinaryColumn.java | 9 -
.../read/common/block/column/BooleanColumn.java | 9 -
.../read/common/block/column/ColumnBuilder.java | 2 +
.../read/common/block/column/DoubleColumn.java | 9 -
.../read/common/block/column/FloatColumn.java | 9 -
.../tsfile/read/common/block/column/IntColumn.java | 9 -
.../read/common/block/column/LongColumn.java | 9 -
.../block/column/RunLengthEncodedColumn.java | 15 -
.../read/common/block/column/TimeColumn.java | 7 -
.../read/reader/chunk/AlignedChunkReader.java | 69 +
.../tsfile/read/reader/chunk/ChunkReader.java | 67 +
.../iotdb/tsfile/utils/TsFileGeneratorUtils.java | 8 +-
.../tsfile/write/chunk/AlignedChunkWriterImpl.java | 36 +-
.../iotdb/tsfile/write/chunk/ChunkWriterImpl.java | 26 +
.../iotdb/tsfile/write/chunk/IChunkWriter.java | 12 +
.../iotdb/tsfile/write/chunk/TimeChunkWriter.java | 8 +
.../iotdb/tsfile/write/chunk/ValueChunkWriter.java | 24 +
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 36 +-
.../tsfile/common/block/NullColumnUnitTest.java | 30 -
.../iotdb/tsfile/read/common/ColumnTest.java | 152 +-
163 files changed, 26774 insertions(+), 7966 deletions(-)