Merge pull request #2 from Caideyipi/remove_table_name_in_schema_vali…

…dation Remove table name in deviceId during schema validation
Caideyipi · Aug 1, 2024 · 2085dd7 · 2085dd7
2 parents 7d42b3d + 4435d21
commit 2085dd7
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/...node/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertRow.java b/...node/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertRow.java
@@ -25,6 +25,7 @@
 import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertRowStatement;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -62,7 +63,8 @@ public String getTableName() {
   @Override
   public List<Object[]> getDeviceIdList() {
     final InsertRowStatement insertRowStatement = getInnerTreeStatement();
-    return Collections.singletonList(insertRowStatement.getTableDeviceID().getSegments());
+    Object[] segments = insertRowStatement.getTableDeviceID().getSegments();
+    return Collections.singletonList(Arrays.copyOfRange(segments, 1, segments.length));
   }
 
   @Override

diff --git a/...ode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertRows.java b/...ode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertRows.java
@@ -30,6 +30,7 @@
 import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertRowsStatement;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -67,7 +68,7 @@ public String getTableName() {
   @Override
   public List<Object[]> getDeviceIdList() {
     final InsertRowsStatement insertRowStatement = getInnerTreeStatement();
-    return insertRowStatement.getDeviceIdList();
+    return insertRowStatement.getDeviceIdListNoTableName();
   }
 
   @Override
@@ -124,7 +125,8 @@ public String getTableName() {
 
       @Override
       public List<Object[]> getDeviceIdList() {
-        return Collections.singletonList(insertRowStatement.getTableDeviceID().getSegments());
+        Object[] idSegments = insertRowStatement.getTableDeviceID().getSegments();
+        return Collections.singletonList(Arrays.copyOfRange(idSegments, 1, idSegments.length));
       }
 
       @Override

diff --git a/...e/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertTablet.java b/...e/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertTablet.java
@@ -27,6 +27,7 @@
 import org.apache.tsfile.file.metadata.IDeviceID;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 public class InsertTablet extends WrappedInsertStatement {
@@ -66,11 +67,8 @@ public List<Object[]> getDeviceIdList() {
     final InsertTabletStatement insertTabletStatement = getInnerTreeStatement();
     for (int i = 0; i < insertTabletStatement.getRowCount(); i++) {
       IDeviceID deviceID = insertTabletStatement.getTableDeviceID(i);
-      Object[] deviceIdSegments = new Object[deviceID.segmentNum()];
-      for (int j = 0; j < deviceIdSegments.length; j++) {
-        deviceIdSegments[j] = deviceID.segment(j);
-      }
-      deviceIdList.add(deviceIdSegments);
+      Object[] segments = deviceID.getSegments();
+      deviceIdList.add(Arrays.copyOfRange(segments, 1, segments.length));
     }
     return deviceIdList;
   }

diff --git a/...rc/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsStatement.java b/...rc/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsStatement.java
@@ -30,6 +30,7 @@
 import org.apache.tsfile.exception.NotImplementedException;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -163,9 +164,13 @@ public InsertBaseStatement removeLogicalView() {
     return splitResult;
   }
 
-  public List<Object[]> getDeviceIdList() {
+  public List<Object[]> getDeviceIdListNoTableName() {
     return insertRowStatementList.stream()
-        .map(s -> s.getTableDeviceID().getSegments())
+        .map(
+            s -> {
+              Object[] segments = s.getTableDeviceID().getSegments();
+              return Arrays.copyOfRange(segments, 1, segments.length);
+            })
         .collect(Collectors.toList());
   }
 }