This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a commit to branch xingtanzjr/align-id-2
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/xingtanzjr/align-id-2 by this
push:
new d4fe1eb move ConsensusGroupId to node-common
d4fe1eb is described below
commit d4fe1ebc7e38158fa9a76b294450e16cd8cc3070
Author: Jinrui.Zhang <[email protected]>
AuthorDate: Fri Apr 1 16:26:22 2022 +0800
move ConsensusGroupId to node-common
---
.../main/java/org/apache/iotdb/confignode/manager/ConfigManager.java | 4 ++--
.../main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java | 2 +-
consensus/src/main/java/org/apache/iotdb/consensus/ratis/Utils.java | 2 +-
.../org/apache/iotdb/consensus/standalone/StandAloneConsensus.java | 2 +-
.../java/org/apache/iotdb/consensus/ratis/RatisConsensusTest.java | 4 ++--
.../apache/iotdb/consensus/standalone/StandAloneConsensusTest.java | 4 ++--
.../src/main/java/org/apache/iotdb/db/consensus/ConsensusExample.java | 4 ++--
7 files changed, 11 insertions(+), 11 deletions(-)
diff --git
a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
index 2ce2673..e7cab5b 100644
---
a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
+++
b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
@@ -19,14 +19,14 @@
package org.apache.iotdb.confignode.manager;
import org.apache.iotdb.commons.hash.DeviceGroupHashExecutor;
+import org.apache.iotdb.commons.partition.ConsensusGroupId;
+import org.apache.iotdb.commons.partition.GroupType;
import org.apache.iotdb.confignode.conf.ConfigNodeConf;
import org.apache.iotdb.confignode.conf.ConfigNodeDescriptor;
import
org.apache.iotdb.confignode.consensus.statemachine.PartitionRegionStateMachine;
import org.apache.iotdb.confignode.physical.PhysicalPlan;
import org.apache.iotdb.consensus.IConsensus;
-import org.apache.iotdb.commons.partition.ConsensusGroupId;
import org.apache.iotdb.consensus.common.Endpoint;
-import org.apache.iotdb.commons.partition.GroupType;
import org.apache.iotdb.consensus.common.Peer;
import org.apache.iotdb.consensus.common.response.ConsensusReadResponse;
import org.apache.iotdb.consensus.common.response.ConsensusWriteResponse;
diff --git
a/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java
b/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java
index 871ae59..d7be0ce 100644
---
a/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java
+++
b/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java
@@ -19,8 +19,8 @@
package org.apache.iotdb.consensus.ratis;
-import org.apache.iotdb.consensus.IConsensus;
import org.apache.iotdb.commons.partition.ConsensusGroupId;
+import org.apache.iotdb.consensus.IConsensus;
import org.apache.iotdb.consensus.common.DataSet;
import org.apache.iotdb.consensus.common.Endpoint;
import org.apache.iotdb.consensus.common.Peer;
diff --git
a/consensus/src/main/java/org/apache/iotdb/consensus/ratis/Utils.java
b/consensus/src/main/java/org/apache/iotdb/consensus/ratis/Utils.java
index 0403402..e43544f 100644
--- a/consensus/src/main/java/org/apache/iotdb/consensus/ratis/Utils.java
+++ b/consensus/src/main/java/org/apache/iotdb/consensus/ratis/Utils.java
@@ -19,8 +19,8 @@
package org.apache.iotdb.consensus.ratis;
import org.apache.iotdb.commons.partition.ConsensusGroupId;
-import org.apache.iotdb.consensus.common.Endpoint;
import org.apache.iotdb.commons.partition.GroupType;
+import org.apache.iotdb.consensus.common.Endpoint;
import org.apache.iotdb.consensus.common.Peer;
import org.apache.iotdb.service.rpc.thrift.TSStatus;
diff --git
a/consensus/src/main/java/org/apache/iotdb/consensus/standalone/StandAloneConsensus.java
b/consensus/src/main/java/org/apache/iotdb/consensus/standalone/StandAloneConsensus.java
index da1cc06..4274c33 100644
---
a/consensus/src/main/java/org/apache/iotdb/consensus/standalone/StandAloneConsensus.java
+++
b/consensus/src/main/java/org/apache/iotdb/consensus/standalone/StandAloneConsensus.java
@@ -19,8 +19,8 @@
package org.apache.iotdb.consensus.standalone;
-import org.apache.iotdb.consensus.IConsensus;
import org.apache.iotdb.commons.partition.ConsensusGroupId;
+import org.apache.iotdb.consensus.IConsensus;
import org.apache.iotdb.consensus.common.DataSet;
import org.apache.iotdb.consensus.common.Peer;
import org.apache.iotdb.consensus.common.request.IConsensusRequest;
diff --git
a/consensus/src/test/java/org/apache/iotdb/consensus/ratis/RatisConsensusTest.java
b/consensus/src/test/java/org/apache/iotdb/consensus/ratis/RatisConsensusTest.java
index 99f2931..abb5c65 100644
---
a/consensus/src/test/java/org/apache/iotdb/consensus/ratis/RatisConsensusTest.java
+++
b/consensus/src/test/java/org/apache/iotdb/consensus/ratis/RatisConsensusTest.java
@@ -18,12 +18,12 @@
*/
package org.apache.iotdb.consensus.ratis;
+import org.apache.iotdb.commons.partition.ConsensusGroupId;
+import org.apache.iotdb.commons.partition.GroupType;
import org.apache.iotdb.consensus.IConsensus;
import org.apache.iotdb.consensus.common.ConsensusGroup;
-import org.apache.iotdb.commons.partition.ConsensusGroupId;
import org.apache.iotdb.consensus.common.DataSet;
import org.apache.iotdb.consensus.common.Endpoint;
-import org.apache.iotdb.commons.partition.GroupType;
import org.apache.iotdb.consensus.common.Peer;
import org.apache.iotdb.consensus.common.request.ByteBufferConsensusRequest;
import org.apache.iotdb.consensus.common.request.IConsensusRequest;
diff --git
a/consensus/src/test/java/org/apache/iotdb/consensus/standalone/StandAloneConsensusTest.java
b/consensus/src/test/java/org/apache/iotdb/consensus/standalone/StandAloneConsensusTest.java
index 2cf3d4d..ae879e5 100644
---
a/consensus/src/test/java/org/apache/iotdb/consensus/standalone/StandAloneConsensusTest.java
+++
b/consensus/src/test/java/org/apache/iotdb/consensus/standalone/StandAloneConsensusTest.java
@@ -19,11 +19,11 @@
package org.apache.iotdb.consensus.standalone;
-import org.apache.iotdb.consensus.IConsensus;
import org.apache.iotdb.commons.partition.ConsensusGroupId;
+import org.apache.iotdb.commons.partition.GroupType;
+import org.apache.iotdb.consensus.IConsensus;
import org.apache.iotdb.consensus.common.DataSet;
import org.apache.iotdb.consensus.common.Endpoint;
-import org.apache.iotdb.commons.partition.GroupType;
import org.apache.iotdb.consensus.common.Peer;
import org.apache.iotdb.consensus.common.request.ByteBufferConsensusRequest;
import org.apache.iotdb.consensus.common.request.IConsensusRequest;
diff --git
a/server/src/main/java/org/apache/iotdb/db/consensus/ConsensusExample.java
b/server/src/main/java/org/apache/iotdb/db/consensus/ConsensusExample.java
index 54b0215..fc0b7f3 100644
--- a/server/src/main/java/org/apache/iotdb/db/consensus/ConsensusExample.java
+++ b/server/src/main/java/org/apache/iotdb/db/consensus/ConsensusExample.java
@@ -19,10 +19,10 @@
package org.apache.iotdb.db.consensus;
-import org.apache.iotdb.consensus.IConsensus;
import org.apache.iotdb.commons.partition.ConsensusGroupId;
-import org.apache.iotdb.consensus.common.Endpoint;
import org.apache.iotdb.commons.partition.GroupType;
+import org.apache.iotdb.consensus.IConsensus;
+import org.apache.iotdb.consensus.common.Endpoint;
import org.apache.iotdb.consensus.common.Peer;
import org.apache.iotdb.consensus.common.request.ByteBufferConsensusRequest;
import org.apache.iotdb.consensus.standalone.StandAloneConsensus;
