You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2022/11/18 03:36:36 UTC

[iotdb] branch adjust_error_code updated (6a6ab5e6ef -> 24f154588c)

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

qiaojialin pushed a change to branch adjust_error_code
in repository https://gitbox.apache.org/repos/asf/iotdb.git


    from 6a6ab5e6ef fix ci
     add cd35746b28 [IOTDB-4955] Make DataPartition inherit policy configurable (#8017)
     add 9cdab6e955 [IOTDB-4973] add a copy of time instead of calling getTimestamp
     add 3d5eeae81e [IOTDB-4953] Fix some sync-tool document description errors (#8038)
     add 24f154588c resolve conflict

No new revisions were added by this update.

Summary of changes:
 .../iotdb/confignode/conf/ConfigNodeConfig.java    |  14 +
 .../confignode/conf/ConfigNodeDescriptor.java      |   6 +
 .../exception/NoAvailableRegionGroupException.java |  13 +-
 .../partition/GreedyPartitionAllocator.java        |  70 +--
 .../manager/partition/PartitionManager.java        |   6 +-
 .../Edge-Cloud-Collaboration/Sync-Tool.md          |  38 +-
 .../Edge-Cloud-Collaboration/Sync-Tool.md          |  35 +-
 .../java/org/apache/iotdb/it/env/MppConfig.java    |   7 +
 .../org/apache/iotdb/itbase/env/BaseConfig.java    |   8 +
 .../it/partition/IoTDBPartitionDurableTest.java    | 323 ++++++++++++
 .../IoTDBPartitionGetterIT.java}                   | 582 ++++++---------------
 .../partition/IoTDBPartitionInheritPolicyTest.java | 182 +++++++
 .../confignode/it/utils/ConfigNodeTestUtils.java   |  66 +++
 .../resources/conf/iotdb-common.properties         |  18 +-
 .../java/org/apache/iotdb/rpc/IoTDBRpcDataSet.java |  10 +-
 .../org/apache/iotdb/session/SessionDataSet.java   |   2 +-
 16 files changed, 855 insertions(+), 525 deletions(-)
 create mode 100644 integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBPartitionDurableTest.java
 rename integration-test/src/test/java/org/apache/iotdb/confignode/it/{IoTDBClusterPartitionIT.java => partition/IoTDBPartitionGetterIT.java} (53%)
 create mode 100644 integration-test/src/test/java/org/apache/iotdb/confignode/it/partition/IoTDBPartitionInheritPolicyTest.java