You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ro...@apache.org on 2023/08/11 12:02:20 UTC
[iotdb] 01/03: refactor package name
This is an automated email from the ASF dual-hosted git repository.
rong pushed a commit to branch pipe-connector-package-refactor
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 91b4c21c8189df61ec3c6fa4d3524787f74cb33f
Author: Steve Yurong Su <ro...@apache.org>
AuthorDate: Fri Aug 11 18:48:14 2023 +0800
refactor package name
---
.../db/pipe/agent/receiver/PipeReceiverAgent.java | 5 +++--
...yncConnector.java => IoTDBLegacyPipeConnector.java} | 12 ++++++------
.../{base => thrift}/IoTDBThriftConnector.java | 2 +-
.../IoTDBThriftConnectorRequestVersion.java | 2 +-
.../{v2 => thrift/async}/IoTDBThriftConnectorV2.java | 18 +++++++++---------
...eTransferInsertNodeTabletInsertionEventHandler.java | 4 ++--
.../PipeTransferRawTabletInsertionEventHandler.java | 4 ++--
.../PipeTransferTabletInsertionEventHandler.java | 4 ++--
.../PipeTransferTsFileInsertionEventHandler.java | 10 +++++-----
.../{v1 => thrift/payload}/PipeRequestType.java | 2 +-
.../payload}/reponse/PipeTransferFilePieceResp.java | 2 +-
.../payload}/request/PipeTransferFilePieceReq.java | 6 +++---
.../payload}/request/PipeTransferFileSealReq.java | 6 +++---
.../payload}/request/PipeTransferHandshakeReq.java | 6 +++---
.../payload}/request/PipeTransferInsertNodeReq.java | 6 +++---
.../payload}/request/PipeTransferTabletReq.java | 6 +++---
.../sync}/IoTDBThriftConnectorClient.java | 2 +-
.../{v1 => thrift/sync}/IoTDBThriftConnectorV1.java | 16 ++++++++--------
.../legacy/IoTDBLegacyPipeReceiver.java} | 16 ++++++++--------
.../thrift}/IoTDBThriftReceiver.java | 4 ++--
.../v1 => receiver/thrift}/IoTDBThriftReceiverV1.java | 18 +++++++++---------
.../subtask/connector/PipeConnectorSubtaskManager.java | 8 ++++----
.../db/protocol/thrift/impl/ClientRPCServiceImpl.java | 10 +++++-----
.../iotdb/db/pipe/connector/PipeConnectorTest.java | 8 ++++----
.../iotdb/db/pipe/connector/PipeReceiverTest.java | 6 +++---
.../iotdb/db/pipe/connector/PipeThriftRequestTest.java | 12 ++++++------
26 files changed, 98 insertions(+), 97 deletions(-)
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/receiver/PipeReceiverAgent.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/receiver/PipeReceiverAgent.java
index 4610d0b31c9..44f35d23203 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/receiver/PipeReceiverAgent.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/receiver/PipeReceiverAgent.java
@@ -20,8 +20,9 @@
package org.apache.iotdb.db.pipe.agent.receiver;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
-import org.apache.iotdb.db.pipe.connector.IoTDBThriftConnectorRequestVersion;
-import org.apache.iotdb.db.pipe.connector.v1.IoTDBThriftReceiverV1;
+import org.apache.iotdb.db.pipe.connector.thrift.IoTDBThriftConnectorRequestVersion;
+import org.apache.iotdb.db.pipe.receiver.thrift.IoTDBThriftReceiver;
+import org.apache.iotdb.db.pipe.receiver.thrift.IoTDBThriftReceiverV1;
import org.apache.iotdb.db.queryengine.plan.analyze.IPartitionFetcher;
import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaFetcher;
import org.apache.iotdb.rpc.RpcUtils;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/legacy/IoTDBSyncConnector.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/legacy/IoTDBLegacyPipeConnector.java
similarity index 96%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/legacy/IoTDBSyncConnector.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/legacy/IoTDBLegacyPipeConnector.java
index 5ea56cea166..ccf3f007951 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/legacy/IoTDBSyncConnector.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/legacy/IoTDBLegacyPipeConnector.java
@@ -27,7 +27,7 @@ import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.commons.exception.pipe.PipeRuntimeCriticalException;
import org.apache.iotdb.commons.pipe.config.PipeConfig;
import org.apache.iotdb.db.pipe.connector.legacy.pipedata.TsFilePipeData;
-import org.apache.iotdb.db.pipe.connector.v1.IoTDBThriftConnectorClient;
+import org.apache.iotdb.db.pipe.connector.thrift.sync.IoTDBThriftConnectorClient;
import org.apache.iotdb.db.pipe.event.common.tablet.PipeInsertNodeTabletInsertionEvent;
import org.apache.iotdb.db.pipe.event.common.tablet.PipeRawTabletInsertionEvent;
import org.apache.iotdb.db.pipe.event.common.tsfile.PipeTsFileInsertionEvent;
@@ -67,9 +67,9 @@ import static org.apache.iotdb.db.pipe.config.constant.PipeConnectorConstant.CON
import static org.apache.iotdb.db.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_USER_DEFAULT_VALUE;
import static org.apache.iotdb.db.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_USER_KEY;
-public class IoTDBSyncConnector implements PipeConnector {
+public class IoTDBLegacyPipeConnector implements PipeConnector {
- private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBSyncConnector.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBLegacyPipeConnector.class);
private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
@@ -172,7 +172,7 @@ public class IoTDBSyncConnector implements PipeConnector {
doTransfer((PipeRawTabletInsertionEvent) tabletInsertionEvent);
} else {
throw new NotImplementedException(
- "IoTDBSyncConnector only support "
+ "IoTDBLegacyPipeConnector only support "
+ "PipeInsertNodeInsertionEvent and PipeTabletInsertionEvent.");
}
}
@@ -181,7 +181,7 @@ public class IoTDBSyncConnector implements PipeConnector {
public void transfer(TsFileInsertionEvent tsFileInsertionEvent) throws Exception {
if (!(tsFileInsertionEvent instanceof PipeTsFileInsertionEvent)) {
throw new NotImplementedException(
- "IoTDBSyncConnector only support PipeTsFileInsertionEvent.");
+ "IoTDBLegacyPipeConnector only support PipeTsFileInsertionEvent.");
}
try {
@@ -196,7 +196,7 @@ public class IoTDBSyncConnector implements PipeConnector {
@Override
public void transfer(Event event) throws Exception {
- LOGGER.warn("IoTDBSyncConnector does not support transfer generic event: {}.", event);
+ LOGGER.warn("IoTDBLegacyPipeConnector does not support transfer generic event: {}.", event);
}
private void doTransfer(PipeInsertNodeTabletInsertionEvent pipeInsertNodeInsertionEvent)
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/base/IoTDBThriftConnector.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/IoTDBThriftConnector.java
similarity index 98%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/base/IoTDBThriftConnector.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/IoTDBThriftConnector.java
index a16a8a0fe2e..8d2bfd25c3d 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/base/IoTDBThriftConnector.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/IoTDBThriftConnector.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.base;
+package org.apache.iotdb.db.pipe.connector.thrift;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.pipe.api.PipeConnector;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/IoTDBThriftConnectorRequestVersion.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/IoTDBThriftConnectorRequestVersion.java
similarity index 95%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/IoTDBThriftConnectorRequestVersion.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/IoTDBThriftConnectorRequestVersion.java
index 670dd9eb6e0..5fc37ddfdb4 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/IoTDBThriftConnectorRequestVersion.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/IoTDBThriftConnectorRequestVersion.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector;
+package org.apache.iotdb.db.pipe.connector.thrift;
public enum IoTDBThriftConnectorRequestVersion {
VERSION_1((byte) 1),
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v2/IoTDBThriftConnectorV2.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/IoTDBThriftConnectorV2.java
similarity index 95%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v2/IoTDBThriftConnectorV2.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/IoTDBThriftConnectorV2.java
index 87f21de974e..5f2071108e8 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v2/IoTDBThriftConnectorV2.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/IoTDBThriftConnectorV2.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.v2;
+package org.apache.iotdb.db.pipe.connector.thrift.async;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.commons.client.ClientPoolFactory;
@@ -27,14 +27,14 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory;
import org.apache.iotdb.commons.concurrent.ThreadName;
import org.apache.iotdb.commons.concurrent.threadpool.ScheduledExecutorUtil;
import org.apache.iotdb.commons.conf.CommonDescriptor;
-import org.apache.iotdb.db.pipe.connector.base.IoTDBThriftConnector;
-import org.apache.iotdb.db.pipe.connector.v1.IoTDBThriftConnectorV1;
-import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferHandshakeReq;
-import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferInsertNodeReq;
-import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferTabletReq;
-import org.apache.iotdb.db.pipe.connector.v2.handler.PipeTransferInsertNodeTabletInsertionEventHandler;
-import org.apache.iotdb.db.pipe.connector.v2.handler.PipeTransferRawTabletInsertionEventHandler;
-import org.apache.iotdb.db.pipe.connector.v2.handler.PipeTransferTsFileInsertionEventHandler;
+import org.apache.iotdb.db.pipe.connector.thrift.IoTDBThriftConnector;
+import org.apache.iotdb.db.pipe.connector.thrift.async.handler.PipeTransferInsertNodeTabletInsertionEventHandler;
+import org.apache.iotdb.db.pipe.connector.thrift.async.handler.PipeTransferRawTabletInsertionEventHandler;
+import org.apache.iotdb.db.pipe.connector.thrift.async.handler.PipeTransferTsFileInsertionEventHandler;
+import org.apache.iotdb.db.pipe.connector.thrift.payload.request.PipeTransferHandshakeReq;
+import org.apache.iotdb.db.pipe.connector.thrift.payload.request.PipeTransferInsertNodeReq;
+import org.apache.iotdb.db.pipe.connector.thrift.payload.request.PipeTransferTabletReq;
+import org.apache.iotdb.db.pipe.connector.thrift.sync.IoTDBThriftConnectorV1;
import org.apache.iotdb.db.pipe.event.EnrichedEvent;
import org.apache.iotdb.db.pipe.event.common.tablet.PipeInsertNodeTabletInsertionEvent;
import org.apache.iotdb.db.pipe.event.common.tablet.PipeRawTabletInsertionEvent;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v2/handler/PipeTransferInsertNodeTabletInsertionEventHandler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/handler/PipeTransferInsertNodeTabletInsertionEventHandler.java
similarity index 92%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v2/handler/PipeTransferInsertNodeTabletInsertionEventHandler.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/handler/PipeTransferInsertNodeTabletInsertionEventHandler.java
index 4cb3643ba03..e73520a167c 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v2/handler/PipeTransferInsertNodeTabletInsertionEventHandler.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/handler/PipeTransferInsertNodeTabletInsertionEventHandler.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.v2.handler;
+package org.apache.iotdb.db.pipe.connector.thrift.async.handler;
import org.apache.iotdb.commons.client.async.AsyncPipeDataTransferServiceClient;
-import org.apache.iotdb.db.pipe.connector.v2.IoTDBThriftConnectorV2;
+import org.apache.iotdb.db.pipe.connector.thrift.async.IoTDBThriftConnectorV2;
import org.apache.iotdb.db.pipe.event.common.tablet.PipeInsertNodeTabletInsertionEvent;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferResp;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v2/handler/PipeTransferRawTabletInsertionEventHandler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/handler/PipeTransferRawTabletInsertionEventHandler.java
similarity index 92%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v2/handler/PipeTransferRawTabletInsertionEventHandler.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/handler/PipeTransferRawTabletInsertionEventHandler.java
index c35c0103ce2..74e57dd7a77 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v2/handler/PipeTransferRawTabletInsertionEventHandler.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/handler/PipeTransferRawTabletInsertionEventHandler.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.v2.handler;
+package org.apache.iotdb.db.pipe.connector.thrift.async.handler;
import org.apache.iotdb.commons.client.async.AsyncPipeDataTransferServiceClient;
-import org.apache.iotdb.db.pipe.connector.v2.IoTDBThriftConnectorV2;
+import org.apache.iotdb.db.pipe.connector.thrift.async.IoTDBThriftConnectorV2;
import org.apache.iotdb.db.pipe.event.common.tablet.PipeRawTabletInsertionEvent;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferResp;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v2/handler/PipeTransferTabletInsertionEventHandler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/handler/PipeTransferTabletInsertionEventHandler.java
similarity index 95%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v2/handler/PipeTransferTabletInsertionEventHandler.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/handler/PipeTransferTabletInsertionEventHandler.java
index 3ab2220a477..c5ef788786d 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v2/handler/PipeTransferTabletInsertionEventHandler.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/handler/PipeTransferTabletInsertionEventHandler.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.v2.handler;
+package org.apache.iotdb.db.pipe.connector.thrift.async.handler;
import org.apache.iotdb.commons.client.async.AsyncPipeDataTransferServiceClient;
-import org.apache.iotdb.db.pipe.connector.v2.IoTDBThriftConnectorV2;
+import org.apache.iotdb.db.pipe.connector.thrift.async.IoTDBThriftConnectorV2;
import org.apache.iotdb.db.pipe.event.EnrichedEvent;
import org.apache.iotdb.pipe.api.event.Event;
import org.apache.iotdb.pipe.api.exception.PipeException;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v2/handler/PipeTransferTsFileInsertionEventHandler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/handler/PipeTransferTsFileInsertionEventHandler.java
similarity index 93%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v2/handler/PipeTransferTsFileInsertionEventHandler.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/handler/PipeTransferTsFileInsertionEventHandler.java
index 2172d551e9f..77d40bc4713 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v2/handler/PipeTransferTsFileInsertionEventHandler.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/handler/PipeTransferTsFileInsertionEventHandler.java
@@ -17,14 +17,14 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.v2.handler;
+package org.apache.iotdb.db.pipe.connector.thrift.async.handler;
import org.apache.iotdb.commons.client.async.AsyncPipeDataTransferServiceClient;
import org.apache.iotdb.commons.pipe.config.PipeConfig;
-import org.apache.iotdb.db.pipe.connector.v1.reponse.PipeTransferFilePieceResp;
-import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferFilePieceReq;
-import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferFileSealReq;
-import org.apache.iotdb.db.pipe.connector.v2.IoTDBThriftConnectorV2;
+import org.apache.iotdb.db.pipe.connector.thrift.async.IoTDBThriftConnectorV2;
+import org.apache.iotdb.db.pipe.connector.thrift.payload.reponse.PipeTransferFilePieceResp;
+import org.apache.iotdb.db.pipe.connector.thrift.payload.request.PipeTransferFilePieceReq;
+import org.apache.iotdb.db.pipe.connector.thrift.payload.request.PipeTransferFileSealReq;
import org.apache.iotdb.db.pipe.event.common.tsfile.PipeTsFileInsertionEvent;
import org.apache.iotdb.pipe.api.exception.PipeException;
import org.apache.iotdb.rpc.TSStatusCode;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v1/PipeRequestType.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/payload/PipeRequestType.java
similarity index 96%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v1/PipeRequestType.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/payload/PipeRequestType.java
index b24ef0e9066..fc2307f7728 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v1/PipeRequestType.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/payload/PipeRequestType.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.v1;
+package org.apache.iotdb.db.pipe.connector.thrift.payload;
import java.util.Arrays;
import java.util.HashMap;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v1/reponse/PipeTransferFilePieceResp.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/payload/reponse/PipeTransferFilePieceResp.java
similarity index 97%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v1/reponse/PipeTransferFilePieceResp.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/payload/reponse/PipeTransferFilePieceResp.java
index 8b96e0242a2..dbdd6251b3b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v1/reponse/PipeTransferFilePieceResp.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/payload/reponse/PipeTransferFilePieceResp.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.v1.reponse;
+package org.apache.iotdb.db.pipe.connector.thrift.payload.reponse;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferResp;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v1/request/PipeTransferFilePieceReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/payload/request/PipeTransferFilePieceReq.java
similarity index 94%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v1/request/PipeTransferFilePieceReq.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/payload/request/PipeTransferFilePieceReq.java
index d2b4c1e14aa..07c7bbba780 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v1/request/PipeTransferFilePieceReq.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/payload/request/PipeTransferFilePieceReq.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.v1.request;
+package org.apache.iotdb.db.pipe.connector.thrift.payload.request;
-import org.apache.iotdb.db.pipe.connector.IoTDBThriftConnectorRequestVersion;
-import org.apache.iotdb.db.pipe.connector.v1.PipeRequestType;
+import org.apache.iotdb.db.pipe.connector.thrift.IoTDBThriftConnectorRequestVersion;
+import org.apache.iotdb.db.pipe.connector.thrift.payload.PipeRequestType;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq;
import org.apache.iotdb.tsfile.utils.Binary;
import org.apache.iotdb.tsfile.utils.PublicBAOS;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v1/request/PipeTransferFileSealReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/payload/request/PipeTransferFileSealReq.java
similarity index 93%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v1/request/PipeTransferFileSealReq.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/payload/request/PipeTransferFileSealReq.java
index 2a8010ad9c2..05eb8ec10c7 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v1/request/PipeTransferFileSealReq.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/payload/request/PipeTransferFileSealReq.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.v1.request;
+package org.apache.iotdb.db.pipe.connector.thrift.payload.request;
-import org.apache.iotdb.db.pipe.connector.IoTDBThriftConnectorRequestVersion;
-import org.apache.iotdb.db.pipe.connector.v1.PipeRequestType;
+import org.apache.iotdb.db.pipe.connector.thrift.IoTDBThriftConnectorRequestVersion;
+import org.apache.iotdb.db.pipe.connector.thrift.payload.PipeRequestType;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq;
import org.apache.iotdb.tsfile.utils.PublicBAOS;
import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v1/request/PipeTransferHandshakeReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/payload/request/PipeTransferHandshakeReq.java
similarity index 93%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v1/request/PipeTransferHandshakeReq.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/payload/request/PipeTransferHandshakeReq.java
index 71d597f085b..70cce6395a5 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v1/request/PipeTransferHandshakeReq.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/payload/request/PipeTransferHandshakeReq.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.v1.request;
+package org.apache.iotdb.db.pipe.connector.thrift.payload.request;
-import org.apache.iotdb.db.pipe.connector.IoTDBThriftConnectorRequestVersion;
-import org.apache.iotdb.db.pipe.connector.v1.PipeRequestType;
+import org.apache.iotdb.db.pipe.connector.thrift.IoTDBThriftConnectorRequestVersion;
+import org.apache.iotdb.db.pipe.connector.thrift.payload.PipeRequestType;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq;
import org.apache.iotdb.tsfile.utils.PublicBAOS;
import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v1/request/PipeTransferInsertNodeReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/payload/request/PipeTransferInsertNodeReq.java
similarity index 95%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v1/request/PipeTransferInsertNodeReq.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/payload/request/PipeTransferInsertNodeReq.java
index d9c80ddb1ec..7b255611098 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v1/request/PipeTransferInsertNodeReq.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/payload/request/PipeTransferInsertNodeReq.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.v1.request;
+package org.apache.iotdb.db.pipe.connector.thrift.payload.request;
-import org.apache.iotdb.db.pipe.connector.IoTDBThriftConnectorRequestVersion;
-import org.apache.iotdb.db.pipe.connector.v1.PipeRequestType;
+import org.apache.iotdb.db.pipe.connector.thrift.IoTDBThriftConnectorRequestVersion;
+import org.apache.iotdb.db.pipe.connector.thrift.payload.PipeRequestType;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeType;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v1/request/PipeTransferTabletReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/payload/request/PipeTransferTabletReq.java
similarity index 97%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v1/request/PipeTransferTabletReq.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/payload/request/PipeTransferTabletReq.java
index 94fdf57921b..4f219949735 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v1/request/PipeTransferTabletReq.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/payload/request/PipeTransferTabletReq.java
@@ -17,12 +17,12 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.v1.request;
+package org.apache.iotdb.db.pipe.connector.thrift.payload.request;
import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.commons.utils.PathUtils;
-import org.apache.iotdb.db.pipe.connector.IoTDBThriftConnectorRequestVersion;
-import org.apache.iotdb.db.pipe.connector.v1.PipeRequestType;
+import org.apache.iotdb.db.pipe.connector.thrift.IoTDBThriftConnectorRequestVersion;
+import org.apache.iotdb.db.pipe.connector.thrift.payload.PipeRequestType;
import org.apache.iotdb.db.queryengine.plan.parser.StatementGenerator;
import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v1/IoTDBThriftConnectorClient.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/sync/IoTDBThriftConnectorClient.java
similarity index 97%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v1/IoTDBThriftConnectorClient.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/sync/IoTDBThriftConnectorClient.java
index 6cf59342ed2..009de91c8e4 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v1/IoTDBThriftConnectorClient.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/sync/IoTDBThriftConnectorClient.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.v1;
+package org.apache.iotdb.db.pipe.connector.thrift.sync;
import org.apache.iotdb.commons.client.ThriftClient;
import org.apache.iotdb.commons.client.property.ThriftClientProperty;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v1/IoTDBThriftConnectorV1.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/sync/IoTDBThriftConnectorV1.java
similarity index 94%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v1/IoTDBThriftConnectorV1.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/sync/IoTDBThriftConnectorV1.java
index b0c2354068b..f32d25f36f6 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v1/IoTDBThriftConnectorV1.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/sync/IoTDBThriftConnectorV1.java
@@ -17,19 +17,19 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.v1;
+package org.apache.iotdb.db.pipe.connector.thrift.sync;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.commons.client.property.ThriftClientProperty;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.pipe.config.PipeConfig;
-import org.apache.iotdb.db.pipe.connector.base.IoTDBThriftConnector;
-import org.apache.iotdb.db.pipe.connector.v1.reponse.PipeTransferFilePieceResp;
-import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferFilePieceReq;
-import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferFileSealReq;
-import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferHandshakeReq;
-import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferInsertNodeReq;
-import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferTabletReq;
+import org.apache.iotdb.db.pipe.connector.thrift.IoTDBThriftConnector;
+import org.apache.iotdb.db.pipe.connector.thrift.payload.reponse.PipeTransferFilePieceResp;
+import org.apache.iotdb.db.pipe.connector.thrift.payload.request.PipeTransferFilePieceReq;
+import org.apache.iotdb.db.pipe.connector.thrift.payload.request.PipeTransferFileSealReq;
+import org.apache.iotdb.db.pipe.connector.thrift.payload.request.PipeTransferHandshakeReq;
+import org.apache.iotdb.db.pipe.connector.thrift.payload.request.PipeTransferInsertNodeReq;
+import org.apache.iotdb.db.pipe.connector.thrift.payload.request.PipeTransferTabletReq;
import org.apache.iotdb.db.pipe.event.common.tablet.PipeInsertNodeTabletInsertionEvent;
import org.apache.iotdb.db.pipe.event.common.tablet.PipeRawTabletInsertionEvent;
import org.apache.iotdb.db.pipe.event.common.tsfile.PipeTsFileInsertionEvent;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/legacy/IoTDBSyncReceiver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/legacy/IoTDBLegacyPipeReceiver.java
similarity index 97%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/legacy/IoTDBSyncReceiver.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/legacy/IoTDBLegacyPipeReceiver.java
index 20b63c31535..549bd62f109 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/legacy/IoTDBSyncReceiver.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/legacy/IoTDBLegacyPipeReceiver.java
@@ -18,7 +18,7 @@
*
*/
-package org.apache.iotdb.db.pipe.connector.legacy;
+package org.apache.iotdb.db.pipe.receiver.legacy;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.conf.CommonDescriptor;
@@ -52,9 +52,9 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicLong;
-public class IoTDBSyncReceiver {
+public class IoTDBLegacyPipeReceiver {
- private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBSyncReceiver.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBLegacyPipeReceiver.class);
private static final String PATCH_SUFFIX = ".patch";
@@ -162,7 +162,7 @@ public class IoTDBSyncReceiver {
* @return {@link TSStatusCode#PIPESERVER_ERROR} if fail to receive or load; {@link
* TSStatusCode#SUCCESS_STATUS} if load successfully.
* @throws TException The connection between the sender and the receiver has not been established
- * by {@link IoTDBSyncReceiver#handshake}
+ * by {@link IoTDBLegacyPipeReceiver#handshake}
*/
public TSStatus transportPipeData(ByteBuffer buff) throws TException {
// step1. check connection
@@ -260,7 +260,7 @@ public class IoTDBSyncReceiver {
* TSStatusCode#SYNC_FILE_REDIRECTION_ERROR} if startIndex needs to rollback because
* mismatched; {@link TSStatusCode#SYNC_FILE_ERROR} if fail to receive file.
* @throws TException The connection between the sender and the receiver has not been established
- * by {@link IoTDBSyncReceiver#handshake}
+ * by {@link IoTDBLegacyPipeReceiver#handshake}
*/
public TSStatus transportFile(TSyncTransportMetaInfo metaInfo, ByteBuffer buff)
throws TException {
@@ -442,13 +442,13 @@ public class IoTDBSyncReceiver {
///////////////////////// singleton /////////////////////////
- private IoTDBSyncReceiver() {}
+ private IoTDBLegacyPipeReceiver() {}
- public static IoTDBSyncReceiver getInstance() {
+ public static IoTDBLegacyPipeReceiver getInstance() {
return IoTDBSyncReceiverHolder.INSTANCE;
}
private static class IoTDBSyncReceiverHolder {
- private static final IoTDBSyncReceiver INSTANCE = new IoTDBSyncReceiver();
+ private static final IoTDBLegacyPipeReceiver INSTANCE = new IoTDBLegacyPipeReceiver();
}
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/receiver/IoTDBThriftReceiver.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/thrift/IoTDBThriftReceiver.java
similarity index 90%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/receiver/IoTDBThriftReceiver.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/thrift/IoTDBThriftReceiver.java
index 88f571bd70f..7305654e8fb 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/agent/receiver/IoTDBThriftReceiver.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/thrift/IoTDBThriftReceiver.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.agent.receiver;
+package org.apache.iotdb.db.pipe.receiver.thrift;
-import org.apache.iotdb.db.pipe.connector.IoTDBThriftConnectorRequestVersion;
+import org.apache.iotdb.db.pipe.connector.thrift.IoTDBThriftConnectorRequestVersion;
import org.apache.iotdb.db.queryengine.plan.analyze.IPartitionFetcher;
import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaFetcher;
import org.apache.iotdb.service.rpc.thrift.TPipeTransferReq;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v1/IoTDBThriftReceiverV1.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/thrift/IoTDBThriftReceiverV1.java
similarity index 96%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v1/IoTDBThriftReceiverV1.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/thrift/IoTDBThriftReceiverV1.java
index c2b56be5995..411aedfa276 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/v1/IoTDBThriftReceiverV1.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/thrift/IoTDBThriftReceiverV1.java
@@ -17,20 +17,20 @@
* under the License.
*/
-package org.apache.iotdb.db.pipe.connector.v1;
+package org.apache.iotdb.db.pipe.receiver.thrift;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
-import org.apache.iotdb.db.pipe.agent.receiver.IoTDBThriftReceiver;
-import org.apache.iotdb.db.pipe.connector.IoTDBThriftConnectorRequestVersion;
-import org.apache.iotdb.db.pipe.connector.v1.reponse.PipeTransferFilePieceResp;
-import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferFilePieceReq;
-import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferFileSealReq;
-import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferHandshakeReq;
-import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferInsertNodeReq;
-import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferTabletReq;
+import org.apache.iotdb.db.pipe.connector.thrift.IoTDBThriftConnectorRequestVersion;
+import org.apache.iotdb.db.pipe.connector.thrift.payload.PipeRequestType;
+import org.apache.iotdb.db.pipe.connector.thrift.payload.reponse.PipeTransferFilePieceResp;
+import org.apache.iotdb.db.pipe.connector.thrift.payload.request.PipeTransferFilePieceReq;
+import org.apache.iotdb.db.pipe.connector.thrift.payload.request.PipeTransferFileSealReq;
+import org.apache.iotdb.db.pipe.connector.thrift.payload.request.PipeTransferHandshakeReq;
+import org.apache.iotdb.db.pipe.connector.thrift.payload.request.PipeTransferInsertNodeReq;
+import org.apache.iotdb.db.pipe.connector.thrift.payload.request.PipeTransferTabletReq;
import org.apache.iotdb.db.protocol.session.SessionManager;
import org.apache.iotdb.db.queryengine.plan.Coordinator;
import org.apache.iotdb.db.queryengine.plan.analyze.IPartitionFetcher;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/subtask/connector/PipeConnectorSubtaskManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/subtask/connector/PipeConnectorSubtaskManager.java
index 358d9aa8d1c..39d01757250 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/subtask/connector/PipeConnectorSubtaskManager.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/task/subtask/connector/PipeConnectorSubtaskManager.java
@@ -24,9 +24,9 @@ import org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin;
import org.apache.iotdb.db.pipe.agent.PipeAgent;
import org.apache.iotdb.db.pipe.config.constant.PipeConnectorConstant;
import org.apache.iotdb.db.pipe.config.plugin.configuraion.PipeTaskRuntimeConfiguration;
-import org.apache.iotdb.db.pipe.connector.legacy.IoTDBSyncConnector;
-import org.apache.iotdb.db.pipe.connector.v1.IoTDBThriftConnectorV1;
-import org.apache.iotdb.db.pipe.connector.v2.IoTDBThriftConnectorV2;
+import org.apache.iotdb.db.pipe.connector.legacy.IoTDBLegacyPipeConnector;
+import org.apache.iotdb.db.pipe.connector.thrift.async.IoTDBThriftConnectorV2;
+import org.apache.iotdb.db.pipe.connector.thrift.sync.IoTDBThriftConnectorV1;
import org.apache.iotdb.db.pipe.execution.executor.PipeConnectorSubtaskExecutor;
import org.apache.iotdb.db.pipe.task.connection.BoundedBlockingPendingQueue;
import org.apache.iotdb.pipe.api.PipeConnector;
@@ -71,7 +71,7 @@ public class PipeConnectorSubtaskManager {
BuiltinPipePlugin.IOTDB_THRIFT_CONNECTOR_V2.getPipePluginName())) {
pipeConnector = new IoTDBThriftConnectorV2();
} else if (connectorKey.equals(BuiltinPipePlugin.IOTDB_SYNC_CONNECTOR.getPipePluginName())) {
- pipeConnector = new IoTDBSyncConnector();
+ pipeConnector = new IoTDBLegacyPipeConnector();
} else {
pipeConnector = PipeAgent.plugin().reflectConnector(pipeConnectorParameters);
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java
index 06d2505dcac..25e7d3db2c6 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java
@@ -43,7 +43,7 @@ import org.apache.iotdb.db.auth.AuthorityChecker;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.pipe.agent.PipeAgent;
-import org.apache.iotdb.db.pipe.connector.legacy.IoTDBSyncReceiver;
+import org.apache.iotdb.db.pipe.receiver.legacy.IoTDBLegacyPipeReceiver;
import org.apache.iotdb.db.protocol.basic.BasicOpenSessionResp;
import org.apache.iotdb.db.protocol.session.IClientSession;
import org.apache.iotdb.db.protocol.session.SessionManager;
@@ -2528,7 +2528,7 @@ public class ClientRPCServiceImpl implements IClientRPCServiceWithHandler {
@Override
public TSStatus handshake(TSyncIdentityInfo info) throws TException {
- return IoTDBSyncReceiver.getInstance()
+ return IoTDBLegacyPipeReceiver.getInstance()
.handshake(
info,
SESSION_MANAGER.getCurrSession().getClientAddress(),
@@ -2538,12 +2538,12 @@ public class ClientRPCServiceImpl implements IClientRPCServiceWithHandler {
@Override
public TSStatus sendPipeData(ByteBuffer buff) throws TException {
- return IoTDBSyncReceiver.getInstance().transportPipeData(buff);
+ return IoTDBLegacyPipeReceiver.getInstance().transportPipeData(buff);
}
@Override
public TSStatus sendFile(TSyncTransportMetaInfo metaInfo, ByteBuffer buff) throws TException {
- return IoTDBSyncReceiver.getInstance().transportFile(metaInfo, buff);
+ return IoTDBLegacyPipeReceiver.getInstance().transportFile(metaInfo, buff);
}
@Override
@@ -2688,7 +2688,7 @@ public class ClientRPCServiceImpl implements IClientRPCServiceWithHandler {
TSCloseSessionReq req = new TSCloseSessionReq();
closeSession(req);
}
- IoTDBSyncReceiver.getInstance().handleClientExit();
+ IoTDBLegacyPipeReceiver.getInstance().handleClientExit();
PipeAgent.receiver().handleClientExit();
}
}
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/connector/PipeConnectorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/connector/PipeConnectorTest.java
index d2ca1c5c04b..dc9133db49d 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/connector/PipeConnectorTest.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/connector/PipeConnectorTest.java
@@ -21,9 +21,9 @@ package org.apache.iotdb.db.pipe.connector;
import org.apache.iotdb.commons.pipe.plugin.builtin.BuiltinPipePlugin;
import org.apache.iotdb.db.pipe.config.constant.PipeConnectorConstant;
-import org.apache.iotdb.db.pipe.connector.legacy.IoTDBSyncConnector;
-import org.apache.iotdb.db.pipe.connector.v1.IoTDBThriftConnectorV1;
-import org.apache.iotdb.db.pipe.connector.v2.IoTDBThriftConnectorV2;
+import org.apache.iotdb.db.pipe.connector.legacy.IoTDBLegacyPipeConnector;
+import org.apache.iotdb.db.pipe.connector.thrift.async.IoTDBThriftConnectorV2;
+import org.apache.iotdb.db.pipe.connector.thrift.sync.IoTDBThriftConnectorV1;
import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameterValidator;
import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameters;
@@ -35,7 +35,7 @@ import java.util.HashMap;
public class PipeConnectorTest {
@Test
public void testIoTDBSyncConnector() {
- IoTDBSyncConnector connector = new IoTDBSyncConnector();
+ IoTDBLegacyPipeConnector connector = new IoTDBLegacyPipeConnector();
try {
connector.validate(
new PipeParameterValidator(
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/connector/PipeReceiverTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/connector/PipeReceiverTest.java
index 11b0d64c2d1..aff0c3f8082 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/connector/PipeReceiverTest.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/connector/PipeReceiverTest.java
@@ -20,9 +20,9 @@
package org.apache.iotdb.db.pipe.connector;
import org.apache.iotdb.commons.conf.CommonDescriptor;
-import org.apache.iotdb.db.pipe.connector.v1.IoTDBThriftReceiverV1;
-import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferHandshakeReq;
-import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferTabletReq;
+import org.apache.iotdb.db.pipe.connector.thrift.payload.request.PipeTransferHandshakeReq;
+import org.apache.iotdb.db.pipe.connector.thrift.payload.request.PipeTransferTabletReq;
+import org.apache.iotdb.db.pipe.receiver.thrift.IoTDBThriftReceiverV1;
import org.apache.iotdb.db.queryengine.plan.analyze.IPartitionFetcher;
import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaFetcher;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/connector/PipeThriftRequestTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/connector/PipeThriftRequestTest.java
index 829be6d00ed..7befbf8d7e1 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/connector/PipeThriftRequestTest.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/connector/PipeThriftRequestTest.java
@@ -20,12 +20,12 @@
package org.apache.iotdb.db.pipe.connector;
import org.apache.iotdb.commons.path.PartialPath;
-import org.apache.iotdb.db.pipe.connector.v1.reponse.PipeTransferFilePieceResp;
-import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferFilePieceReq;
-import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferFileSealReq;
-import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferHandshakeReq;
-import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferInsertNodeReq;
-import org.apache.iotdb.db.pipe.connector.v1.request.PipeTransferTabletReq;
+import org.apache.iotdb.db.pipe.connector.thrift.payload.reponse.PipeTransferFilePieceResp;
+import org.apache.iotdb.db.pipe.connector.thrift.payload.request.PipeTransferFilePieceReq;
+import org.apache.iotdb.db.pipe.connector.thrift.payload.request.PipeTransferFileSealReq;
+import org.apache.iotdb.db.pipe.connector.thrift.payload.request.PipeTransferHandshakeReq;
+import org.apache.iotdb.db.pipe.connector.thrift.payload.request.PipeTransferInsertNodeReq;
+import org.apache.iotdb.db.pipe.connector.thrift.payload.request.PipeTransferTabletReq;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode;
import org.apache.iotdb.db.queryengine.plan.statement.Statement;