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/01 08:13:56 UTC
[iotdb] branch xingtanzjr/align-id-2 created (now f4da870)
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a change to branch xingtanzjr/align-id-2
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
at f4da870 add pom depends
This branch includes the following new commits:
new e43dcef change package path
new f4da870 add pom depends
The 2 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.
[iotdb] 02/02: add pom depends
Posted by xi...@apache.org.
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
commit f4da8704c2758e6efd981dd4963f966432613862
Author: Jinrui.Zhang <xi...@gmail.com>
AuthorDate: Fri Apr 1 16:12:38 2022 +0800
add pom depends
---
consensus/pom.xml | 6 ++++++
.../java/org/apache/iotdb/commons/partition/ConsensusGroupId.java | 0
.../src/main/java/org/apache/iotdb/commons/partition/GroupType.java | 0
3 files changed, 6 insertions(+)
diff --git a/consensus/pom.xml b/consensus/pom.xml
index 377b917..3080b1e 100644
--- a/consensus/pom.xml
+++ b/consensus/pom.xml
@@ -51,6 +51,12 @@
<artifactId>iotdb-thrift</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.iotdb</groupId>
+ <artifactId>iotdb-commons</artifactId>
+ <version>0.14.0-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
<properties>
<maven.compiler.source>8</maven.compiler.source>
diff --git a/consensus/src/main/java/org/apache/iotdb/commons/partition/ConsensusGroupId.java b/node-commons/src/main/java/org/apache/iotdb/commons/partition/ConsensusGroupId.java
similarity index 100%
rename from consensus/src/main/java/org/apache/iotdb/commons/partition/ConsensusGroupId.java
rename to node-commons/src/main/java/org/apache/iotdb/commons/partition/ConsensusGroupId.java
diff --git a/consensus/src/main/java/org/apache/iotdb/commons/partition/GroupType.java b/node-commons/src/main/java/org/apache/iotdb/commons/partition/GroupType.java
similarity index 100%
rename from consensus/src/main/java/org/apache/iotdb/commons/partition/GroupType.java
rename to node-commons/src/main/java/org/apache/iotdb/commons/partition/GroupType.java
[iotdb] 01/02: change package path
Posted by xi...@apache.org.
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
commit e43dceff2dbecc34a93713b255b9a784197cb70c
Author: Jinrui.Zhang <xi...@gmail.com>
AuthorDate: Fri Apr 1 16:09:05 2022 +0800
change package path
---
.../main/java/org/apache/iotdb/confignode/manager/ConfigManager.java | 4 ++--
.../{consensus/common => commons/partition}/ConsensusGroupId.java | 2 +-
.../iotdb/{consensus/common => commons/partition}/GroupType.java | 2 +-
consensus/src/main/java/org/apache/iotdb/consensus/IConsensus.java | 2 +-
.../main/java/org/apache/iotdb/consensus/common/ConsensusGroup.java | 2 ++
consensus/src/main/java/org/apache/iotdb/consensus/common/Peer.java | 2 ++
.../consensus/exception/ConsensusGroupAlreadyExistException.java | 2 +-
.../iotdb/consensus/exception/ConsensusGroupNotExistException.java | 2 +-
.../consensus/exception/PeerAlreadyInConsensusGroupException.java | 2 +-
.../iotdb/consensus/exception/PeerNotInConsensusGroupException.java | 2 +-
.../main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java | 2 +-
consensus/src/main/java/org/apache/iotdb/consensus/ratis/Utils.java | 4 ++--
.../org/apache/iotdb/consensus/standalone/StandAloneConsensus.java | 2 +-
.../java/org/apache/iotdb/consensus/statemachine/IStateMachine.java | 2 +-
.../java/org/apache/iotdb/consensus/ratis/RatisConsensusTest.java | 4 ++--
.../src/test/java/org/apache/iotdb/consensus/ratis/UtilsTest.java | 4 ++--
.../apache/iotdb/consensus/standalone/StandAloneConsensusTest.java | 4 ++--
.../src/main/java/org/apache/iotdb/db/consensus/ConsensusExample.java | 4 ++--
18 files changed, 26 insertions(+), 22 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 1fd5767..2ce2673 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
@@ -24,9 +24,9 @@ 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.consensus.common.ConsensusGroupId;
+import org.apache.iotdb.commons.partition.ConsensusGroupId;
import org.apache.iotdb.consensus.common.Endpoint;
-import org.apache.iotdb.consensus.common.GroupType;
+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/common/ConsensusGroupId.java b/consensus/src/main/java/org/apache/iotdb/commons/partition/ConsensusGroupId.java
similarity index 97%
rename from consensus/src/main/java/org/apache/iotdb/consensus/common/ConsensusGroupId.java
rename to consensus/src/main/java/org/apache/iotdb/commons/partition/ConsensusGroupId.java
index 5b10c6a..cb30fd3 100644
--- a/consensus/src/main/java/org/apache/iotdb/consensus/common/ConsensusGroupId.java
+++ b/consensus/src/main/java/org/apache/iotdb/commons/partition/ConsensusGroupId.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.consensus.common;
+package org.apache.iotdb.commons.partition;
import java.util.Objects;
diff --git a/consensus/src/main/java/org/apache/iotdb/consensus/common/GroupType.java b/consensus/src/main/java/org/apache/iotdb/commons/partition/GroupType.java
similarity index 95%
rename from consensus/src/main/java/org/apache/iotdb/consensus/common/GroupType.java
rename to consensus/src/main/java/org/apache/iotdb/commons/partition/GroupType.java
index 9a53700..8452cac 100644
--- a/consensus/src/main/java/org/apache/iotdb/consensus/common/GroupType.java
+++ b/consensus/src/main/java/org/apache/iotdb/commons/partition/GroupType.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.consensus.common;
+package org.apache.iotdb.commons.partition;
// TODO Use a mature IDL framework such as Protobuf to manage this structure
public enum GroupType {
diff --git a/consensus/src/main/java/org/apache/iotdb/consensus/IConsensus.java b/consensus/src/main/java/org/apache/iotdb/consensus/IConsensus.java
index 81213bb..802e623 100644
--- a/consensus/src/main/java/org/apache/iotdb/consensus/IConsensus.java
+++ b/consensus/src/main/java/org/apache/iotdb/consensus/IConsensus.java
@@ -18,7 +18,7 @@
*/
package org.apache.iotdb.consensus;
-import org.apache.iotdb.consensus.common.ConsensusGroupId;
+import org.apache.iotdb.commons.partition.ConsensusGroupId;
import org.apache.iotdb.consensus.common.Peer;
import org.apache.iotdb.consensus.common.request.IConsensusRequest;
import org.apache.iotdb.consensus.common.response.ConsensusGenericResponse;
diff --git a/consensus/src/main/java/org/apache/iotdb/consensus/common/ConsensusGroup.java b/consensus/src/main/java/org/apache/iotdb/consensus/common/ConsensusGroup.java
index f22cc36..49715d3 100644
--- a/consensus/src/main/java/org/apache/iotdb/consensus/common/ConsensusGroup.java
+++ b/consensus/src/main/java/org/apache/iotdb/consensus/common/ConsensusGroup.java
@@ -19,6 +19,8 @@
package org.apache.iotdb.consensus.common;
+import org.apache.iotdb.commons.partition.ConsensusGroupId;
+
import java.util.List;
import java.util.Objects;
diff --git a/consensus/src/main/java/org/apache/iotdb/consensus/common/Peer.java b/consensus/src/main/java/org/apache/iotdb/consensus/common/Peer.java
index 50988c1..02be227 100644
--- a/consensus/src/main/java/org/apache/iotdb/consensus/common/Peer.java
+++ b/consensus/src/main/java/org/apache/iotdb/consensus/common/Peer.java
@@ -19,6 +19,8 @@
package org.apache.iotdb.consensus.common;
+import org.apache.iotdb.commons.partition.ConsensusGroupId;
+
import java.util.Objects;
// TODO Use a mature IDL framework such as Protobuf to manage this structure
diff --git a/consensus/src/main/java/org/apache/iotdb/consensus/exception/ConsensusGroupAlreadyExistException.java b/consensus/src/main/java/org/apache/iotdb/consensus/exception/ConsensusGroupAlreadyExistException.java
index c0a4e0c..7f69568 100644
--- a/consensus/src/main/java/org/apache/iotdb/consensus/exception/ConsensusGroupAlreadyExistException.java
+++ b/consensus/src/main/java/org/apache/iotdb/consensus/exception/ConsensusGroupAlreadyExistException.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.consensus.exception;
-import org.apache.iotdb.consensus.common.ConsensusGroupId;
+import org.apache.iotdb.commons.partition.ConsensusGroupId;
public class ConsensusGroupAlreadyExistException extends ConsensusException {
diff --git a/consensus/src/main/java/org/apache/iotdb/consensus/exception/ConsensusGroupNotExistException.java b/consensus/src/main/java/org/apache/iotdb/consensus/exception/ConsensusGroupNotExistException.java
index e2b2abd..7fd1956 100644
--- a/consensus/src/main/java/org/apache/iotdb/consensus/exception/ConsensusGroupNotExistException.java
+++ b/consensus/src/main/java/org/apache/iotdb/consensus/exception/ConsensusGroupNotExistException.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.consensus.exception;
-import org.apache.iotdb.consensus.common.ConsensusGroupId;
+import org.apache.iotdb.commons.partition.ConsensusGroupId;
public class ConsensusGroupNotExistException extends ConsensusException {
diff --git a/consensus/src/main/java/org/apache/iotdb/consensus/exception/PeerAlreadyInConsensusGroupException.java b/consensus/src/main/java/org/apache/iotdb/consensus/exception/PeerAlreadyInConsensusGroupException.java
index 5cdafff..457e0bd 100644
--- a/consensus/src/main/java/org/apache/iotdb/consensus/exception/PeerAlreadyInConsensusGroupException.java
+++ b/consensus/src/main/java/org/apache/iotdb/consensus/exception/PeerAlreadyInConsensusGroupException.java
@@ -18,7 +18,7 @@
*/
package org.apache.iotdb.consensus.exception;
-import org.apache.iotdb.consensus.common.ConsensusGroupId;
+import org.apache.iotdb.commons.partition.ConsensusGroupId;
import org.apache.iotdb.consensus.common.Peer;
public class PeerAlreadyInConsensusGroupException extends ConsensusException {
diff --git a/consensus/src/main/java/org/apache/iotdb/consensus/exception/PeerNotInConsensusGroupException.java b/consensus/src/main/java/org/apache/iotdb/consensus/exception/PeerNotInConsensusGroupException.java
index bfb8afc..0052416 100644
--- a/consensus/src/main/java/org/apache/iotdb/consensus/exception/PeerNotInConsensusGroupException.java
+++ b/consensus/src/main/java/org/apache/iotdb/consensus/exception/PeerNotInConsensusGroupException.java
@@ -18,7 +18,7 @@
*/
package org.apache.iotdb.consensus.exception;
-import org.apache.iotdb.consensus.common.ConsensusGroupId;
+import org.apache.iotdb.commons.partition.ConsensusGroupId;
import org.apache.ratis.protocol.RaftPeer;
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 52251ff..871ae59 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
@@ -20,7 +20,7 @@
package org.apache.iotdb.consensus.ratis;
import org.apache.iotdb.consensus.IConsensus;
-import org.apache.iotdb.consensus.common.ConsensusGroupId;
+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.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 7e264c6..0403402 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
@@ -18,9 +18,9 @@
*/
package org.apache.iotdb.consensus.ratis;
-import org.apache.iotdb.consensus.common.ConsensusGroupId;
+import org.apache.iotdb.commons.partition.ConsensusGroupId;
import org.apache.iotdb.consensus.common.Endpoint;
-import org.apache.iotdb.consensus.common.GroupType;
+import org.apache.iotdb.commons.partition.GroupType;
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 d2acbde..da1cc06 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
@@ -20,7 +20,7 @@
package org.apache.iotdb.consensus.standalone;
import org.apache.iotdb.consensus.IConsensus;
-import org.apache.iotdb.consensus.common.ConsensusGroupId;
+import org.apache.iotdb.commons.partition.ConsensusGroupId;
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/main/java/org/apache/iotdb/consensus/statemachine/IStateMachine.java b/consensus/src/main/java/org/apache/iotdb/consensus/statemachine/IStateMachine.java
index d0cdc4b..946a305 100644
--- a/consensus/src/main/java/org/apache/iotdb/consensus/statemachine/IStateMachine.java
+++ b/consensus/src/main/java/org/apache/iotdb/consensus/statemachine/IStateMachine.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.consensus.statemachine;
-import org.apache.iotdb.consensus.common.ConsensusGroupId;
+import org.apache.iotdb.commons.partition.ConsensusGroupId;
import org.apache.iotdb.consensus.common.DataSet;
import org.apache.iotdb.consensus.common.request.IConsensusRequest;
import org.apache.iotdb.service.rpc.thrift.TSStatus;
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 edf16f9..99f2931 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
@@ -20,10 +20,10 @@ package org.apache.iotdb.consensus.ratis;
import org.apache.iotdb.consensus.IConsensus;
import org.apache.iotdb.consensus.common.ConsensusGroup;
-import org.apache.iotdb.consensus.common.ConsensusGroupId;
+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.consensus.common.GroupType;
+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/ratis/UtilsTest.java b/consensus/src/test/java/org/apache/iotdb/consensus/ratis/UtilsTest.java
index b2ae44d..b3badf7 100644
--- a/consensus/src/test/java/org/apache/iotdb/consensus/ratis/UtilsTest.java
+++ b/consensus/src/test/java/org/apache/iotdb/consensus/ratis/UtilsTest.java
@@ -18,8 +18,8 @@
*/
package org.apache.iotdb.consensus.ratis;
-import org.apache.iotdb.consensus.common.ConsensusGroupId;
-import org.apache.iotdb.consensus.common.GroupType;
+import org.apache.iotdb.commons.partition.ConsensusGroupId;
+import org.apache.iotdb.commons.partition.GroupType;
import org.apache.ratis.protocol.RaftGroupId;
import org.junit.Assert;
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 1dccfa8..2cf3d4d 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
@@ -20,10 +20,10 @@
package org.apache.iotdb.consensus.standalone;
import org.apache.iotdb.consensus.IConsensus;
-import org.apache.iotdb.consensus.common.ConsensusGroupId;
+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.consensus.common.GroupType;
+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 4350163..54b0215 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
@@ -20,9 +20,9 @@
package org.apache.iotdb.db.consensus;
import org.apache.iotdb.consensus.IConsensus;
-import org.apache.iotdb.consensus.common.ConsensusGroupId;
+import org.apache.iotdb.commons.partition.ConsensusGroupId;
import org.apache.iotdb.consensus.common.Endpoint;
-import org.apache.iotdb.consensus.common.GroupType;
+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.standalone.StandAloneConsensus;