You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ro...@apache.org on 2022/05/23 17:38:16 UTC
[iotdb] 02/18: Merge branch 'master' of github.com:apache/iotdb into iotdb-3227
This is an automated email from the ASF dual-hosted git repository.
rong pushed a commit to branch iotdb-3227
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit fc57e0e8b3b8bf70c0f1adeb9de2f71f10d0737f
Merge: b53039c021 eaeb42bee4
Author: Steve Yurong Su <ro...@apache.org>
AuthorDate: Thu May 19 10:21:02 2022 +0800
Merge branch 'master' of github.com:apache/iotdb into iotdb-3227
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 2 +-
.../confignode/persistence/ClusterSchemaInfo.java | 25 +-
.../apache/iotdb/tsfile/TsFileSequenceRead.java | 2 +-
.../iotdb/db/integration/IoTDBSnapshotIT.java | 259 +++++++++++++++++++++
.../iotdb/db/integration/IoTDBTagAlterIT.java | 4 +-
.../commons/utils/ThriftConfigNodeSerDeUtils.java | 34 +++
.../schemaregion/rocksdb/RSchemaRegion.java | 20 +-
.../statemachine/DataRegionStateMachine.java | 74 +++---
.../statemachine/SchemaRegionStateMachine.java | 6 +-
.../statemachine/visitor/DataExecutionVisitor.java | 116 +++++++++
.../apache/iotdb/db/engine/StorageEngineV2.java | 13 ++
.../db/engine/compaction/CompactionScheduler.java | 4 +-
.../db/engine/compaction/CompactionUtils.java | 4 +-
.../constant/InnerSequenceCompactionSelector.java | 8 +-
.../InnerUnsequenceCompactionSelector.java | 8 +-
...ement.java => AbstractCrossSpaceEstimator.java} | 25 +-
.../rewrite/CrossSpaceCompactionResource.java | 89 +++++++
.../RewriteCrossSpaceCompactionResource.java | 206 ----------------
.../RewriteCrossSpaceCompactionSelector.java | 17 +-
.../selector/RewriteCompactionFileSelector.java | 195 ++++------------
.../cross/utils/AbstractCompactionEstimator.java | 63 +++++
.../IFileQueryMemMeasurement.java | 2 +-
.../cross/utils/InplaceCompactionEstimator.java | 173 ++++++++++++++
.../utils/ReadPointCrossCompactionEstimator.java | 172 ++++++++++++++
.../AbstractInnerSpaceEstimator.java} | 25 +-
.../sizetiered/SizeTieredCompactionSelector.java | 9 +-
.../compaction/task/ICompactionSelector.java | 20 ++
.../iotdb/db/engine/snapshot/SnapshotLoader.java | 196 ++++++++++++++++
.../iotdb/db/engine/snapshot/SnapshotTaker.java | 166 +++++++++++++
.../exception/DirectoryNotLegalException.java} | 22 +-
.../iotdb/db/engine/storagegroup/DataRegion.java | 4 +
.../engine/storagegroup/TsFileNameGenerator.java | 2 +-
.../apache/iotdb/db/metadata/MetadataConstant.java | 5 +
.../iotdb/db/metadata/logfile/MLogWriter.java | 9 +
.../iotdb/db/metadata/mtree/MTreeAboveSG.java | 55 +++--
.../traverser/collector/MNodeAboveSGCollector.java | 6 +-
.../db/metadata/schemaregion/ISchemaRegion.java | 8 +-
.../schemaregion/SchemaRegionMemoryImpl.java | 81 ++++++-
.../schemaregion/SchemaRegionSchemaFileImpl.java | 22 +-
.../apache/iotdb/db/metadata/tag/TagLogFile.java | 12 +-
.../apache/iotdb/db/metadata/tag/TagManager.java | 34 +++
.../iotdb/db/mpp/plan/parser/ASTVisitor.java | 8 +-
.../db/mpp/plan/planner/DistributionPlanner.java | 53 ++++-
.../db/mpp/plan/planner/plan/node/PlanVisitor.java | 25 ++
.../plan/node/source/AlignedSeriesScanNode.java | 12 +-
.../plan/node/write/InsertMultiTabletsNode.java | 10 +
.../plan/planner/plan/node/write/InsertNode.java | 30 +++
.../planner/plan/node/write/InsertRowNode.java | 4 +-
.../planner/plan/node/write/InsertRowsNode.java | 10 +
.../plan/node/write/InsertRowsOfOneDeviceNode.java | 10 +
.../planner/plan/node/write/InsertTabletNode.java | 3 +
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 2 +-
.../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 8 +-
.../apache/iotdb/db/tools/TsFileSketchTool.java | 6 +-
.../org/apache/iotdb/db/utils/FileLoaderUtils.java | 2 +-
.../java/org/apache/iotdb/db/utils/MergeUtils.java | 69 ------
.../compaction/cross/CrossSpaceCompactionTest.java | 17 +-
.../engine/compaction/cross/MergeUpgradeTest.java | 6 +-
.../cross/RewriteCompactionFileSelectorTest.java | 81 +++----
.../iotdb/db/metadata/mtree/MTreeAboveSGTest.java | 18 +-
.../db/metadata/schemaRegion/SchemaRegionTest.java | 100 ++++++++
.../plan/node/write/InsertTabletNodeSerdeTest.java | 2 +-
.../java/org/apache/iotdb/rpc/TSStatusCode.java | 1 +
.../iotdb/tsfile/read/TsFileSequenceReader.java | 15 +-
.../tsfile/v2/read/TsFileSequenceReaderForV2.java | 3 +-
.../tsfile/write/MetadataIndexConstructorTest.java | 2 +-
.../iotdb/tsfile/write/TsFileIOWriterTest.java | 2 +-
67 files changed, 1989 insertions(+), 707 deletions(-)