(iotdb) branch master updated: Fix getTsValue of LongLiteral and validation order

[jackietien]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 525f40ce3eb Fix getTsValue of LongLiteral and validation order
525f40ce3eb is described below

commit 525f40ce3ebb51e9da1fcf4c33e6b4e9cc36b8c3
Author: Jiang Tian <jt2594...@163.com>
AuthorDate: Wed Aug 14 11:15:12 2024 +0800

    Fix getTsValue of LongLiteral and validation order
---
 .../apache/iotdb/relational/it/db/it/IoTDBInsertTableIT.java | 12 ++++++++++++
 .../db/queryengine/plan/analyze/schema/SchemaValidator.java  |  2 +-
 .../db/queryengine/plan/relational/sql/ast/LongLiteral.java  |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git 
a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBInsertTableIT.java
 
b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBInsertTableIT.java
index 16397c5254e..76be6647d4c 100644
--- 
a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBInsertTableIT.java
+++ 
b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBInsertTableIT.java
@@ -568,6 +568,18 @@ public class IoTDBInsertTableIT {
     }
   }
 
+  @Test
+  public void testInsertAttributes() throws SQLException {
+    try (Connection connection = 
EnvFactory.getEnv().getConnection(BaseEnv.TABLE_SQL_DIALECT);
+        Statement st1 = connection.createStatement()) {
+      st1.execute("use \"test\"");
+      st1.execute(
+          "create table if not exists sg18 (id1 string id, s1 string 
attribute, s2 int32 measurement)");
+      st1.execute("insert into sg18(id1, s1, s2) values('d1','1', 1)");
+      st1.execute("insert into sg18(id1, s1, s2) values('d2', 2, 2)");
+    }
+  }
+
   private List<Integer> checkHeader(
       ResultSetMetaData resultSetMetaData, String expectedHeaderStrings, int[] 
expectedTypes)
       throws SQLException {
diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/SchemaValidator.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/SchemaValidator.java
index 5e4645f276b..bc4d275c285 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/SchemaValidator.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/schema/SchemaValidator.java
@@ -65,8 +65,8 @@ public class SchemaValidator {
       Metadata metadata, WrappedInsertStatement insertStatement, 
MPPQueryContext context) {
     try {
       insertStatement.validateTableSchema(metadata, context);
-      insertStatement.validateDeviceSchema(metadata, context);
       insertStatement.updateAfterSchemaValidation(context);
+      insertStatement.validateDeviceSchema(metadata, context);
     } catch (QueryProcessException e) {
       throw new SemanticException(e.getMessage());
     }
diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LongLiteral.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LongLiteral.java
index fc52071e98c..f9b8a14c035 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LongLiteral.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/LongLiteral.java
@@ -132,6 +132,6 @@ public class LongLiteral extends Literal {
 
   @Override
   public Object getTsValue() {
-    return value;
+    return parsedValue;
   }
 }