Fix DataTypeMismatchException info error (apache#7330)

yonyou-tsdb · Sep 15, 2022 · 14f30f7 · 14f30f7
1 parent d8116d4
commit 14f30f7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/server/src/main/java/org/apache/iotdb/db/exception/metadata/DataTypeMismatchException.java b/server/src/main/java/org/apache/iotdb/db/exception/metadata/DataTypeMismatchException.java
@@ -26,15 +26,15 @@ public DataTypeMismatchException(
       String deviceName,
       String measurementName,
       TSDataType insertType,
-      TSDataType realType,
+      TSDataType typeInSchema,
       long time,
       Object value) {
     super(
         String.format(
             "data type of %s.%s is not consistent, registered type %s, inserting type %s, timestamp %s, value %s",
             deviceName,
             measurementName,
-            realType,
+            typeInSchema,
             insertType,
             time,
             value == null

diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaRegionUtils.java b/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaRegionUtils.java
@@ -67,27 +67,27 @@ public static void deleteSchemaRegionFolder(String schemaRegionDirPath, Logger l
     }
   }
 
-  public static void checkDataTypeMatch(InsertPlan plan, int loc, TSDataType dataType)
+  public static void checkDataTypeMatch(InsertPlan plan, int loc, TSDataType dataTypeInSchema)
       throws MetadataException {
     TSDataType insertDataType;
     if (plan instanceof InsertRowPlan) {
       if (!((InsertRowPlan) plan).isNeedInferType()) {
         // only when InsertRowPlan's values is object[], we should check type
         insertDataType = getTypeInLoc(plan, loc);
       } else {
-        insertDataType = dataType;
+        insertDataType = dataTypeInSchema;
       }
     } else {
       insertDataType = getTypeInLoc(plan, loc);
     }
-    if (dataType != insertDataType) {
+    if (dataTypeInSchema != insertDataType) {
       String measurement = plan.getMeasurements()[loc];
       String device = plan.getDevicePath().getFullPath();
       throw new DataTypeMismatchException(
           device,
           measurement,
           insertDataType,
-          dataType,
+          dataTypeInSchema,
           plan.getMinTime(),
           plan.getFirstValueOfIndex(loc));
     }

diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertNode.java
@@ -254,8 +254,8 @@ protected boolean selfCheckDataTypes() {
               new DataTypeMismatchException(
                   devicePath.getFullPath(),
                   measurements[i],
-                  measurementSchemas[i].getType(),
                   dataTypes[i],
+                  measurementSchemas[i].getType(),
                   getMinTime(),
                   getFirstValueOfIndex(i)));
         }