You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2022/05/12 06:44:54 UTC

[iotdb] 01/01: Merge branch 'master' into xingtanzjr/0511_test

This is an automated email from the ASF dual-hosted git repository.

xingtanzjr pushed a commit to branch xingtanzjr/0511_test
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 99a273fe5dfab80c2d1ab65bb74d40ffb423d1ce
Merge: c23dbd2843 7a14619f9a
Author: Jinrui.Zhang <xi...@gmail.com>
AuthorDate: Thu May 12 14:44:42 2022 +0800

    Merge branch 'master' into xingtanzjr/0511_test

 .../resources/conf/iotdb-confignode.properties     |  23 +--
 .../confignode/client/AsyncDataNodeClientPool.java |  14 +-
 ...RegionHandler.java => CreateRegionHandler.java} |  41 +++-
 .../iotdb/confignode/conf/ConfigNodeConf.java      |  40 ++--
 .../confignode/conf/ConfigNodeDescriptor.java      |  12 +-
 .../confignode/conf/ConfigNodeStartupCheck.java    |  96 ++++-----
 .../consensus/request/write/CreateRegionsReq.java  |  38 ++--
 .../NotEnoughDataNodeException.java}               |  18 +-
 .../confignode/manager/ClusterSchemaManager.java   | 199 +++----------------
 .../iotdb/confignode/manager/ConfigManager.java    |  12 +-
 .../iotdb/confignode/manager/LoadManager.java      | 216 ++++++++++++++++++++-
 .../apache/iotdb/confignode/manager/Manager.java   |   9 +-
 .../iotdb/confignode/manager/NodeManager.java      |  17 +-
 .../iotdb/confignode/manager/PartitionManager.java |  97 +++++++--
 .../manager/allocator/CopySetRegionAllocator.java  | 155 +++++++++++++++
 .../manager/allocator/IRegionAllocator.java        |  44 +++++
 .../RegionBalancer.java}                           |  17 +-
 .../SeriesPartitionSlotBalancer.java}              |  17 +-
 .../confignode/persistence/ClusterSchemaInfo.java  |  68 ++++++-
 .../iotdb/confignode/persistence/NodeInfo.java     |   4 +
 .../confignode/persistence/PartitionInfo.java      |  22 ++-
 .../executor/ConfigRequestExecutor.java            |   5 +
 .../thrift/ConfigNodeRPCServiceProcessor.java      |   9 +
 .../consensus/request/ConfigRequestSerDeTest.java  |   4 +-
 .../confignode/persistence/PartitionInfoTest.java  |   2 +-
 .../thrift/ConfigNodeRPCServiceProcessorTest.java  |   7 +-
 .../Data-Concept/Data-Model-and-Terminology.md     |   4 +-
 .../Data-Concept/Data-Model-and-Terminology.md     |   4 +-
 .../iotdb/commons/consensus/ConsensusGroupId.java  |  20 ++
 .../java/org/apache/iotdb/rpc/TSStatusCode.java    |   3 +-
 site/src/main/.vuepress/config.js                  |   4 +-
 .../src/main/thrift/confignode.thrift              |   6 +-
 32 files changed, 840 insertions(+), 387 deletions(-)