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:41 UTC

[iotdb] branch add_py_test_ci updated (9b3e956 -> 38e8a92)

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

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


    from 9b3e956  Add Python client CI
     add fcc4bf2  Update python client doc and code for NumpyTablet (#5395)
     add c414b81  Bump jjwt-jackson from 0.10.7 to 0.10.8 (#5394)
     add fdfee46  Bump httpcore from 4.4.13 to 4.4.15 (#5391)
     add c96cfa7  [IOTDB-2684] refactoring confignode architecture and schema partition assign (#5374)
     add d9fb0c1  [IOTDB-2819][metrics] modify session to session pool. (#5369)
     add f144d19  [IOTDB-2836] Fix ErrorHandlingUtils exception stacktrace logging (#5399)
     add be883fd  [IOTDB-2818] Fix exception occurs when submitting compaction task to global queue (#5384)
     add 55566b6  refactor count node by level (#5398)
     add 1f7361c  [IOTDB-2650] Tablet supports adding String value (#5382)
     add d00a3df  [IOTDB-2833] Add readme to consensus (#5396)
     add 6b07373  Add c rest client example (#5397)
     add 566fa07  fix bug in ratis consensus test (#5404)
     new 38e8a92  fix conflict

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 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                 |  13 +-
 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, 3392 insertions(+), 750 deletions(-)
 copy confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/{StorageGroupSchemaDataSet.java => DataPartitionDataSet.java} (70%)
 create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/consensus/response/SchemaPartitionDataSet.java
 copy confignode/src/main/java/org/apache/iotdb/confignode/manager/{ConfigManager.java => ConsensusManager.java} (88%)
 create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/manager/DataNodeManager.java
 create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/manager/Manager.java
 create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/manager/PartitionManager.java
 create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/manager/RegionManager.java
 copy confignode/src/main/java/org/apache/iotdb/confignode/partition/{DataPartitionInfo.java => DataRegionInfo.java} (54%)
 delete mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/partition/PartitionTable.java
 copy confignode/src/main/java/org/apache/iotdb/confignode/partition/{SchemaPartitionInfo.java => SchemaRegionInfo.java} (58%)
 create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/partition/SchemaRegionReplicaSet.java
 create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/persistence/DataNodeInfoPersistence.java
 create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/persistence/PartitionInfoPersistence.java
 create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/persistence/RegionInfoPersistence.java
 create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/physical/sys/DataPartitionPlan.java
 create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/physical/sys/SchemaPartitionPlan.java
 create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/util/SerializeDeserializeUtil.java
 create mode 100644 confignode/src/test/java/org/apache/iotdb/confignode/utils/SerializeDeserializeUtilTest.java
 create mode 100644 consensus/README.md
 create mode 100644 example/rest-client-c-example/README.md
 create mode 100644 example/rest-client-c-example/base64.c
 copy tsfile/src/main/java/org/apache/iotdb/tsfile/fileSystem/fileOutputFactory/FileOutputFactory.java => example/rest-client-c-example/base64.h (77%)
 create mode 100644 example/rest-client-c-example/main.c

[iotdb] 01/01: fix conflict

Posted by ha...@apache.org.
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(-)