(iotdb) branch TableModelIngestion updated: revert data structure for STRING

[jiangtian]

This is an automated email from the ASF dual-hosted git repository.

jiangtian pushed a commit to branch TableModelIngestion
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/TableModelIngestion by this 
push:
     new 36c31ad7fc3 revert data structure for STRING
36c31ad7fc3 is described below

commit 36c31ad7fc3640321c5db16c8b5ad4ecbb99a531
Author: Tian Jiang <jt2594...@163.com>
AuthorDate: Mon Jul 8 09:23:33 2024 +0800

    revert data structure for STRING
---
 .../plan/planner/plan/node/write/InsertTabletNode.java      | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertTabletNode.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertTabletNode.java
index 2ef203a456e..2c20c3e2204 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertTabletNode.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertTabletNode.java
@@ -24,7 +24,6 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus;
 import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot;
 import org.apache.iotdb.commons.exception.IllegalPathException;
 import org.apache.iotdb.commons.path.PartialPath;
-import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory;
 import org.apache.iotdb.commons.utils.CommonDateTimeUtils;
 import org.apache.iotdb.commons.utils.TestOnly;
 import org.apache.iotdb.commons.utils.TimePartitionUtils;
@@ -1164,20 +1163,10 @@ public class InsertTabletNode extends InsertNode 
implements WALEntryValue {
         break;
       case TEXT:
       case BLOB:
+      case STRING:
         Binary[] binaryValues = (Binary[]) columns[measurementIndex];
         value = new TsPrimitiveType.TsBinary(binaryValues[lastIdx]);
         break;
-      case STRING:
-        if (columnCategories[measurementIndex] == TsTableColumnCategory.ID) {
-          String[] stringValues = (String[]) columns[measurementIndex];
-          value =
-              new TsPrimitiveType.TsBinary(
-                  new 
Binary(stringValues[lastIdx].getBytes(StandardCharsets.UTF_8)));
-        } else {
-          Binary[] binValues = (Binary[]) columns[measurementIndex];
-          value = new TsPrimitiveType.TsBinary(binValues[lastIdx]);
-        }
-        break;
       default:
         throw new UnSupportedDataTypeException(
             String.format(DATATYPE_UNSUPPORTED, dataTypes[measurementIndex]));