This is an automated email from the ASF dual-hosted git repository. hui pushed a commit to branch lmh/addQueryIT in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 53a62a80fd18681fc6df9d302888ae7388bf2cde Merge: 43b916dd83 e814312089 Author: Minghui Liu <[email protected]> AuthorDate: Mon Jun 20 22:34:58 2022 +0800 Merge remote-tracking branch 'origin/master' into lmh/addQueryIT .../confignode/client/AsyncDataNodeClientPool.java | 2 +- .../client/handlers/HeartbeatHandler.java | 2 +- .../iotdb/confignode/manager/load/LoadManager.java | 2 +- .../org/apache/iotdb/consensus/IConsensus.java | 2 + .../multileader/MultiLeaderConsensus.java | 5 + .../iotdb/consensus/ratis/RatisConsensus.java | 12 + .../consensus/standalone/StandAloneConsensus.java | 6 + .../iotdb/consensus/ratis/RatisConsensusTest.java | 4 - .../schemaregion/rocksdb/mnode/RMNode.java | 7 + .../apache/iotdb/db/metadata/MetadataConstant.java | 20 +- .../idtable/entry/InsertMeasurementMNode.java | 6 + .../iotdb/db/metadata/logfile/MLogWriter.java | 2 +- .../iotdb/db/metadata/mnode/EntityMNode.java | 6 + .../org/apache/iotdb/db/metadata/mnode/IMNode.java | 3 + .../iotdb/db/metadata/mnode/InternalMNode.java | 6 + .../iotdb/db/metadata/mnode/MeasurementMNode.java | 6 + .../db/metadata/mnode/StorageGroupEntityMNode.java | 6 + .../iotdb/db/metadata/mnode/StorageGroupMNode.java | 6 + .../db/metadata/mnode/visitor/MNodeVisitor.java | 39 +++ .../db/metadata/mtree/MTreeBelowSGMemoryImpl.java | 28 ++ .../mtree/snapshot/MemMTreeSnapshotUtil.java | 347 +++++++++++++++++++++ .../db/metadata/mtree/store/CachedMTreeStore.java | 7 + .../iotdb/db/metadata/mtree/store/IMTreeStore.java | 4 + .../db/metadata/mtree/store/MemMTreeStore.java | 18 ++ .../db/metadata/schemaregion/SchemaEngine.java | 7 +- .../schemaregion/SchemaRegionMemoryImpl.java | 276 +++++++++------- .../apache/iotdb/db/metadata/tag/TagManager.java | 19 ++ .../db/metadata/upgrade/MetadataUpgrader.java | 4 +- .../mpp/plan/analyze/StandaloneSchemaFetcher.java | 40 +-- .../service/thrift/impl/InternalServiceImpl.java | 31 +- .../db/metadata/schemaRegion/SchemaRegionTest.java | 70 ++++- .../db/metadata/upgrade/MetadataUpgradeTest.java | 9 +- server/src/test/resources/logback-test.xml | 1 + thrift-commons/src/main/thrift/common.thrift | 12 +- thrift/src/main/thrift/mpp.thrift | 13 +- 35 files changed, 842 insertions(+), 186 deletions(-)
