This is an automated email from the ASF dual-hosted git repository. rong pushed a commit to branch fix-tablet-covert in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 09c97f38199f64b82062c992d3daba0b3fb8673c Author: Steve Yurong Su <[email protected]> AuthorDate: Tue Jun 6 20:26:07 2023 +0800 monor fixes --- .../db/pipe/core/connector/impl/iotdb/v1/IoTDBThriftConnectorV1.java | 4 ++-- .../db/pipe/core/event/impl/PipeInsertNodeTabletInsertionEvent.java | 2 +- .../core/event/view/datastructure/TsFileInsertionDataContainer.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/v1/IoTDBThriftConnectorV1.java b/server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/v1/IoTDBThriftConnectorV1.java index 1636d0fdc02..4c0b1c0e54e 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/v1/IoTDBThriftConnectorV1.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/core/connector/impl/iotdb/v1/IoTDBThriftConnectorV1.java @@ -123,7 +123,7 @@ public class IoTDBThriftConnectorV1 implements PipeConnector { doTransfer((PipeRawTabletInsertionEvent) tabletInsertionEvent); } else { throw new NotImplementedException( - "IoTDBThriftConnectorV1 only support PipeInsertNodeTabletInsertionEvent and PipeTabletTabletInsertionEvent."); + "IoTDBThriftConnectorV1 only support PipeInsertNodeTabletInsertionEvent and PipeRawTabletInsertionEvent."); } } catch (TException e) { LOGGER.error( @@ -161,7 +161,7 @@ public class IoTDBThriftConnectorV1 implements PipeConnector { if (resp.getStatus().getCode() != TSStatusCode.SUCCESS_STATUS.getStatusCode()) { throw new PipeException( String.format( - "Transfer PipeTabletTabletInsertionEvent %s error, result status %s", + "Transfer PipeRawTabletInsertionEvent %s error, result status %s", pipeRawTabletInsertionEvent, resp.status)); } } diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/event/impl/PipeInsertNodeTabletInsertionEvent.java b/server/src/main/java/org/apache/iotdb/db/pipe/core/event/impl/PipeInsertNodeTabletInsertionEvent.java index d9a895acbae..73898089d3e 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/event/impl/PipeInsertNodeTabletInsertionEvent.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/core/event/impl/PipeInsertNodeTabletInsertionEvent.java @@ -158,7 +158,7 @@ public class PipeInsertNodeTabletInsertionEvent extends EnrichedEvent @Override public String toString() { - return "PipeTabletTabletInsertionEvent{" + return "PipeRawTabletInsertionEvent{" + "walEntryHandler=" + walEntryHandler + ", progressIndex=" diff --git a/server/src/main/java/org/apache/iotdb/db/pipe/core/event/view/datastructure/TsFileInsertionDataContainer.java b/server/src/main/java/org/apache/iotdb/db/pipe/core/event/view/datastructure/TsFileInsertionDataContainer.java index 4bf0e001d5d..01cd2e7bf30 100644 --- a/server/src/main/java/org/apache/iotdb/db/pipe/core/event/view/datastructure/TsFileInsertionDataContainer.java +++ b/server/src/main/java/org/apache/iotdb/db/pipe/core/event/view/datastructure/TsFileInsertionDataContainer.java @@ -117,7 +117,7 @@ public class TsFileInsertionDataContainer implements AutoCloseable { throw new NoSuchElementException(); } - if (tabletIterator == null || !tabletIterator.hasNext()) { + while (tabletIterator == null || !tabletIterator.hasNext()) { final Map.Entry<String, List<String>> entry = deviceMeasurementsMapIterator.next(); try { tabletIterator =
