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:19 UTC
[iotdb] branch pipe-connector-package-refactor created (now b1e14232c6a)
This is an automated email from the ASF dual-hosted git repository.
rong pushed a change to branch pipe-connector-package-refactor
in repository https://gitbox.apache.org/repos/asf/iotdb.git
at b1e14232c6a refactor package name
This branch includes the following new commits:
new 91b4c21c818 refactor package name
new 7f956066472 refactor package name
new b1e14232c6a refactor package name
The 3 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/03: refactor package name
Posted by ro...@apache.org.
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 7f95606647224c787f693be0ad3786ec36e64436
Author: Steve Yurong Su <ro...@apache.org>
AuthorDate: Fri Aug 11 19:46:09 2023 +0800
refactor package name
---
.../connector/legacy/IoTDBLegacyPipeConnector.java | 6 ++---
...ectorV2.java => IoTDBThriftAsyncConnector.java} | 28 +++++++++++----------
...nsferInsertNodeTabletInsertionEventHandler.java | 4 +--
...PipeTransferRawTabletInsertionEventHandler.java | 4 +--
.../PipeTransferTabletInsertionEventHandler.java | 9 ++++---
.../PipeTransferTsFileInsertionEventHandler.java | 6 ++---
...nectorV1.java => IoTDBThriftSyncConnector.java} | 29 +++++++++++-----------
...nt.java => IoTDBThriftSyncConnectorClient.java} | 4 +--
.../connector/PipeConnectorSubtaskManager.java | 8 +++---
.../iotdb/db/pipe/connector/PipeConnectorTest.java | 8 +++---
10 files changed, 56 insertions(+), 50 deletions(-)
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/legacy/IoTDBLegacyPipeConnector.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/legacy/IoTDBLegacyPipeConnector.java
index ccf3f007951..fece56d7022 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/legacy/IoTDBLegacyPipeConnector.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.thrift.sync.IoTDBThriftConnectorClient;
+import org.apache.iotdb.db.pipe.connector.thrift.sync.IoTDBThriftSyncConnectorClient;
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;
@@ -84,7 +84,7 @@ public class IoTDBLegacyPipeConnector implements PipeConnector {
private String pipeName;
private Long creationTime;
- private IoTDBThriftConnectorClient client;
+ private IoTDBThriftSyncConnectorClient client;
private SessionPool sessionPool;
@@ -121,7 +121,7 @@ public class IoTDBLegacyPipeConnector implements PipeConnector {
close();
client =
- new IoTDBThriftConnectorClient(
+ new IoTDBThriftSyncConnectorClient(
new ThriftClientProperty.Builder()
.setConnectionTimeoutMs(COMMON_CONFIG.getConnectionTimeoutInMS())
.setRpcThriftCompressionEnabled(COMMON_CONFIG.isRpcThriftCompressionEnabled())
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/IoTDBThriftConnectorV2.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/IoTDBThriftAsyncConnector.java
similarity index 95%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/IoTDBThriftConnectorV2.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/IoTDBThriftAsyncConnector.java
index 5f2071108e8..d9eabafe1b3 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/IoTDBThriftConnectorV2.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/IoTDBThriftAsyncConnector.java
@@ -34,7 +34,7 @@ import org.apache.iotdb.db.pipe.connector.thrift.async.handler.PipeTransferTsFil
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.connector.thrift.sync.IoTDBThriftSyncConnector;
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;
@@ -69,9 +69,9 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
-public class IoTDBThriftConnectorV2 extends IoTDBThriftConnector {
+public class IoTDBThriftAsyncConnector extends IoTDBThriftConnector {
- private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBThriftConnectorV2.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBThriftAsyncConnector.class);
private static final String FAILED_TO_BORROW_CLIENT_FORMATTER =
"Failed to borrow client from client pool for receiver %s:%s.";
@@ -86,7 +86,7 @@ public class IoTDBThriftConnectorV2 extends IoTDBThriftConnector {
new AtomicReference<>();
private static final int RETRY_TRIGGER_INTERVAL_MINUTES = 1;
private final AtomicReference<Future<?>> retryTriggerFuture = new AtomicReference<>();
- private final IoTDBThriftConnectorV1 retryConnector = new IoTDBThriftConnectorV1();
+ private final IoTDBThriftSyncConnector retryConnector = new IoTDBThriftSyncConnector();
private final PriorityQueue<Pair<Long, Event>> retryEventQueue =
new PriorityQueue<>(Comparator.comparing(o -> o.left));
@@ -95,9 +95,9 @@ public class IoTDBThriftConnectorV2 extends IoTDBThriftConnector {
private final PriorityQueue<Pair<Long, Runnable>> commitQueue =
new PriorityQueue<>(Comparator.comparing(o -> o.left));
- public IoTDBThriftConnectorV2() {
+ public IoTDBThriftAsyncConnector() {
if (ASYNC_PIPE_DATA_TRANSFER_CLIENT_MANAGER_HOLDER.get() == null) {
- synchronized (IoTDBThriftConnectorV2.class) {
+ synchronized (IoTDBThriftAsyncConnector.class) {
if (ASYNC_PIPE_DATA_TRANSFER_CLIENT_MANAGER_HOLDER.get() == null) {
ASYNC_PIPE_DATA_TRANSFER_CLIENT_MANAGER_HOLDER.set(
new IClientManager.Factory<TEndPoint, AsyncPipeDataTransferServiceClient>()
@@ -140,7 +140,7 @@ public class IoTDBThriftConnectorV2 extends IoTDBThriftConnector {
if (!(tabletInsertionEvent instanceof PipeInsertNodeTabletInsertionEvent)
&& !(tabletInsertionEvent instanceof PipeRawTabletInsertionEvent)) {
LOGGER.warn(
- "IoTDBThriftConnectorV2 only support PipeInsertNodeTabletInsertionEvent and PipeRawTabletInsertionEvent. "
+ "IoTDBThriftAsyncConnector only support PipeInsertNodeTabletInsertionEvent and PipeRawTabletInsertionEvent. "
+ "Current event: {}.",
tabletInsertionEvent);
return;
@@ -232,7 +232,7 @@ public class IoTDBThriftConnectorV2 extends IoTDBThriftConnector {
if (!(tsFileInsertionEvent instanceof PipeTsFileInsertionEvent)) {
LOGGER.warn(
- "IoTDBThriftConnectorV2 only support PipeTsFileInsertionEvent. Current event: {}.",
+ "IoTDBThriftAsyncConnector only support PipeTsFileInsertionEvent. Current event: {}.",
tsFileInsertionEvent);
return;
}
@@ -279,7 +279,7 @@ public class IoTDBThriftConnectorV2 extends IoTDBThriftConnector {
public void transfer(Event event) throws Exception {
transferQueuedEventsIfNecessary();
- LOGGER.warn("IoTDBThriftConnectorV2 does not support transfer generic event: {}.", event);
+ LOGGER.warn("IoTDBThriftAsyncConnector does not support transfer generic event: {}.", event);
}
private AsyncPipeDataTransferServiceClient borrowClient(TEndPoint targetNodeUrl)
@@ -401,7 +401,8 @@ public class IoTDBThriftConnectorV2 extends IoTDBThriftConnector {
} else if (event instanceof PipeTsFileInsertionEvent) {
retryConnector.transfer((PipeTsFileInsertionEvent) event);
} else {
- LOGGER.warn("IoTDBThriftConnectorV2 does not support transfer generic event: {}.", event);
+ LOGGER.warn(
+ "IoTDBThriftAsyncConnector does not support transfer generic event: {}.", event);
}
if (event instanceof EnrichedEvent) {
@@ -432,7 +433,8 @@ public class IoTDBThriftConnectorV2 extends IoTDBThriftConnector {
Optional.ofNullable(enrichedEvent)
.ifPresent(
event ->
- event.decreaseReferenceCount(IoTDBThriftConnectorV2.class.getName()))));
+ event.decreaseReferenceCount(
+ IoTDBThriftAsyncConnector.class.getName()))));
while (!commitQueue.isEmpty()) {
final Pair<Long, Runnable> committer = commitQueue.peek();
@@ -455,7 +457,7 @@ public class IoTDBThriftConnectorV2 extends IoTDBThriftConnector {
*/
public void addFailureEventToRetryQueue(long requestCommitId, Event event) {
if (RETRY_TRIGGER.get() == null) {
- synchronized (IoTDBThriftConnectorV2.class) {
+ synchronized (IoTDBThriftAsyncConnector.class) {
if (RETRY_TRIGGER.get() == null) {
RETRY_TRIGGER.set(
IoTDBThreadPoolFactory.newSingleThreadScheduledExecutor(
@@ -465,7 +467,7 @@ public class IoTDBThriftConnectorV2 extends IoTDBThriftConnector {
}
if (retryTriggerFuture.get() == null) {
- synchronized (IoTDBThriftConnectorV2.class) {
+ synchronized (IoTDBThriftAsyncConnector.class) {
if (retryTriggerFuture.get() == null) {
retryTriggerFuture.set(
ScheduledExecutorUtil.safelyScheduleWithFixedDelay(
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/handler/PipeTransferInsertNodeTabletInsertionEventHandler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/handler/PipeTransferInsertNodeTabletInsertionEventHandler.java
index e73520a167c..1328f73e0b8 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/handler/PipeTransferInsertNodeTabletInsertionEventHandler.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/handler/PipeTransferInsertNodeTabletInsertionEventHandler.java
@@ -20,7 +20,7 @@
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.thrift.async.IoTDBThriftConnectorV2;
+import org.apache.iotdb.db.pipe.connector.thrift.async.IoTDBThriftAsyncConnector;
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;
@@ -34,7 +34,7 @@ public class PipeTransferInsertNodeTabletInsertionEventHandler
long requestCommitId,
PipeInsertNodeTabletInsertionEvent event,
TPipeTransferReq req,
- IoTDBThriftConnectorV2 connector) {
+ IoTDBThriftAsyncConnector connector) {
super(requestCommitId, event, req, connector);
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/handler/PipeTransferRawTabletInsertionEventHandler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/handler/PipeTransferRawTabletInsertionEventHandler.java
index 74e57dd7a77..89e5e0526b3 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/handler/PipeTransferRawTabletInsertionEventHandler.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/handler/PipeTransferRawTabletInsertionEventHandler.java
@@ -20,7 +20,7 @@
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.thrift.async.IoTDBThriftConnectorV2;
+import org.apache.iotdb.db.pipe.connector.thrift.async.IoTDBThriftAsyncConnector;
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;
@@ -34,7 +34,7 @@ public class PipeTransferRawTabletInsertionEventHandler
long requestCommitId,
PipeRawTabletInsertionEvent event,
TPipeTransferReq req,
- IoTDBThriftConnectorV2 connector) {
+ IoTDBThriftAsyncConnector connector) {
super(requestCommitId, event, req, connector);
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/handler/PipeTransferTabletInsertionEventHandler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/handler/PipeTransferTabletInsertionEventHandler.java
index c5ef788786d..fe16ce03a54 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/handler/PipeTransferTabletInsertionEventHandler.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/handler/PipeTransferTabletInsertionEventHandler.java
@@ -20,7 +20,7 @@
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.thrift.async.IoTDBThriftConnectorV2;
+import org.apache.iotdb.db.pipe.connector.thrift.async.IoTDBThriftAsyncConnector;
import org.apache.iotdb.db.pipe.event.EnrichedEvent;
import org.apache.iotdb.pipe.api.event.Event;
import org.apache.iotdb.pipe.api.exception.PipeException;
@@ -45,10 +45,13 @@ public abstract class PipeTransferTabletInsertionEventHandler<E extends TPipeTra
private final Event event;
private final TPipeTransferReq req;
- private final IoTDBThriftConnectorV2 connector;
+ private final IoTDBThriftAsyncConnector connector;
protected PipeTransferTabletInsertionEventHandler(
- long requestCommitId, Event event, TPipeTransferReq req, IoTDBThriftConnectorV2 connector) {
+ long requestCommitId,
+ Event event,
+ TPipeTransferReq req,
+ IoTDBThriftAsyncConnector connector) {
this.requestCommitId = requestCommitId;
this.event = event;
this.req = req;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/handler/PipeTransferTsFileInsertionEventHandler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/handler/PipeTransferTsFileInsertionEventHandler.java
index 77d40bc4713..987c4188af1 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/handler/PipeTransferTsFileInsertionEventHandler.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/async/handler/PipeTransferTsFileInsertionEventHandler.java
@@ -21,7 +21,7 @@ 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.thrift.async.IoTDBThriftConnectorV2;
+import org.apache.iotdb.db.pipe.connector.thrift.async.IoTDBThriftAsyncConnector;
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;
@@ -50,7 +50,7 @@ public class PipeTransferTsFileInsertionEventHandler
private final long requestCommitId;
private final PipeTsFileInsertionEvent event;
- private final IoTDBThriftConnectorV2 connector;
+ private final IoTDBThriftAsyncConnector connector;
private final File tsFile;
private final int readFileBufferSize;
@@ -64,7 +64,7 @@ public class PipeTransferTsFileInsertionEventHandler
private AsyncPipeDataTransferServiceClient client;
public PipeTransferTsFileInsertionEventHandler(
- long requestCommitId, PipeTsFileInsertionEvent event, IoTDBThriftConnectorV2 connector)
+ long requestCommitId, PipeTsFileInsertionEvent event, IoTDBThriftAsyncConnector connector)
throws FileNotFoundException {
this.requestCommitId = requestCommitId;
this.event = event;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/sync/IoTDBThriftConnectorV1.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/sync/IoTDBThriftSyncConnector.java
similarity index 92%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/sync/IoTDBThriftConnectorV1.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/sync/IoTDBThriftSyncConnector.java
index f32d25f36f6..141420ccb97 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/sync/IoTDBThriftConnectorV1.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/sync/IoTDBThriftSyncConnector.java
@@ -55,22 +55,22 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-public class IoTDBThriftConnectorV1 extends IoTDBThriftConnector {
+public class IoTDBThriftSyncConnector extends IoTDBThriftConnector {
- private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBThriftConnectorV1.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBThriftSyncConnector.class);
private static final PipeConfig PIPE_CONFIG = PipeConfig.getInstance();
- private final List<IoTDBThriftConnectorClient> clients = new ArrayList<>();
+ private final List<IoTDBThriftSyncConnectorClient> clients = new ArrayList<>();
private final List<Boolean> isClientAlive = new ArrayList<>();
private long currentClientIndex = 0;
- public IoTDBThriftConnectorV1() {
+ public IoTDBThriftSyncConnector() {
// Do nothing
}
- public IoTDBThriftConnectorV1(String ipAddress, int port) {
+ public IoTDBThriftSyncConnector(String ipAddress, int port) {
nodeUrls.add(new TEndPoint(ipAddress, port));
}
@@ -109,7 +109,7 @@ public class IoTDBThriftConnectorV1 extends IoTDBThriftConnector {
clients.set(
i,
- new IoTDBThriftConnectorClient(
+ new IoTDBThriftSyncConnectorClient(
new ThriftClientProperty.Builder()
.setConnectionTimeoutMs((int) PIPE_CONFIG.getPipeConnectorTimeoutMs())
.setRpcThriftCompressionEnabled(
@@ -166,7 +166,7 @@ public class IoTDBThriftConnectorV1 extends IoTDBThriftConnector {
// PipeProcessor can change the type of TabletInsertionEvent
final int clientIndex = nextClientIndex();
- final IoTDBThriftConnectorClient client = clients.get(clientIndex);
+ final IoTDBThriftSyncConnectorClient client = clients.get(clientIndex);
try {
if (tabletInsertionEvent instanceof PipeInsertNodeTabletInsertionEvent) {
@@ -175,7 +175,7 @@ public class IoTDBThriftConnectorV1 extends IoTDBThriftConnector {
doTransfer(client, (PipeRawTabletInsertionEvent) tabletInsertionEvent);
} else {
LOGGER.warn(
- "IoTDBThriftConnectorV1 only support "
+ "IoTDBThriftSyncConnector only support "
+ "PipeInsertNodeTabletInsertionEvent and PipeRawTabletInsertionEvent. "
+ "Ignore {}.",
tabletInsertionEvent);
@@ -196,13 +196,13 @@ public class IoTDBThriftConnectorV1 extends IoTDBThriftConnector {
// PipeProcessor can change the type of TabletInsertionEvent
if (!(tsFileInsertionEvent instanceof PipeTsFileInsertionEvent)) {
LOGGER.warn(
- "IoTDBThriftConnectorV1 only support PipeTsFileInsertionEvent. Ignore {}.",
+ "IoTDBThriftSyncConnector only support PipeTsFileInsertionEvent. Ignore {}.",
tsFileInsertionEvent);
return;
}
final int clientIndex = nextClientIndex();
- final IoTDBThriftConnectorClient client = clients.get(clientIndex);
+ final IoTDBThriftSyncConnectorClient client = clients.get(clientIndex);
try {
doTransfer(client, (PipeTsFileInsertionEvent) tsFileInsertionEvent);
@@ -219,11 +219,11 @@ public class IoTDBThriftConnectorV1 extends IoTDBThriftConnector {
@Override
public void transfer(Event event) {
- LOGGER.warn("IoTDBThriftConnectorV1 does not support transfer generic event: {}.", event);
+ LOGGER.warn("IoTDBThriftSyncConnector does not support transfer generic event: {}.", event);
}
private void doTransfer(
- IoTDBThriftConnectorClient client,
+ IoTDBThriftSyncConnectorClient client,
PipeInsertNodeTabletInsertionEvent pipeInsertNodeTabletInsertionEvent)
throws PipeException, TException, WALPipeException {
final TPipeTransferResp resp =
@@ -240,7 +240,8 @@ public class IoTDBThriftConnectorV1 extends IoTDBThriftConnector {
}
private void doTransfer(
- IoTDBThriftConnectorClient client, PipeRawTabletInsertionEvent pipeRawTabletInsertionEvent)
+ IoTDBThriftSyncConnectorClient client,
+ PipeRawTabletInsertionEvent pipeRawTabletInsertionEvent)
throws PipeException, TException, IOException {
final TPipeTransferResp resp =
client.pipeTransfer(
@@ -257,7 +258,7 @@ public class IoTDBThriftConnectorV1 extends IoTDBThriftConnector {
}
private void doTransfer(
- IoTDBThriftConnectorClient client, PipeTsFileInsertionEvent pipeTsFileInsertionEvent)
+ IoTDBThriftSyncConnectorClient client, PipeTsFileInsertionEvent pipeTsFileInsertionEvent)
throws PipeException, TException, InterruptedException, IOException {
pipeTsFileInsertionEvent.waitForTsFileClose();
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/sync/IoTDBThriftConnectorClient.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/sync/IoTDBThriftSyncConnectorClient.java
similarity index 92%
rename from iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/sync/IoTDBThriftConnectorClient.java
rename to iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/sync/IoTDBThriftSyncConnectorClient.java
index 009de91c8e4..c870b2dbc2c 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/sync/IoTDBThriftConnectorClient.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/thrift/sync/IoTDBThriftSyncConnectorClient.java
@@ -29,10 +29,10 @@ import org.apache.iotdb.service.rpc.thrift.IClientRPCService;
import org.apache.thrift.transport.TSocket;
import org.apache.thrift.transport.TTransportException;
-public class IoTDBThriftConnectorClient extends IClientRPCService.Client
+public class IoTDBThriftSyncConnectorClient extends IClientRPCService.Client
implements ThriftClient, AutoCloseable {
- public IoTDBThriftConnectorClient(ThriftClientProperty property, String ipAddress, int port)
+ public IoTDBThriftSyncConnectorClient(ThriftClientProperty property, String ipAddress, int port)
throws TTransportException {
super(
property
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 39d01757250..209187032aa 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
@@ -25,8 +25,8 @@ 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.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.connector.thrift.async.IoTDBThriftAsyncConnector;
+import org.apache.iotdb.db.pipe.connector.thrift.sync.IoTDBThriftSyncConnector;
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;
@@ -66,10 +66,10 @@ public class PipeConnectorSubtaskManager {
PipeConnector pipeConnector;
if (connectorKey.equals(BuiltinPipePlugin.IOTDB_THRIFT_CONNECTOR.getPipePluginName())
|| connectorKey.equals(BuiltinPipePlugin.IOTDB_THRIFT_CONNECTOR_V1.getPipePluginName())) {
- pipeConnector = new IoTDBThriftConnectorV1();
+ pipeConnector = new IoTDBThriftSyncConnector();
} else if (connectorKey.equals(
BuiltinPipePlugin.IOTDB_THRIFT_CONNECTOR_V2.getPipePluginName())) {
- pipeConnector = new IoTDBThriftConnectorV2();
+ pipeConnector = new IoTDBThriftAsyncConnector();
} else if (connectorKey.equals(BuiltinPipePlugin.IOTDB_SYNC_CONNECTOR.getPipePluginName())) {
pipeConnector = new IoTDBLegacyPipeConnector();
} else {
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 dc9133db49d..24e71e4817a 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
@@ -22,8 +22,8 @@ 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.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.connector.thrift.async.IoTDBThriftAsyncConnector;
+import org.apache.iotdb.db.pipe.connector.thrift.sync.IoTDBThriftSyncConnector;
import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameterValidator;
import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameters;
@@ -56,7 +56,7 @@ public class PipeConnectorTest {
@Test
public void testIoTDBThriftConnectorV1() {
- IoTDBThriftConnectorV1 connector = new IoTDBThriftConnectorV1();
+ IoTDBThriftSyncConnector connector = new IoTDBThriftSyncConnector();
try {
connector.validate(
new PipeParameterValidator(
@@ -77,7 +77,7 @@ public class PipeConnectorTest {
@Test
public void testIoTDBThriftConnectorV2() {
- IoTDBThriftConnectorV2 connector = new IoTDBThriftConnectorV2();
+ IoTDBThriftAsyncConnector connector = new IoTDBThriftAsyncConnector();
try {
connector.validate(
new PipeParameterValidator(
[iotdb] 03/03: refactor package name
Posted by ro...@apache.org.
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 b1e14232c6a95f0ac3d53300111c20bd048ecd9c
Author: Steve Yurong Su <ro...@apache.org>
AuthorDate: Fri Aug 11 20:00:13 2023 +0800
refactor package name
---
.../task/subtask/connector/PipeConnectorSubtaskManager.java | 10 ++++++----
.../apache/iotdb/db/pipe/connector/PipeConnectorTest.java | 12 ++++++------
.../iotdb/commons/pipe/plugin/builtin/BuiltinPipePlugin.java | 12 ++++++------
...IoTDBSyncConnector.java => IoTDBLegacyPipeConnector.java} | 10 +++++-----
...ThriftConnectorV2.java => IoTDBThriftAsyncConnector.java} | 10 +++++-----
...BThriftConnectorV1.java => IoTDBThriftSyncConnector.java} | 10 +++++-----
.../commons/pipe/plugin/builtin/BuiltinPipePluginTest.java | 4 ++--
7 files changed, 35 insertions(+), 33 deletions(-)
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 209187032aa..05ae6bc51f7 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
@@ -65,12 +65,14 @@ public class PipeConnectorSubtaskManager {
PipeConnector pipeConnector;
if (connectorKey.equals(BuiltinPipePlugin.IOTDB_THRIFT_CONNECTOR.getPipePluginName())
- || connectorKey.equals(BuiltinPipePlugin.IOTDB_THRIFT_CONNECTOR_V1.getPipePluginName())) {
+ || connectorKey.equals(
+ BuiltinPipePlugin.IOTDB_THRIFT_ASYNC_CONNECTOR.getPipePluginName())) {
+ pipeConnector = new IoTDBThriftAsyncConnector();
+ } else if (connectorKey.equals(
+ BuiltinPipePlugin.IOTDB_THRIFT_SYNC_CONNECTOR.getPipePluginName())) {
pipeConnector = new IoTDBThriftSyncConnector();
} else if (connectorKey.equals(
- BuiltinPipePlugin.IOTDB_THRIFT_CONNECTOR_V2.getPipePluginName())) {
- pipeConnector = new IoTDBThriftAsyncConnector();
- } else if (connectorKey.equals(BuiltinPipePlugin.IOTDB_SYNC_CONNECTOR.getPipePluginName())) {
+ BuiltinPipePlugin.IOTDB_LEGACY_PIPE_CONNECTOR.getPipePluginName())) {
pipeConnector = new IoTDBLegacyPipeConnector();
} else {
pipeConnector = PipeAgent.plugin().reflectConnector(pipeConnectorParameters);
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 24e71e4817a..ca8ce3ae255 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
@@ -34,7 +34,7 @@ import java.util.HashMap;
public class PipeConnectorTest {
@Test
- public void testIoTDBSyncConnector() {
+ public void testIoTDBLegacyPipeConnector() {
IoTDBLegacyPipeConnector connector = new IoTDBLegacyPipeConnector();
try {
connector.validate(
@@ -44,7 +44,7 @@ public class PipeConnectorTest {
{
put(
PipeConnectorConstant.CONNECTOR_KEY,
- BuiltinPipePlugin.IOTDB_SYNC_CONNECTOR.getPipePluginName());
+ BuiltinPipePlugin.IOTDB_LEGACY_PIPE_CONNECTOR.getPipePluginName());
put(PipeConnectorConstant.CONNECTOR_IOTDB_IP_KEY, "127.0.0.1");
put(PipeConnectorConstant.CONNECTOR_IOTDB_PORT_KEY, "6667");
}
@@ -55,7 +55,7 @@ public class PipeConnectorTest {
}
@Test
- public void testIoTDBThriftConnectorV1() {
+ public void testIoTDBThriftSyncConnector() {
IoTDBThriftSyncConnector connector = new IoTDBThriftSyncConnector();
try {
connector.validate(
@@ -65,7 +65,7 @@ public class PipeConnectorTest {
{
put(
PipeConnectorConstant.CONNECTOR_KEY,
- BuiltinPipePlugin.IOTDB_THRIFT_CONNECTOR_V1.getPipePluginName());
+ BuiltinPipePlugin.IOTDB_THRIFT_SYNC_CONNECTOR.getPipePluginName());
put(PipeConnectorConstant.CONNECTOR_IOTDB_IP_KEY, "127.0.0.1");
put(PipeConnectorConstant.CONNECTOR_IOTDB_PORT_KEY, "6667");
}
@@ -76,7 +76,7 @@ public class PipeConnectorTest {
}
@Test
- public void testIoTDBThriftConnectorV2() {
+ public void testIoTDBThriftAsyncConnector() {
IoTDBThriftAsyncConnector connector = new IoTDBThriftAsyncConnector();
try {
connector.validate(
@@ -86,7 +86,7 @@ public class PipeConnectorTest {
{
put(
PipeConnectorConstant.CONNECTOR_KEY,
- BuiltinPipePlugin.IOTDB_THRIFT_CONNECTOR_V2.getPipePluginName());
+ BuiltinPipePlugin.IOTDB_THRIFT_ASYNC_CONNECTOR.getPipePluginName());
put(PipeConnectorConstant.CONNECTOR_IOTDB_NODE_URLS_KEY, "127.0.0.1:6667");
}
})));
diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/BuiltinPipePlugin.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/BuiltinPipePlugin.java
index c25e0682072..a2f1795ed27 100644
--- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/BuiltinPipePlugin.java
+++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/BuiltinPipePlugin.java
@@ -20,10 +20,10 @@
package org.apache.iotdb.commons.pipe.plugin.builtin;
import org.apache.iotdb.commons.pipe.plugin.builtin.connector.DoNothingConnector;
-import org.apache.iotdb.commons.pipe.plugin.builtin.connector.IoTDBSyncConnector;
+import org.apache.iotdb.commons.pipe.plugin.builtin.connector.IoTDBLegacyPipeConnector;
+import org.apache.iotdb.commons.pipe.plugin.builtin.connector.IoTDBThriftAsyncConnector;
import org.apache.iotdb.commons.pipe.plugin.builtin.connector.IoTDBThriftConnector;
-import org.apache.iotdb.commons.pipe.plugin.builtin.connector.IoTDBThriftConnectorV1;
-import org.apache.iotdb.commons.pipe.plugin.builtin.connector.IoTDBThriftConnectorV2;
+import org.apache.iotdb.commons.pipe.plugin.builtin.connector.IoTDBThriftSyncConnector;
import org.apache.iotdb.commons.pipe.plugin.builtin.extractor.IoTDBExtractor;
import org.apache.iotdb.commons.pipe.plugin.builtin.processor.DoNothingProcessor;
@@ -38,9 +38,9 @@ public enum BuiltinPipePlugin {
// connectors
DO_NOTHING_CONNECTOR("do-nothing-connector", DoNothingConnector.class),
IOTDB_THRIFT_CONNECTOR("iotdb-thrift-connector", IoTDBThriftConnector.class),
- IOTDB_THRIFT_CONNECTOR_V1("iotdb-thrift-connector-v1", IoTDBThriftConnectorV1.class),
- IOTDB_THRIFT_CONNECTOR_V2("iotdb-thrift-connector-v2", IoTDBThriftConnectorV2.class),
- IOTDB_SYNC_CONNECTOR("iotdb-sync-connector", IoTDBSyncConnector.class),
+ IOTDB_THRIFT_SYNC_CONNECTOR("iotdb-thrift-sync-connector", IoTDBThriftSyncConnector.class),
+ IOTDB_THRIFT_ASYNC_CONNECTOR("iotdb-thrift-async-connector", IoTDBThriftAsyncConnector.class),
+ IOTDB_LEGACY_PIPE_CONNECTOR("iotdb-legacy-pipe-connector", IoTDBLegacyPipeConnector.class),
;
private final String pipePluginName;
diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/IoTDBSyncConnector.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/IoTDBLegacyPipeConnector.java
similarity index 88%
rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/IoTDBSyncConnector.java
rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/IoTDBLegacyPipeConnector.java
index 9ea57c67dc1..e527f1c72d3 100644
--- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/IoTDBSyncConnector.java
+++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/IoTDBLegacyPipeConnector.java
@@ -28,12 +28,12 @@ import org.apache.iotdb.pipe.api.event.dml.insertion.TabletInsertionEvent;
import org.apache.iotdb.pipe.api.event.dml.insertion.TsFileInsertionEvent;
/**
- * This class is a placeholder and should not be initialized. It represents the IoTDB Sync connector
- * (for IoTDB v1.1). There is a real implementation in the server module but cannot be imported
- * here. The pipe agent in the server module will replace this class with the real implementation
- * when initializing the IoTDB Sync connector.
+ * This class is a placeholder and should not be initialized. It represents the IoTDB legacy pipe
+ * connector (for IoTDB v1.1). There is a real implementation in the server module but cannot be
+ * imported here. The pipe agent in the server module will replace this class with the real
+ * implementation when initializing the IoTDB legacy pipe connector.
*/
-public class IoTDBSyncConnector implements PipeConnector {
+public class IoTDBLegacyPipeConnector implements PipeConnector {
private static final String PLACEHOLDER_ERROR_MSG =
"This class is a placeholder and should not be used.";
diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/IoTDBThriftConnectorV2.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/IoTDBThriftAsyncConnector.java
similarity index 73%
rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/IoTDBThriftConnectorV2.java
rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/IoTDBThriftAsyncConnector.java
index e1019311b2b..847c4ae127e 100644
--- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/IoTDBThriftConnectorV2.java
+++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/IoTDBThriftAsyncConnector.java
@@ -20,9 +20,9 @@
package org.apache.iotdb.commons.pipe.plugin.builtin.connector;
/**
- * This class is a placeholder and should not be initialized. It represents the IoTDB Thrift
- * connector V2. There is a real implementation in the server module but cannot be imported here.
- * The pipe agent in the server module will replace this class with the real implementation when
- * initializing the IoTDB Thrift connector V2.
+ * This class is a placeholder and should not be initialized. It represents the IoTDB Thrift async
+ * connector. There is a real implementation in the server module but cannot be imported here. The
+ * pipe agent in the server module will replace this class with the real implementation when
+ * initializing the IoTDB Thrift async connector.
*/
-public class IoTDBThriftConnectorV2 extends IoTDBThriftConnector {}
+public class IoTDBThriftAsyncConnector extends IoTDBThriftConnector {}
diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/IoTDBThriftConnectorV1.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/IoTDBThriftSyncConnector.java
similarity index 73%
rename from iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/IoTDBThriftConnectorV1.java
rename to iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/IoTDBThriftSyncConnector.java
index 38e09063e45..ffc77fef3f9 100644
--- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/IoTDBThriftConnectorV1.java
+++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/plugin/builtin/connector/IoTDBThriftSyncConnector.java
@@ -20,9 +20,9 @@
package org.apache.iotdb.commons.pipe.plugin.builtin.connector;
/**
- * This class is a placeholder and should not be initialized. It represents the IoTDB Thrift
- * connector V1. There is a real implementation in the server module but cannot be imported here.
- * The pipe agent in the server module will replace this class with the real implementation when
- * initializing the IoTDB Thrift connector V1.
+ * This class is a placeholder and should not be initialized. It represents the IoTDB Thrift sync
+ * connector. There is a real implementation in the server module but cannot be imported here. The
+ * pipe agent in the server module will replace this class with the real implementation when
+ * initializing the IoTDB Thrift sync connector.
*/
-public class IoTDBThriftConnectorV1 extends IoTDBThriftConnector {}
+public class IoTDBThriftSyncConnector extends IoTDBThriftConnector {}
diff --git a/iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/pipe/plugin/builtin/BuiltinPipePluginTest.java b/iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/pipe/plugin/builtin/BuiltinPipePluginTest.java
index eae32c596df..df76817362c 100644
--- a/iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/pipe/plugin/builtin/BuiltinPipePluginTest.java
+++ b/iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/pipe/plugin/builtin/BuiltinPipePluginTest.java
@@ -20,7 +20,7 @@
package org.apache.iotdb.commons.pipe.plugin.builtin;
import org.apache.iotdb.commons.pipe.plugin.builtin.connector.DoNothingConnector;
-import org.apache.iotdb.commons.pipe.plugin.builtin.connector.IoTDBSyncConnector;
+import org.apache.iotdb.commons.pipe.plugin.builtin.connector.IoTDBLegacyPipeConnector;
import org.apache.iotdb.commons.pipe.plugin.builtin.connector.IoTDBThriftConnector;
import org.apache.iotdb.commons.pipe.plugin.builtin.extractor.IoTDBExtractor;
import org.apache.iotdb.commons.pipe.plugin.builtin.processor.DoNothingProcessor;
@@ -121,7 +121,7 @@ public class BuiltinPipePluginTest {
Assert.fail();
}
- testConnectorAllThrow(new IoTDBSyncConnector());
+ testConnectorAllThrow(new IoTDBLegacyPipeConnector());
testConnectorAllThrow(new IoTDBThriftConnector());
}
[iotdb] 01/03: refactor package name
Posted by ro...@apache.org.
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;