This is an automated email from the ASF dual-hosted git repository. rong pushed a commit to branch pipe-batch-request in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 3e2e29434d9f5d1926788e49f312db6b3bdceb70 Author: Steve Yurong Su <[email protected]> AuthorDate: Thu Aug 17 16:11:12 2023 +0800 fix conflicts --- .../connector/payload/evolvable/request/PipeTransferBatchReq.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferBatchReq.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferBatchReq.java index 6750c0dfa54..cd34f0c672a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferBatchReq.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/payload/evolvable/request/PipeTransferBatchReq.java @@ -20,7 +20,7 @@ package org.apache.iotdb.db.pipe.connector.payload.evolvable.request; import org.apache.iotdb.db.pipe.connector.payload.evolvable.PipeRequestType; -import org.apache.iotdb.db.pipe.connector.protocol.thrift.IoTDBThriftConnectorRequestVersion; +import org.apache.iotdb.db.pipe.connector.protocol.IoTDBConnectorRequestVersion; import org.apache.iotdb.db.queryengine.plan.planner.plan.PlanFragment; import org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertNode; import org.apache.iotdb.db.queryengine.plan.statement.Statement; @@ -62,7 +62,7 @@ public class PipeTransferBatchReq extends TPipeTransferReq { } } - batchReq.version = IoTDBThriftConnectorRequestVersion.VERSION_1.getVersion(); + batchReq.version = IoTDBConnectorRequestVersion.VERSION_1.getVersion(); batchReq.type = PipeRequestType.TRANSFER_BATCH.getType(); try (final PublicBAOS byteArrayOutputStream = new PublicBAOS(); final DataOutputStream outputStream = new DataOutputStream(byteArrayOutputStream)) {
