You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by lt...@apache.org on 2019/04/09 16:39:37 UTC
[incubator-iotdb] branch cluster updated: reconstruct package
This is an automated email from the ASF dual-hosted git repository.
lta pushed a commit to branch cluster
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/cluster by this push:
new 0e39049 reconstruct package
new 57b8069 Merge branch 'cluster' of github.com:apache/incubator-iotdb into cluster
0e39049 is described below
commit 0e39049e9943d782e2439c90963e0cfcac15f4f3
Author: lta <li...@163.com>
AuthorDate: Wed Apr 10 00:36:28 2019 +0800
reconstruct package
---
.../java/org/apache/iotdb/cluster/entity/Server.java | 10 +++++-----
.../iotdb/cluster/entity/raft/DataStateMachine.java | 11 +++--------
.../cluster/entity/raft/MetadataStateManchine.java | 6 +++---
.../org/apache/iotdb/cluster/qp/ClusterQPExecutor.java | 10 +++++-----
.../iotdb/cluster/{ => qp}/callback/BatchQPTask.java | 6 +++---
.../iotdb/cluster/{ => qp}/callback/MultiQPTask.java | 2 +-
.../apache/iotdb/cluster/{ => qp}/callback/QPTask.java | 6 +++---
.../iotdb/cluster/{ => qp}/callback/SingleQPTask.java | 6 +++---
.../iotdb/cluster/qp/executor/NonQueryExecutor.java | 18 +++++++++---------
.../cluster/qp/executor/QueryMetadataExecutor.java | 16 ++++++++--------
.../iotdb/cluster/rpc/{ => raft}/NodeAsClient.java | 6 +++---
.../rpc/{ => raft}/closure/ResponseClosure.java | 4 ++--
.../rpc/{ => raft}/impl/RaftNodeAsClientManager.java | 15 +++++++--------
.../{ => raft}/processor/BasicAsyncUserProcessor.java | 4 ++--
.../{ => raft}/processor/BasicSyncUserProcessor.java | 4 ++--
.../processor/DataGroupNonQueryAsyncProcessor.java | 8 ++++----
.../processor/MetaGroupNonQueryAsyncProcessor.java | 8 ++++----
.../processor/QueryMetadataInStringAsyncProcessor.java | 6 +++---
.../processor/QueryTimeSeriesAsyncProcessor.java | 6 +++---
.../rpc/{ => raft}/request/BasicQueryRequest.java | 2 +-
.../cluster/rpc/{ => raft}/request/BasicRequest.java | 2 +-
.../{ => raft}/request/DataGroupNonQueryRequest.java | 2 +-
.../{ => raft}/request/MetaGroupNonQueryRequest.java | 2 +-
.../request/QueryMetadataInStringRequest.java | 2 +-
.../{ => raft}/request/QueryStorageGroupRequest.java | 2 +-
.../rpc/{ => raft}/request/QueryTimeSeriesRequest.java | 2 +-
.../cluster/rpc/{ => raft}/response/BasicResponse.java | 2 +-
.../{ => raft}/response/DataGroupNonQueryResponse.java | 2 +-
.../{ => raft}/response/MetaGroupNonQueryResponse.java | 2 +-
.../response/QueryMetadataInStringResponse.java | 2 +-
.../{ => raft}/response/QueryStorageGroupResponse.java | 2 +-
.../{ => raft}/response/QueryTimeSeriesResponse.java | 2 +-
.../java/org/apache/iotdb/cluster/utils/RaftUtils.java | 12 ++++++------
33 files changed, 92 insertions(+), 98 deletions(-)
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/entity/Server.java b/cluster/src/main/java/org/apache/iotdb/cluster/entity/Server.java
index 3a154f0..be4a74a 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/entity/Server.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/entity/Server.java
@@ -29,11 +29,11 @@ import org.apache.iotdb.cluster.entity.data.DataPartitionHolder;
import org.apache.iotdb.cluster.entity.metadata.MetadataHolder;
import org.apache.iotdb.cluster.entity.raft.DataPartitionRaftHolder;
import org.apache.iotdb.cluster.entity.raft.MetadataRaftHolder;
-import org.apache.iotdb.cluster.rpc.impl.RaftNodeAsClientManager;
-import org.apache.iotdb.cluster.rpc.processor.DataGroupNonQueryAsyncProcessor;
-import org.apache.iotdb.cluster.rpc.processor.MetaGroupNonQueryAsyncProcessor;
-import org.apache.iotdb.cluster.rpc.processor.QueryMetadataInStringAsyncProcessor;
-import org.apache.iotdb.cluster.rpc.processor.QueryTimeSeriesAsyncProcessor;
+import org.apache.iotdb.cluster.rpc.raft.impl.RaftNodeAsClientManager;
+import org.apache.iotdb.cluster.rpc.raft.processor.DataGroupNonQueryAsyncProcessor;
+import org.apache.iotdb.cluster.rpc.raft.processor.MetaGroupNonQueryAsyncProcessor;
+import org.apache.iotdb.cluster.rpc.raft.processor.QueryMetadataInStringAsyncProcessor;
+import org.apache.iotdb.cluster.rpc.raft.processor.QueryTimeSeriesAsyncProcessor;
import org.apache.iotdb.cluster.utils.RaftUtils;
import org.apache.iotdb.cluster.utils.hash.PhysicalNode;
import org.apache.iotdb.cluster.utils.hash.Router;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/entity/raft/DataStateMachine.java b/cluster/src/main/java/org/apache/iotdb/cluster/entity/raft/DataStateMachine.java
index 1a8da10..7e3f3ce 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/entity/raft/DataStateMachine.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/entity/raft/DataStateMachine.java
@@ -23,22 +23,17 @@ import com.alipay.remoting.serialization.SerializerManager;
import com.alipay.sofa.jraft.Closure;
import com.alipay.sofa.jraft.Iterator;
import com.alipay.sofa.jraft.Status;
-import com.alipay.sofa.jraft.closure.ReadIndexClosure;
import com.alipay.sofa.jraft.core.StateMachineAdapter;
import com.alipay.sofa.jraft.entity.LeaderChangeContext;
import com.alipay.sofa.jraft.entity.PeerId;
-import com.alipay.sofa.jraft.util.Bits;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.iotdb.cluster.callback.QPTask;
-import org.apache.iotdb.cluster.callback.SingleQPTask;
import org.apache.iotdb.cluster.entity.Server;
-import org.apache.iotdb.cluster.rpc.closure.ResponseClosure;
-import org.apache.iotdb.cluster.rpc.request.DataGroupNonQueryRequest;
-import org.apache.iotdb.cluster.rpc.response.BasicResponse;
+import org.apache.iotdb.cluster.rpc.raft.closure.ResponseClosure;
+import org.apache.iotdb.cluster.rpc.raft.request.DataGroupNonQueryRequest;
+import org.apache.iotdb.cluster.rpc.raft.response.BasicResponse;
import org.apache.iotdb.cluster.utils.RaftUtils;
import org.apache.iotdb.db.exception.PathErrorException;
import org.apache.iotdb.db.exception.ProcessorException;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/entity/raft/MetadataStateManchine.java b/cluster/src/main/java/org/apache/iotdb/cluster/entity/raft/MetadataStateManchine.java
index 57e7436..fffabb6 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/entity/raft/MetadataStateManchine.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/entity/raft/MetadataStateManchine.java
@@ -31,9 +31,9 @@ import java.nio.ByteBuffer;
import java.util.List;
import java.util.Set;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.iotdb.cluster.rpc.closure.ResponseClosure;
-import org.apache.iotdb.cluster.rpc.request.MetaGroupNonQueryRequest;
-import org.apache.iotdb.cluster.rpc.response.BasicResponse;
+import org.apache.iotdb.cluster.rpc.raft.closure.ResponseClosure;
+import org.apache.iotdb.cluster.rpc.raft.request.MetaGroupNonQueryRequest;
+import org.apache.iotdb.cluster.rpc.raft.response.BasicResponse;
import org.apache.iotdb.cluster.utils.RaftUtils;
import org.apache.iotdb.db.exception.PathErrorException;
import org.apache.iotdb.db.exception.ProcessorException;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/qp/ClusterQPExecutor.java b/cluster/src/main/java/org/apache/iotdb/cluster/qp/ClusterQPExecutor.java
index 90cd1e1..419d95c 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/qp/ClusterQPExecutor.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/qp/ClusterQPExecutor.java
@@ -24,8 +24,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.iotdb.cluster.callback.QPTask;
-import org.apache.iotdb.cluster.callback.QPTask.TaskState;
+import org.apache.iotdb.cluster.qp.callback.QPTask;
+import org.apache.iotdb.cluster.qp.callback.QPTask.TaskState;
import org.apache.iotdb.cluster.config.ClusterConfig;
import org.apache.iotdb.cluster.config.ClusterConstant;
import org.apache.iotdb.cluster.config.ClusterDescriptor;
@@ -33,9 +33,9 @@ import org.apache.iotdb.cluster.entity.Server;
import org.apache.iotdb.cluster.entity.raft.MetadataRaftHolder;
import org.apache.iotdb.cluster.exception.ConsistencyLevelException;
import org.apache.iotdb.cluster.exception.RaftConnectionException;
-import org.apache.iotdb.cluster.rpc.NodeAsClient;
-import org.apache.iotdb.cluster.rpc.impl.RaftNodeAsClientManager;
-import org.apache.iotdb.cluster.rpc.response.BasicResponse;
+import org.apache.iotdb.cluster.rpc.raft.NodeAsClient;
+import org.apache.iotdb.cluster.rpc.raft.impl.RaftNodeAsClientManager;
+import org.apache.iotdb.cluster.rpc.raft.response.BasicResponse;
import org.apache.iotdb.cluster.utils.RaftUtils;
import org.apache.iotdb.cluster.utils.hash.PhysicalNode;
import org.apache.iotdb.cluster.utils.hash.Router;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/callback/BatchQPTask.java b/cluster/src/main/java/org/apache/iotdb/cluster/qp/callback/BatchQPTask.java
similarity index 96%
rename from cluster/src/main/java/org/apache/iotdb/cluster/callback/BatchQPTask.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/qp/callback/BatchQPTask.java
index 491848e..1645056 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/callback/BatchQPTask.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/qp/callback/BatchQPTask.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.cluster.callback;
+package org.apache.iotdb.cluster.qp.callback;
import com.alipay.sofa.jraft.entity.PeerId;
import java.sql.Statement;
@@ -27,8 +27,8 @@ import java.util.Map.Entry;
import java.util.concurrent.locks.ReentrantLock;
import org.apache.iotdb.cluster.exception.RaftConnectionException;
import org.apache.iotdb.cluster.qp.executor.NonQueryExecutor;
-import org.apache.iotdb.cluster.rpc.response.BasicResponse;
-import org.apache.iotdb.cluster.rpc.response.DataGroupNonQueryResponse;
+import org.apache.iotdb.cluster.rpc.raft.response.BasicResponse;
+import org.apache.iotdb.cluster.rpc.raft.response.DataGroupNonQueryResponse;
import org.apache.iotdb.cluster.rpc.service.TSServiceClusterImpl.BatchResult;
import org.apache.iotdb.cluster.utils.RaftUtils;
import org.slf4j.Logger;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/callback/MultiQPTask.java b/cluster/src/main/java/org/apache/iotdb/cluster/qp/callback/MultiQPTask.java
similarity index 96%
rename from cluster/src/main/java/org/apache/iotdb/cluster/callback/MultiQPTask.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/qp/callback/MultiQPTask.java
index 90220c0..de2bd7a 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/callback/MultiQPTask.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/qp/callback/MultiQPTask.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.cluster.callback;
+package org.apache.iotdb.cluster.qp.callback;
import java.util.Map;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/callback/QPTask.java b/cluster/src/main/java/org/apache/iotdb/cluster/qp/callback/QPTask.java
similarity index 94%
rename from cluster/src/main/java/org/apache/iotdb/cluster/callback/QPTask.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/qp/callback/QPTask.java
index 04b74ab..fd21f3f 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/callback/QPTask.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/qp/callback/QPTask.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.cluster.callback;
+package org.apache.iotdb.cluster.qp.callback;
import java.util.concurrent.CountDownLatch;
import org.apache.iotdb.cluster.entity.Server;
-import org.apache.iotdb.cluster.rpc.request.BasicRequest;
-import org.apache.iotdb.cluster.rpc.response.BasicResponse;
+import org.apache.iotdb.cluster.rpc.raft.request.BasicRequest;
+import org.apache.iotdb.cluster.rpc.raft.response.BasicResponse;
public abstract class QPTask {
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/callback/SingleQPTask.java b/cluster/src/main/java/org/apache/iotdb/cluster/qp/callback/SingleQPTask.java
similarity index 91%
rename from cluster/src/main/java/org/apache/iotdb/cluster/callback/SingleQPTask.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/qp/callback/SingleQPTask.java
index f733920..7fc7ba2 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/callback/SingleQPTask.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/qp/callback/SingleQPTask.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.cluster.callback;
+package org.apache.iotdb.cluster.qp.callback;
-import org.apache.iotdb.cluster.rpc.request.BasicRequest;
-import org.apache.iotdb.cluster.rpc.response.BasicResponse;
+import org.apache.iotdb.cluster.rpc.raft.request.BasicRequest;
+import org.apache.iotdb.cluster.rpc.raft.response.BasicResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/qp/executor/NonQueryExecutor.java b/cluster/src/main/java/org/apache/iotdb/cluster/qp/executor/NonQueryExecutor.java
index 6b673c4..cbd1b65 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/qp/executor/NonQueryExecutor.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/qp/executor/NonQueryExecutor.java
@@ -29,21 +29,21 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
-import org.apache.iotdb.cluster.callback.BatchQPTask;
-import org.apache.iotdb.cluster.callback.QPTask;
-import org.apache.iotdb.cluster.callback.SingleQPTask;
+import org.apache.iotdb.cluster.qp.callback.BatchQPTask;
+import org.apache.iotdb.cluster.qp.callback.QPTask;
+import org.apache.iotdb.cluster.qp.callback.SingleQPTask;
import org.apache.iotdb.cluster.config.ClusterConfig;
import org.apache.iotdb.cluster.entity.raft.DataPartitionRaftHolder;
import org.apache.iotdb.cluster.entity.raft.MetadataRaftHolder;
import org.apache.iotdb.cluster.entity.raft.RaftService;
import org.apache.iotdb.cluster.exception.RaftConnectionException;
import org.apache.iotdb.cluster.qp.ClusterQPExecutor;
-import org.apache.iotdb.cluster.rpc.request.BasicRequest;
-import org.apache.iotdb.cluster.rpc.request.DataGroupNonQueryRequest;
-import org.apache.iotdb.cluster.rpc.request.MetaGroupNonQueryRequest;
-import org.apache.iotdb.cluster.rpc.response.BasicResponse;
-import org.apache.iotdb.cluster.rpc.response.DataGroupNonQueryResponse;
-import org.apache.iotdb.cluster.rpc.response.MetaGroupNonQueryResponse;
+import org.apache.iotdb.cluster.rpc.raft.request.BasicRequest;
+import org.apache.iotdb.cluster.rpc.raft.request.DataGroupNonQueryRequest;
+import org.apache.iotdb.cluster.rpc.raft.request.MetaGroupNonQueryRequest;
+import org.apache.iotdb.cluster.rpc.raft.response.BasicResponse;
+import org.apache.iotdb.cluster.rpc.raft.response.DataGroupNonQueryResponse;
+import org.apache.iotdb.cluster.rpc.raft.response.MetaGroupNonQueryResponse;
import org.apache.iotdb.cluster.rpc.service.TSServiceClusterImpl.BatchResult;
import org.apache.iotdb.cluster.utils.RaftUtils;
import org.apache.iotdb.db.exception.PathErrorException;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/qp/executor/QueryMetadataExecutor.java b/cluster/src/main/java/org/apache/iotdb/cluster/qp/executor/QueryMetadataExecutor.java
index 77015ea..8dc20b3 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/qp/executor/QueryMetadataExecutor.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/qp/executor/QueryMetadataExecutor.java
@@ -26,7 +26,7 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
-import org.apache.iotdb.cluster.callback.SingleQPTask;
+import org.apache.iotdb.cluster.qp.callback.SingleQPTask;
import org.apache.iotdb.cluster.config.ClusterConfig;
import org.apache.iotdb.cluster.config.ClusterConstant;
import org.apache.iotdb.cluster.entity.raft.DataPartitionRaftHolder;
@@ -34,13 +34,13 @@ import org.apache.iotdb.cluster.entity.raft.MetadataRaftHolder;
import org.apache.iotdb.cluster.entity.raft.RaftService;
import org.apache.iotdb.cluster.exception.RaftConnectionException;
import org.apache.iotdb.cluster.qp.ClusterQPExecutor;
-import org.apache.iotdb.cluster.rpc.request.QueryMetadataInStringRequest;
-import org.apache.iotdb.cluster.rpc.request.QueryStorageGroupRequest;
-import org.apache.iotdb.cluster.rpc.request.QueryTimeSeriesRequest;
-import org.apache.iotdb.cluster.rpc.response.BasicResponse;
-import org.apache.iotdb.cluster.rpc.response.QueryMetadataInStringResponse;
-import org.apache.iotdb.cluster.rpc.response.QueryStorageGroupResponse;
-import org.apache.iotdb.cluster.rpc.response.QueryTimeSeriesResponse;
+import org.apache.iotdb.cluster.rpc.raft.request.QueryMetadataInStringRequest;
+import org.apache.iotdb.cluster.rpc.raft.request.QueryStorageGroupRequest;
+import org.apache.iotdb.cluster.rpc.raft.request.QueryTimeSeriesRequest;
+import org.apache.iotdb.cluster.rpc.raft.response.BasicResponse;
+import org.apache.iotdb.cluster.rpc.raft.response.QueryMetadataInStringResponse;
+import org.apache.iotdb.cluster.rpc.raft.response.QueryStorageGroupResponse;
+import org.apache.iotdb.cluster.rpc.raft.response.QueryTimeSeriesResponse;
import org.apache.iotdb.cluster.utils.RaftUtils;
import org.apache.iotdb.db.exception.PathErrorException;
import org.apache.iotdb.db.exception.ProcessorException;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/NodeAsClient.java b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/NodeAsClient.java
similarity index 91%
rename from cluster/src/main/java/org/apache/iotdb/cluster/rpc/NodeAsClient.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/NodeAsClient.java
index 826502a..ca5d238 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/NodeAsClient.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/NodeAsClient.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.cluster.rpc;
+package org.apache.iotdb.cluster.rpc.raft;
import com.alipay.sofa.jraft.entity.PeerId;
-import org.apache.iotdb.cluster.callback.QPTask;
+import org.apache.iotdb.cluster.qp.callback.QPTask;
import org.apache.iotdb.cluster.exception.RaftConnectionException;
-import org.apache.iotdb.cluster.rpc.request.BasicRequest;
+import org.apache.iotdb.cluster.rpc.raft.request.BasicRequest;
/**
* Handle the request and process the result as a client with the current node
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/closure/ResponseClosure.java b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/closure/ResponseClosure.java
similarity index 92%
rename from cluster/src/main/java/org/apache/iotdb/cluster/rpc/closure/ResponseClosure.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/closure/ResponseClosure.java
index af69165..e2dbd53 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/closure/ResponseClosure.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/closure/ResponseClosure.java
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.cluster.rpc.closure;
+package org.apache.iotdb.cluster.rpc.raft.closure;
import com.alipay.sofa.jraft.Closure;
import com.alipay.sofa.jraft.Status;
-import org.apache.iotdb.cluster.rpc.response.BasicResponse;
+import org.apache.iotdb.cluster.rpc.raft.response.BasicResponse;
public class ResponseClosure implements Closure {
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/impl/RaftNodeAsClientManager.java b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/impl/RaftNodeAsClientManager.java
similarity index 93%
rename from cluster/src/main/java/org/apache/iotdb/cluster/rpc/impl/RaftNodeAsClientManager.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/impl/RaftNodeAsClientManager.java
index 527126d..4d947df 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/impl/RaftNodeAsClientManager.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/impl/RaftNodeAsClientManager.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.cluster.rpc.impl;
+package org.apache.iotdb.cluster.rpc.raft.impl;
import com.alipay.remoting.InvokeCallback;
import com.alipay.remoting.exception.RemotingException;
@@ -26,15 +26,14 @@ import com.alipay.sofa.jraft.rpc.impl.cli.BoltCliClientService;
import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.ReentrantLock;
-import org.apache.iotdb.cluster.callback.QPTask;
-import org.apache.iotdb.cluster.callback.QPTask.TaskState;
+import org.apache.iotdb.cluster.qp.callback.QPTask;
+import org.apache.iotdb.cluster.qp.callback.QPTask.TaskState;
import org.apache.iotdb.cluster.config.ClusterConfig;
import org.apache.iotdb.cluster.config.ClusterDescriptor;
import org.apache.iotdb.cluster.exception.RaftConnectionException;
-import org.apache.iotdb.cluster.rpc.NodeAsClient;
-import org.apache.iotdb.cluster.rpc.request.BasicRequest;
-import org.apache.iotdb.cluster.rpc.response.BasicResponse;
-import org.apache.iotdb.cluster.rpc.response.DataGroupNonQueryResponse;
+import org.apache.iotdb.cluster.rpc.raft.NodeAsClient;
+import org.apache.iotdb.cluster.rpc.raft.request.BasicRequest;
+import org.apache.iotdb.cluster.rpc.raft.response.BasicResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -150,7 +149,7 @@ public class RaftNodeAsClientManager {
/**
* Implement NodeAsClient with Raft Service
*
- * @see org.apache.iotdb.cluster.rpc.NodeAsClient
+ * @see NodeAsClient
*/
public class RaftNodeAsClient implements NodeAsClient {
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/processor/BasicAsyncUserProcessor.java b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/BasicAsyncUserProcessor.java
similarity index 89%
rename from cluster/src/main/java/org/apache/iotdb/cluster/rpc/processor/BasicAsyncUserProcessor.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/BasicAsyncUserProcessor.java
index db4d9fa..4f0003c 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/processor/BasicAsyncUserProcessor.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/BasicAsyncUserProcessor.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.cluster.rpc.processor;
+package org.apache.iotdb.cluster.rpc.raft.processor;
import com.alipay.remoting.rpc.protocol.AsyncUserProcessor;
-import org.apache.iotdb.cluster.rpc.request.BasicRequest;
+import org.apache.iotdb.cluster.rpc.raft.request.BasicRequest;
public abstract class BasicAsyncUserProcessor<T extends BasicRequest> extends
AsyncUserProcessor<T> {
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/processor/BasicSyncUserProcessor.java b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/BasicSyncUserProcessor.java
similarity index 89%
rename from cluster/src/main/java/org/apache/iotdb/cluster/rpc/processor/BasicSyncUserProcessor.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/BasicSyncUserProcessor.java
index c9a2ef0..1b7920f 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/processor/BasicSyncUserProcessor.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/BasicSyncUserProcessor.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.cluster.rpc.processor;
+package org.apache.iotdb.cluster.rpc.raft.processor;
import com.alipay.remoting.rpc.protocol.SyncUserProcessor;
-import org.apache.iotdb.cluster.rpc.request.BasicRequest;
+import org.apache.iotdb.cluster.rpc.raft.request.BasicRequest;
public abstract class BasicSyncUserProcessor<T extends BasicRequest> extends SyncUserProcessor<T> {
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/processor/DataGroupNonQueryAsyncProcessor.java b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/DataGroupNonQueryAsyncProcessor.java
similarity index 91%
rename from cluster/src/main/java/org/apache/iotdb/cluster/rpc/processor/DataGroupNonQueryAsyncProcessor.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/DataGroupNonQueryAsyncProcessor.java
index bc8d7cb..fb00c0d 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/processor/DataGroupNonQueryAsyncProcessor.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/DataGroupNonQueryAsyncProcessor.java
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.cluster.rpc.processor;
+package org.apache.iotdb.cluster.rpc.raft.processor;
import com.alipay.remoting.AsyncContext;
import com.alipay.remoting.BizContext;
import com.alipay.sofa.jraft.entity.PeerId;
import org.apache.iotdb.cluster.entity.raft.DataPartitionRaftHolder;
import org.apache.iotdb.cluster.entity.raft.RaftService;
-import org.apache.iotdb.cluster.rpc.request.DataGroupNonQueryRequest;
-import org.apache.iotdb.cluster.rpc.response.BasicResponse;
-import org.apache.iotdb.cluster.rpc.response.DataGroupNonQueryResponse;
+import org.apache.iotdb.cluster.rpc.raft.request.DataGroupNonQueryRequest;
+import org.apache.iotdb.cluster.rpc.raft.response.BasicResponse;
+import org.apache.iotdb.cluster.rpc.raft.response.DataGroupNonQueryResponse;
import org.apache.iotdb.cluster.utils.RaftUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/processor/MetaGroupNonQueryAsyncProcessor.java b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/MetaGroupNonQueryAsyncProcessor.java
similarity index 90%
rename from cluster/src/main/java/org/apache/iotdb/cluster/rpc/processor/MetaGroupNonQueryAsyncProcessor.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/MetaGroupNonQueryAsyncProcessor.java
index f38897e..d6f6270 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/processor/MetaGroupNonQueryAsyncProcessor.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/MetaGroupNonQueryAsyncProcessor.java
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.cluster.rpc.processor;
+package org.apache.iotdb.cluster.rpc.raft.processor;
import com.alipay.remoting.AsyncContext;
import com.alipay.remoting.BizContext;
import com.alipay.sofa.jraft.entity.PeerId;
import org.apache.iotdb.cluster.entity.raft.MetadataRaftHolder;
import org.apache.iotdb.cluster.entity.raft.RaftService;
-import org.apache.iotdb.cluster.rpc.request.MetaGroupNonQueryRequest;
-import org.apache.iotdb.cluster.rpc.response.BasicResponse;
-import org.apache.iotdb.cluster.rpc.response.MetaGroupNonQueryResponse;
+import org.apache.iotdb.cluster.rpc.raft.request.MetaGroupNonQueryRequest;
+import org.apache.iotdb.cluster.rpc.raft.response.BasicResponse;
+import org.apache.iotdb.cluster.rpc.raft.response.MetaGroupNonQueryResponse;
import org.apache.iotdb.cluster.utils.RaftUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/processor/QueryMetadataInStringAsyncProcessor.java b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/QueryMetadataInStringAsyncProcessor.java
similarity index 93%
rename from cluster/src/main/java/org/apache/iotdb/cluster/rpc/processor/QueryMetadataInStringAsyncProcessor.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/QueryMetadataInStringAsyncProcessor.java
index ceeea87..5c81756 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/processor/QueryMetadataInStringAsyncProcessor.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/QueryMetadataInStringAsyncProcessor.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.cluster.rpc.processor;
+package org.apache.iotdb.cluster.rpc.raft.processor;
import com.alipay.remoting.AsyncContext;
import com.alipay.remoting.BizContext;
@@ -25,8 +25,8 @@ import com.alipay.sofa.jraft.closure.ReadIndexClosure;
import org.apache.iotdb.cluster.config.ClusterConstant;
import org.apache.iotdb.cluster.entity.raft.DataPartitionRaftHolder;
import org.apache.iotdb.cluster.entity.raft.RaftService;
-import org.apache.iotdb.cluster.rpc.request.QueryMetadataInStringRequest;
-import org.apache.iotdb.cluster.rpc.response.QueryMetadataInStringResponse;
+import org.apache.iotdb.cluster.rpc.raft.request.QueryMetadataInStringRequest;
+import org.apache.iotdb.cluster.rpc.raft.response.QueryMetadataInStringResponse;
import org.apache.iotdb.cluster.utils.RaftUtils;
import org.apache.iotdb.db.metadata.MManager;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/processor/QueryTimeSeriesAsyncProcessor.java b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/QueryTimeSeriesAsyncProcessor.java
similarity index 94%
rename from cluster/src/main/java/org/apache/iotdb/cluster/rpc/processor/QueryTimeSeriesAsyncProcessor.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/QueryTimeSeriesAsyncProcessor.java
index e564e57..a800302 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/processor/QueryTimeSeriesAsyncProcessor.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/processor/QueryTimeSeriesAsyncProcessor.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.cluster.rpc.processor;
+package org.apache.iotdb.cluster.rpc.raft.processor;
import com.alipay.remoting.AsyncContext;
import com.alipay.remoting.BizContext;
@@ -25,8 +25,8 @@ import com.alipay.sofa.jraft.closure.ReadIndexClosure;
import org.apache.iotdb.cluster.config.ClusterConstant;
import org.apache.iotdb.cluster.entity.raft.DataPartitionRaftHolder;
import org.apache.iotdb.cluster.entity.raft.RaftService;
-import org.apache.iotdb.cluster.rpc.request.QueryTimeSeriesRequest;
-import org.apache.iotdb.cluster.rpc.response.QueryTimeSeriesResponse;
+import org.apache.iotdb.cluster.rpc.raft.request.QueryTimeSeriesRequest;
+import org.apache.iotdb.cluster.rpc.raft.response.QueryTimeSeriesResponse;
import org.apache.iotdb.cluster.utils.RaftUtils;
import org.apache.iotdb.db.exception.PathErrorException;
import org.apache.iotdb.db.metadata.MManager;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/request/BasicQueryRequest.java b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/request/BasicQueryRequest.java
similarity index 96%
rename from cluster/src/main/java/org/apache/iotdb/cluster/rpc/request/BasicQueryRequest.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/request/BasicQueryRequest.java
index 46dd9c3..2cf613f 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/request/BasicQueryRequest.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/request/BasicQueryRequest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.cluster.rpc.request;
+package org.apache.iotdb.cluster.rpc.raft.request;
public abstract class BasicQueryRequest extends BasicRequest {
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/request/BasicRequest.java b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/request/BasicRequest.java
similarity index 97%
rename from cluster/src/main/java/org/apache/iotdb/cluster/rpc/request/BasicRequest.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/request/BasicRequest.java
index d1aef37..ee4d840 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/request/BasicRequest.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/request/BasicRequest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.cluster.rpc.request;
+package org.apache.iotdb.cluster.rpc.raft.request;
import java.io.IOException;
import java.io.Serializable;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/request/DataGroupNonQueryRequest.java b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/request/DataGroupNonQueryRequest.java
similarity index 96%
rename from cluster/src/main/java/org/apache/iotdb/cluster/rpc/request/DataGroupNonQueryRequest.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/request/DataGroupNonQueryRequest.java
index a206d34..c1bcf5f 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/request/DataGroupNonQueryRequest.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/request/DataGroupNonQueryRequest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.cluster.rpc.request;
+package org.apache.iotdb.cluster.rpc.raft.request;
import java.io.IOException;
import java.io.Serializable;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/request/MetaGroupNonQueryRequest.java b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/request/MetaGroupNonQueryRequest.java
similarity index 96%
rename from cluster/src/main/java/org/apache/iotdb/cluster/rpc/request/MetaGroupNonQueryRequest.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/request/MetaGroupNonQueryRequest.java
index 3ddf77d..69625ff 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/request/MetaGroupNonQueryRequest.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/request/MetaGroupNonQueryRequest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.cluster.rpc.request;
+package org.apache.iotdb.cluster.rpc.raft.request;
import java.io.IOException;
import java.io.Serializable;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/request/QueryMetadataInStringRequest.java b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/request/QueryMetadataInStringRequest.java
similarity index 95%
rename from cluster/src/main/java/org/apache/iotdb/cluster/rpc/request/QueryMetadataInStringRequest.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/request/QueryMetadataInStringRequest.java
index 8b8ac45..18471a6 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/request/QueryMetadataInStringRequest.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/request/QueryMetadataInStringRequest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.cluster.rpc.request;
+package org.apache.iotdb.cluster.rpc.raft.request;
import java.io.Serializable;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/request/QueryStorageGroupRequest.java b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/request/QueryStorageGroupRequest.java
similarity index 95%
rename from cluster/src/main/java/org/apache/iotdb/cluster/rpc/request/QueryStorageGroupRequest.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/request/QueryStorageGroupRequest.java
index 9772d1f..037924f 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/request/QueryStorageGroupRequest.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/request/QueryStorageGroupRequest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.cluster.rpc.request;
+package org.apache.iotdb.cluster.rpc.raft.request;
import java.io.Serializable;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/request/QueryTimeSeriesRequest.java b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/request/QueryTimeSeriesRequest.java
similarity index 95%
rename from cluster/src/main/java/org/apache/iotdb/cluster/rpc/request/QueryTimeSeriesRequest.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/request/QueryTimeSeriesRequest.java
index 9609759..0106f18 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/request/QueryTimeSeriesRequest.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/request/QueryTimeSeriesRequest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.cluster.rpc.request;
+package org.apache.iotdb.cluster.rpc.raft.request;
import java.io.Serializable;
import java.util.List;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/response/BasicResponse.java b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/response/BasicResponse.java
similarity index 97%
rename from cluster/src/main/java/org/apache/iotdb/cluster/rpc/response/BasicResponse.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/response/BasicResponse.java
index cf4d1b0..bc356a5 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/response/BasicResponse.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/response/BasicResponse.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.cluster.rpc.response;
+package org.apache.iotdb.cluster.rpc.raft.response;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/response/DataGroupNonQueryResponse.java b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/response/DataGroupNonQueryResponse.java
similarity index 96%
rename from cluster/src/main/java/org/apache/iotdb/cluster/rpc/response/DataGroupNonQueryResponse.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/response/DataGroupNonQueryResponse.java
index 505cc11..074f452 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/response/DataGroupNonQueryResponse.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/response/DataGroupNonQueryResponse.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.cluster.rpc.response;
+package org.apache.iotdb.cluster.rpc.raft.response;
/**
* Handle response from data group leader
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/response/MetaGroupNonQueryResponse.java b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/response/MetaGroupNonQueryResponse.java
similarity index 96%
rename from cluster/src/main/java/org/apache/iotdb/cluster/rpc/response/MetaGroupNonQueryResponse.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/response/MetaGroupNonQueryResponse.java
index 131f7c1..f662e35 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/response/MetaGroupNonQueryResponse.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/response/MetaGroupNonQueryResponse.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.cluster.rpc.response;
+package org.apache.iotdb.cluster.rpc.raft.response;
/**
* Handle response from metadata group leader
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/response/QueryMetadataInStringResponse.java b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/response/QueryMetadataInStringResponse.java
similarity index 96%
rename from cluster/src/main/java/org/apache/iotdb/cluster/rpc/response/QueryMetadataInStringResponse.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/response/QueryMetadataInStringResponse.java
index ab5137b..a3a963a 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/response/QueryMetadataInStringResponse.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/response/QueryMetadataInStringResponse.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.cluster.rpc.response;
+package org.apache.iotdb.cluster.rpc.raft.response;
public class QueryMetadataInStringResponse extends BasicResponse {
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/response/QueryStorageGroupResponse.java b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/response/QueryStorageGroupResponse.java
similarity index 97%
rename from cluster/src/main/java/org/apache/iotdb/cluster/rpc/response/QueryStorageGroupResponse.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/response/QueryStorageGroupResponse.java
index d9c2061..6abff89 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/response/QueryStorageGroupResponse.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/response/QueryStorageGroupResponse.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.cluster.rpc.response;
+package org.apache.iotdb.cluster.rpc.raft.response;
import java.util.Set;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/response/QueryTimeSeriesResponse.java b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/response/QueryTimeSeriesResponse.java
similarity index 97%
rename from cluster/src/main/java/org/apache/iotdb/cluster/rpc/response/QueryTimeSeriesResponse.java
rename to cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/response/QueryTimeSeriesResponse.java
index ed42eea..edeb4c4 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/rpc/response/QueryTimeSeriesResponse.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/rpc/raft/response/QueryTimeSeriesResponse.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.cluster.rpc.response;
+package org.apache.iotdb.cluster.rpc.raft.response;
import java.util.ArrayList;
import java.util.List;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/utils/RaftUtils.java b/cluster/src/main/java/org/apache/iotdb/cluster/utils/RaftUtils.java
index 08c252a..7259090 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/utils/RaftUtils.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/utils/RaftUtils.java
@@ -31,17 +31,17 @@ import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.iotdb.cluster.callback.QPTask;
-import org.apache.iotdb.cluster.callback.SingleQPTask;
+import org.apache.iotdb.cluster.qp.callback.QPTask;
+import org.apache.iotdb.cluster.qp.callback.SingleQPTask;
import org.apache.iotdb.cluster.config.ClusterConfig;
import org.apache.iotdb.cluster.entity.Server;
import org.apache.iotdb.cluster.entity.raft.DataPartitionRaftHolder;
import org.apache.iotdb.cluster.entity.raft.MetadataRaftHolder;
import org.apache.iotdb.cluster.entity.raft.RaftService;
-import org.apache.iotdb.cluster.rpc.closure.ResponseClosure;
-import org.apache.iotdb.cluster.rpc.request.BasicRequest;
-import org.apache.iotdb.cluster.rpc.response.BasicResponse;
-import org.apache.iotdb.cluster.rpc.response.MetaGroupNonQueryResponse;
+import org.apache.iotdb.cluster.rpc.raft.closure.ResponseClosure;
+import org.apache.iotdb.cluster.rpc.raft.request.BasicRequest;
+import org.apache.iotdb.cluster.rpc.raft.response.BasicResponse;
+import org.apache.iotdb.cluster.rpc.raft.response.MetaGroupNonQueryResponse;
import org.apache.iotdb.cluster.utils.hash.PhysicalNode;
import org.apache.iotdb.cluster.utils.hash.Router;
import org.slf4j.Logger;