This is an automated email from the ASF dual-hosted git repository. rong pushed a commit to branch pipe-receiver-type-auto-convert in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 2a2584e4921a65033c1c9169fe6953e012b72f64 Author: Steve Yurong Su <[email protected]> AuthorDate: Thu Dec 5 11:53:31 2024 +0800 f --- .../transform/statement/PipeConvertedInsertRowStatement.java | 1 + .../statement/PipeConvertedInsertTabletStatement.java | 2 ++ .../queryengine/plan/statement/crud/InsertRowStatement.java | 7 ++++++- .../plan/statement/crud/InsertTabletStatement.java | 12 ++++++------ 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/transform/statement/PipeConvertedInsertRowStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/transform/statement/PipeConvertedInsertRowStatement.java index 6ae0e2d9fa4..4cd7fadcc7c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/transform/statement/PipeConvertedInsertRowStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/transform/statement/PipeConvertedInsertRowStatement.java @@ -52,6 +52,7 @@ public class PipeConvertedInsertRowStatement extends InsertRowStatement { time = insertRowStatement.getTime(); values = insertRowStatement.getValues(); isNeedInferType = insertRowStatement.isNeedInferType(); + deviceID = insertRowStatement.getRawTableDeviceID(); } @Override diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/transform/statement/PipeConvertedInsertTabletStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/transform/statement/PipeConvertedInsertTabletStatement.java index 50dfbad00de..d2ea0ba4235 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/transform/statement/PipeConvertedInsertTabletStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/receiver/transform/statement/PipeConvertedInsertTabletStatement.java @@ -46,6 +46,8 @@ public class PipeConvertedInsertTabletStatement extends InsertTabletStatement { times = insertTabletStatement.getTimes(); nullBitMaps = insertTabletStatement.getBitMaps(); columns = insertTabletStatement.getColumns(); + deviceIDs = insertTabletStatement.getRawTableDeviceIDs(); + singleDevice = insertTabletStatement.isSingleDevice(); rowCount = insertTabletStatement.getRowCount(); } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowStatement.java index 45a381293a3..7d5160e9c4f 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowStatement.java @@ -80,7 +80,7 @@ public class InsertRowStatement extends InsertBaseStatement implements ISchemaVa */ protected boolean[] measurementIsAligned; - private IDeviceID deviceID; + protected IDeviceID deviceID; public InsertRowStatement() { super(); @@ -488,6 +488,11 @@ public class InsertRowStatement extends InsertBaseStatement implements ISchemaVa return deviceID; } + @TableModel + public IDeviceID getRawTableDeviceID() { + return deviceID; + } + @TableModel @Override public Statement toRelationalStatement(MPPQueryContext context) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertTabletStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertTabletStatement.java index eec9350ce5e..f61db241355 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertTabletStatement.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertTabletStatement.java @@ -49,8 +49,6 @@ import org.apache.tsfile.utils.BitMap; import org.apache.tsfile.utils.Pair; import org.apache.tsfile.write.UnSupportedDataTypeException; import org.apache.tsfile.write.schema.MeasurementSchema; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.Arrays; @@ -61,17 +59,15 @@ import java.util.Map; public class InsertTabletStatement extends InsertBaseStatement implements ISchemaValidation { - private static final Logger LOGGER = LoggerFactory.getLogger(InsertTabletStatement.class); - private static final String DATATYPE_UNSUPPORTED = "Data type %s is not supported."; protected long[] times; // times should be sorted. It is done in the session API. protected BitMap[] nullBitMaps; protected Object[] columns; - private IDeviceID[] deviceIDs; + protected IDeviceID[] deviceIDs; - private boolean singleDevice; + protected boolean singleDevice; protected int rowCount = 0; @@ -473,6 +469,10 @@ public class InsertTabletStatement extends InsertBaseStatement implements ISchem return deviceIDs[rowIdx]; } + public IDeviceID[] getRawTableDeviceIDs() { + return deviceIDs; + } + public void setSingleDevice() { singleDevice = true; }
