You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2022/04/02 08:31:42 UTC
[iotdb] 01/01: fix conflict
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch add_py_test_ci
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 38e8a9240581944ddd5f15fef54b6e2c271a6422
Merge: 9b3e956 566fa07
Author: HTHou <hh...@outlook.com>
AuthorDate: Sat Apr 2 16:30:48 2022 +0800
fix conflict
client-py/README.md | 277 ++++++++++++++++++---
client-py/SessionExample.py | 2 +-
.../iotdb/confignode/conf/ConfigNodeConfCheck.java | 28 ++-
...chemaDataSet.java => DataPartitionDataSet.java} | 18 +-
.../consensus/response/SchemaPartitionDataSet.java | 79 ++++++
.../response/StorageGroupSchemaDataSet.java | 8 +-
.../iotdb/confignode/manager/ConfigManager.java | 214 ++++++++--------
.../{ConfigManager.java => ConsensusManager.java} | 26 +-
.../iotdb/confignode/manager/DataNodeManager.java | 169 +++++++++++++
.../apache/iotdb/confignode/manager/Manager.java | 119 +++++++++
.../iotdb/confignode/manager/PartitionManager.java | 146 +++++++++++
.../iotdb/confignode/manager/RegionManager.java | 152 +++++++++++
.../iotdb/confignode/partition/DataNodeInfo.java | 8 +-
.../confignode/partition/DataPartitionInfo.java | 65 ++---
...{DataPartitionInfo.java => DataRegionInfo.java} | 46 ++--
.../iotdb/confignode/partition/PartitionTable.java | 189 --------------
.../confignode/partition/SchemaPartitionInfo.java | 75 ++++--
...emaPartitionInfo.java => SchemaRegionInfo.java} | 41 ++-
.../partition/SchemaRegionReplicaSet.java | 82 ++++++
.../persistence/DataNodeInfoPersistence.java | 186 ++++++++++++++
.../persistence/PartitionInfoPersistence.java | 157 ++++++++++++
.../persistence/RegionInfoPersistence.java | 189 ++++++++++++++
.../iotdb/confignode/physical/PhysicalPlan.java | 14 ++
.../confignode/physical/PhysicalPlanType.java | 6 +-
.../confignode/physical/sys/DataPartitionPlan.java | 78 ++++++
.../physical/sys/SchemaPartitionPlan.java | 98 ++++++++
.../physical/sys/SetStorageGroupPlan.java | 30 +++
.../confignode/service/balancer/LoadBalancer.java | 12 -
.../confignode/service/executor/PlanExecutor.java | 32 ++-
.../server/ConfigNodeRPCServerProcessor.java | 61 +++--
.../confignode/util/SerializeDeserializeUtil.java | 242 ++++++++++++++++++
.../hash/DeviceGroupHashExecutorManualTest.java | 4 +-
.../server/ConfigNodeRPCServerProcessorTest.java | 151 +++++++++++
.../utils/SerializeDeserializeUtilTest.java | 90 +++++++
consensus/README.md | 123 +++++++++
.../apache/iotdb/consensus/common/Endpoint.java | 24 +-
.../iotdb/consensus/ratis/RatisConsensusTest.java | 31 ++-
.../UserGuide/API/Programming-Python-Native-API.md | 19 +-
docs/UserGuide/Maintenance-Tools/Metric-Tool.md | 1 +
.../UserGuide/API/Programming-Python-Native-API.md | 17 +-
docs/zh/UserGuide/Maintenance-Tools/Metric-Tool.md | 1 +
example/rest-client-c-example/README.md | 111 +++++++++
example/rest-client-c-example/base64.c | 100 ++++++++
.../rest-client-c-example/base64.h | 20 +-
example/rest-client-c-example/main.c | 124 +++++++++
.../versionadaption/IoTDBDDLVersionAdaptionIT.java | 4 +-
.../apache/iotdb/session/IoTDBSessionSimpleIT.java | 42 ++++
.../metrics/dropwizard/reporter/IoTDBReporter.java | 40 +--
.../main/assembly/resources/conf/iotdb-metric.yml | 1 +
.../apache/iotdb/metrics/config/MetricConfig.java | 10 +
.../interface/src/test/resources/iotdb-metric.yml | 1 +
.../micrometer/reporter/IoTDBMeterRegistry.java | 32 +--
.../commons/partition/SchemaPartitionInfo.java | 17 ++
pom.xml | 2 +-
server/pom.xml | 2 +-
.../manage/CrossSpaceCompactionResource.java | 3 +-
.../sizetiered/SizeTieredCompactionSelector.java | 4 +-
.../db/engine/storagegroup/TsFileResource.java | 4 +
.../iotdb/db/metadata/LocalConfigManager.java | 25 +-
.../iotdb/db/metadata/LocalSchemaProcessor.java | 31 ++-
.../iotdb/db/metadata/mtree/MTreeAboveSG.java | 21 +-
.../iotdb/db/metadata/mtree/MTreeBelowSG.java | 4 +-
.../db/metadata/mtree/traverser/Traverser.java | 10 +-
.../mtree/traverser/counter/MNodeLevelCounter.java | 18 +-
.../db/metadata/schemaregion/SchemaRegion.java | 7 +-
.../storagegroup/IStorageGroupSchemaManager.java | 20 +-
.../storagegroup/StorageGroupSchemaManager.java | 13 +-
.../db/mpp/sql/analyze/IPartitionFetcher.java | 2 +-
.../apache/iotdb/db/utils/ErrorHandlingUtils.java | 15 +-
.../inner/InnerCompactionSchedulerTest.java | 31 +++
.../apache/iotdb/db/metadata/SchemaBasicTest.java | 44 ++++
.../iotdb/db/metadata/mtree/MTreeAboveSGTest.java | 10 +-
.../iotdb/db/metadata/mtree/MTreeBelowSGTest.java | 44 +++-
.../src/main/thrift/confignode.thrift | 23 +-
.../apache/iotdb/tsfile/write/record/Tablet.java | 4 +-
75 files changed, 3395 insertions(+), 754 deletions(-)