This is an automated email from the ASF dual-hosted git repository. xiangweiwei pushed a commit to branch controlThreadNum in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 89ca99ac3e11f8109efa4af2ab06bb592e2c7b77 Merge: 044df89 c461f65 Author: Alima777 <[email protected]> AuthorDate: Thu Dec 30 11:42:58 2021 +0800 Fix conflicts .../iotdb/cluster/ClusterFileFlushPolicy.java | 8 +- .../apache/iotdb/cluster/metadata/CMManager.java | 46 +- .../partition/slot/SlotTimePartitionFilter.java | 2 +- .../iotdb/cluster/query/ClusterPlanExecutor.java | 28 +- .../cluster/server/member/DataGroupMember.java | 2 +- .../iotdb/cluster/server/member/RaftMember.java | 101 +++-- .../cluster/log/applier/DataLogApplierTest.java | 10 +- .../cluster/log/snapshot/FileSnapshotTest.java | 14 +- .../log/snapshot/PartitionedSnapshotTest.java | 4 +- .../cluster/log/snapshot/PullSnapshotTaskTest.java | 4 +- .../mult/AssignPathManagedMergeReaderTest.java | 3 +- .../reader/mult/RemoteMultSeriesReaderTest.java | 3 +- .../cluster/server/member/DataGroupMemberTest.java | 9 +- .../cluster/server/member/MetaGroupMemberTest.java | 4 +- docs/SystemDesign/StorageEngine/Recover.md | 2 +- docs/SystemDesign/StorageEngine/StorageEngine.md | 2 +- docs/UserGuide/Cluster/Cluster-Setup-Example.md | 107 ++++- docs/UserGuide/Cluster/Cluster-Setup.md | 4 +- docs/UserGuide/Data-Concept/Encoding.md | 4 +- .../DML-Data-Manipulation-Language.md | 492 ++++++++++---------- docs/zh/SystemDesign/StorageEngine/Recover.md | 4 +- .../zh/SystemDesign/StorageEngine/StorageEngine.md | 2 +- docs/zh/UserGuide/Cluster/Cluster-Setup-Example.md | 108 ++++- docs/zh/UserGuide/Cluster/Cluster-Setup.md | 4 +- docs/zh/UserGuide/Data-Concept/Encoding.md | 3 +- .../DML-Data-Manipulation-Language.md | 494 +++++++++++---------- .../iotdb/db/integration/IoTDBDeletionIT.java | 6 +- .../apache/iotdb/db/integration/IoTDBMergeIT.java | 24 +- .../iotdb/db/integration/IoTDBMultiDeviceIT.java | 75 ++-- .../db/integration/IoTDBNewTsFileCompactionIT.java | 6 +- .../iotdb/db/integration/IoTDBRestartIT.java | 55 --- .../db/integration/aligned/IoTDBDeletionIT.java | 88 ++-- .../org/apache/iotdb/db/engine/StorageEngine.java | 171 +++---- .../compaction/task/CompactionRecoverTask.java | 2 +- .../iotdb/db/engine/flush/TsFileFlushPolicy.java | 11 +- .../db/engine/storagegroup/StorageGroupInfo.java | 18 +- .../db/engine/storagegroup/TsFileProcessor.java | 4 +- .../db/engine/storagegroup/TsFileResource.java | 4 +- ...ssor.java => VirtualStorageGroupProcessor.java} | 6 +- ...eGroupManager.java => StorageGroupManager.java} | 167 ++++--- .../org/apache/iotdb/db/metadata/MManager.java | 5 +- .../org/apache/iotdb/db/metadata/mtree/MTree.java | 7 +- .../apache/iotdb/db/metadata/path/PartialPath.java | 113 ++++- .../apache/iotdb/db/metadata/tag/TagManager.java | 4 +- .../org/apache/iotdb/db/monitor/StatMonitor.java | 8 +- .../apache/iotdb/db/qp/executor/IPlanExecutor.java | 2 +- .../apache/iotdb/db/qp/executor/PlanExecutor.java | 2 +- .../iotdb/db/qp/physical/crud/DeletePlan.java | 2 +- .../db/qp/physical/sys/DeleteTimeSeriesPlan.java | 2 +- .../groupby/GroupByWithValueFilterDataSet.java | 4 +- .../groupby/GroupByWithoutValueFilterDataSet.java | 4 +- .../db/query/executor/AggregationExecutor.java | 6 +- .../iotdb/db/query/executor/FillQueryExecutor.java | 4 +- .../iotdb/db/query/executor/LastQueryExecutor.java | 4 +- .../db/query/executor/RawDataQueryExecutor.java | 6 +- .../query/timegenerator/ServerTimeGenerator.java | 4 +- .../org/apache/iotdb/db/rescon/SystemInfo.java | 10 +- .../apache/iotdb/db/utils/EnvironmentUtils.java | 3 + .../recover/SizeTieredCompactionRecoverTest.java | 4 +- .../engine/modification/DeletionFileNodeTest.java | 6 +- .../storagegroup/StorageGroupProcessorTest.java | 4 +- .../iotdb/db/engine/storagegroup/TTLTest.java | 52 +-- .../apache/iotdb/db/metadata/PartialPathTest.java | 55 ++- .../db/sync/receiver/load/FileLoaderTest.java | 12 +- .../recover/SyncReceiverLogAnalyzerTest.java | 4 +- .../iotdb/session/IoTDBSessionVectorInsertIT.java | 4 - site/src/main/.vuepress/config.js | 2 +- .../tsfile/encoding/decoder/IntRleDecoderTest.java | 7 +- .../regular/RegularDataEncoderLongTest.java | 4 +- 69 files changed, 1399 insertions(+), 1046 deletions(-)
