commit 22149b0f998f95b24bc240ad881a81e3110ebe49
author Haonan <hhaonan@outlook.com> Thu Sep 22 14:17:02 2022 +0800
committer GitHub <noreply@github.com> Thu Sep 22 14:17:02 2022 +0800
tree 7f562268db35d8a594ac1f9e5de3700e567d10df
parent 08829f5b9c9da9d66795da8f85cdd6990285016e

[IOTDB-4477] fix castDataType error (#7398)

server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java

diff --git a/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java b/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
index 4eaa7df..758786b 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
@@ -328,7 +328,8 @@
     }
     memSize += MemUtils.getAlignedRecordsSize(dataTypes, values, disableMemControl);
     writeAlignedRow(insertRowNode.getDeviceID(), schemaList, insertRowNode.getTime(), values);
-    int pointsInserted = insertRowNode.getMeasurements().length;
+    int pointsInserted =
+        insertRowNode.getMeasurements().length - insertRowNode.getFailedMeasurementNumber();
     totalPointsNum += pointsInserted;
 
     MetricService.getInstance()
@@ -395,7 +396,9 @@
     try {
       write(insertTabletNode, start, end);
       memSize += MemUtils.getTabletSize(insertTabletNode, start, end, disableMemControl);
-      int pointsInserted = insertTabletNode.getDataTypes().length * (end - start);
+      int pointsInserted =
+          (insertTabletNode.getDataTypes().length - insertTabletNode.getFailedMeasurementNumber())
+              * (end - start);
       totalPointsNum += pointsInserted;
       MetricService.getInstance()
           .count(
@@ -418,7 +421,9 @@
     try {
       writeAlignedTablet(insertTabletNode, start, end);
       memSize += MemUtils.getAlignedTabletSize(insertTabletNode, start, end, disableMemControl);
-      int pointsInserted = insertTabletNode.getDataTypes().length * (end - start);
+      int pointsInserted =
+          (insertTabletNode.getDataTypes().length - insertTabletNode.getFailedMeasurementNumber())
+              * (end - start);
       totalPointsNum += pointsInserted;
       MetricService.getInstance()
           .count(

server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertTabletNode.java

diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertTabletNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertTabletNode.java
index 4d5bf93..86acccf 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertTabletNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertTabletNode.java
@@ -197,6 +197,7 @@
       columns[columnIndex] =
           CommonUtils.castArray(dataTypes[columnIndex], dataType, columns[columnIndex]);
       dataTypes[columnIndex] = dataType;
+      return true;
     }
     return false;
   }