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/04/02 09:17:42 UTC

[iotdb] branch master updated (566fa07 -> d8a0ac4)

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

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


    from 566fa07  fix bug in ratis consensus test (#5404)
     add d8a0ac4  Unify class definitions of common concepts and move them into node-commons package (#5400)

No new revisions were added by this update.

Summary of changes:
 confignode/pom.xml                                 |  2 +-
 .../iotdb/confignode/conf/ConfigNodeConf.java      |  2 +-
 .../confignode/conf/ConfigNodeDescriptor.java      |  2 +-
 .../consensus/response/DataNodesInfoDataSet.java   | 12 +--
 .../consensus/response/DataPartitionDataSet.java   |  8 +-
 .../consensus/response/SchemaPartitionDataSet.java | 33 ++++----
 .../iotdb/confignode/manager/ConsensusManager.java |  6 +-
 .../iotdb/confignode/manager/DataNodeManager.java  | 14 ++--
 .../iotdb/confignode/manager/PartitionManager.java | 19 +++--
 .../confignode/partition/DataPartitionInfo.java    | 43 ----------
 .../partition/SchemaRegionReplicaSet.java          | 82 -------------------
 .../persistence/DataNodeInfoPersistence.java       | 22 ++---
 .../persistence/PartitionInfoPersistence.java      | 24 +++---
 .../persistence/RegionInfoPersistence.java         | 23 ++++--
 .../physical/sys/RegisterDataNodePlan.java         | 12 +--
 .../physical/sys/SchemaPartitionPlan.java          | 13 ++-
 .../server/ConfigNodeRPCServerProcessor.java       |  6 +-
 consensus/pom.xml                                  |  6 ++
 .../org/apache/iotdb/consensus/IConsensus.java     |  2 +-
 .../iotdb/consensus/common/ConsensusGroup.java     |  2 +
 .../org/apache/iotdb/consensus/common/Peer.java    |  3 +
 .../ConsensusGroupAlreadyExistException.java       |  2 +-
 .../exception/ConsensusGroupNotExistException.java |  2 +-
 .../PeerAlreadyInConsensusGroupException.java      |  2 +-
 .../PeerNotInConsensusGroupException.java          |  2 +-
 .../iotdb/consensus/ratis/RatisConsensus.java      |  8 +-
 .../org/apache/iotdb/consensus/ratis/Utils.java    | 10 +--
 .../consensus/standalone/StandAloneConsensus.java  |  2 +-
 .../consensus/statemachine/IStateMachine.java      |  2 +-
 .../iotdb/consensus/ratis/RatisConsensusTest.java  |  8 +-
 .../apache/iotdb/consensus/ratis/UtilsTest.java    |  6 +-
 .../standalone/StandAloneConsensusTest.java        |  6 +-
 node-commons/pom.xml                               |  2 +-
 .../apache/iotdb/commons/cluster}/Endpoint.java    |  2 +-
 .../iotdb/commons/consensus}/ConsensusGroupId.java | 27 +++++--
 .../apache/iotdb/commons/consensus}/GroupType.java |  2 +-
 .../iotdb/commons/partition/DataNodeLocation.java  | 30 +++++--
 .../{DataPartitionInfo.java => DataPartition.java} | 20 ++---
 .../commons/partition/DataPartitionQueryParam.java | 10 +--
 .../iotdb/commons/partition/DataRegionId.java      | 39 ---------
 .../commons/partition/DataRegionReplicaSet.java    | 61 --------------
 .../iotdb/commons/partition/PartitionInfo.java     | 20 ++---
 .../iotdb/commons/partition/RegionReplicaSet.java  | 89 ++++++++++++++++++++
 .../iotdb/commons/partition/SchemaPartition.java   | 45 ++++++-----
 .../commons/partition/SchemaPartitionInfo.java     | 53 ------------
 .../iotdb/commons/partition/SchemaRegionId.java    | 54 -------------
 .../commons/partition/SchemaRegionReplicaSet.java  | 44 ----------
 ...DeviceGroupId.java => SeriesPartitionSlot.java} |  8 +-
 ...TimePartitionId.java => TimePartitionSlot.java} |  2 +-
 server/pom.xml                                     |  2 +-
 .../iotdb/db/consensus/ConsensusExample.java       |  6 +-
 .../iotdb/db/metadata/LocalConfigManager.java      | 32 ++++----
 .../db/metadata/LocalSchemaPartitionTable.java     | 30 +++----
 .../db/metadata/schemaregion/SchemaEngine.java     | 12 +--
 .../db/metadata/schemaregion/SchemaRegion.java     | 10 ++-
 .../iotdb/db/metadata/template/Template.java       | 18 ++---
 .../db/metadata/template/TemplateManager.java      |  6 +-
 .../apache/iotdb/db/mpp/sql/analyze/Analysis.java  | 30 +++----
 .../apache/iotdb/db/mpp/sql/analyze/Analyzer.java  |  6 +-
 .../mpp/sql/analyze/ClusterPartitionFetcher.java   | 12 +--
 .../mpp/sql/analyze/FakePartitionFetcherImpl.java  | 92 ++++++++++++---------
 .../db/mpp/sql/analyze/IPartitionFetcher.java      | 12 +--
 .../sql/analyze/StandalonePartitionFetcher.java    | 12 +--
 .../db/mpp/sql/planner/DistributionPlanner.java    | 16 ++--
 .../db/mpp/sql/planner/plan/FragmentInstance.java  | 16 ++--
 .../db/mpp/sql/planner/plan/PlanFragment.java      |  8 +-
 .../plan/SimpleFragmentParallelPlanner.java        |  6 +-
 .../planner/plan/node/process/ExchangeNode.java    |  8 +-
 .../planner/plan/node/sink/FragmentSinkNode.java   |  8 +-
 .../plan/node/source/SeriesAggregateScanNode.java  | 12 +--
 .../planner/plan/node/source/SeriesScanNode.java   | 19 +++--
 .../sql/planner/plan/node/source/SourceNode.java   |  6 +-
 .../db/mpp/sql/plan/DistributionPlannerTest.java   | 94 ++++++++++++----------
 .../org/apache/iotdb/rpc/RedirectException.java    |  6 +-
 74 files changed, 587 insertions(+), 786 deletions(-)
 delete mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/partition/DataPartitionInfo.java
 delete mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/partition/SchemaRegionReplicaSet.java
 rename {consensus/src/main/java/org/apache/iotdb/consensus/common => node-commons/src/main/java/org/apache/iotdb/commons/cluster}/Endpoint.java (97%)
 rename {consensus/src/main/java/org/apache/iotdb/consensus/common => node-commons/src/main/java/org/apache/iotdb/commons/consensus}/ConsensusGroupId.java (70%)
 rename {consensus/src/main/java/org/apache/iotdb/consensus/common => node-commons/src/main/java/org/apache/iotdb/commons/consensus}/GroupType.java (95%)
 rename confignode/src/main/java/org/apache/iotdb/confignode/partition/DataNodeInfo.java => node-commons/src/main/java/org/apache/iotdb/commons/partition/DataNodeLocation.java (72%)
 rename node-commons/src/main/java/org/apache/iotdb/commons/partition/{DataPartitionInfo.java => DataPartition.java} (71%)
 delete mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/partition/DataRegionId.java
 delete mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/partition/DataRegionReplicaSet.java
 create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/partition/RegionReplicaSet.java
 rename confignode/src/main/java/org/apache/iotdb/confignode/partition/SchemaPartitionInfo.java => node-commons/src/main/java/org/apache/iotdb/commons/partition/SchemaPartition.java (57%)
 delete mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/partition/SchemaPartitionInfo.java
 delete mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/partition/SchemaRegionId.java
 delete mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/partition/SchemaRegionReplicaSet.java
 rename node-commons/src/main/java/org/apache/iotdb/commons/partition/{DeviceGroupId.java => SeriesPartitionSlot.java} (85%)
 rename node-commons/src/main/java/org/apache/iotdb/commons/partition/{TimePartitionId.java => TimePartitionSlot.java} (96%)