Skip to content

Commit f82390a

Browse files
authored
Add a judgment in order to avoid occur NPE when one value of measurementSchemas is null (apache#15574)
1 parent 0aa01f6 commit f82390a

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/memory/InsertNodeMemoryEstimator.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -669,6 +669,10 @@ public static long sizeOfValues(
669669
RamUsageEstimator.alignObjectSize(
670670
NUM_BYTES_ARRAY_HEADER + NUM_BYTES_OBJECT_REF * values.length);
671671
for (int i = 0; i < values.length; i++) {
672+
if (measurementSchemas[i] == null || measurementSchemas[i].getType() == null) {
673+
size += NUM_BYTES_OBJECT_HEADER;
674+
continue;
675+
}
672676
switch (measurementSchemas[i].getType()) {
673677
case INT64:
674678
case TIMESTAMP:

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/cache/TreeDeviceNormalSchema.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public int update(final String[] measurements, final IMeasurementSchema[] schema
6363

6464
for (int i = 0; i < length; ++i) {
6565
// Skip this to avoid instance creation/gc for writing performance
66-
if (measurementMap.containsKey(measurements[i])) {
66+
if (measurements[i] == null || measurementMap.containsKey(measurements[i])) {
6767
continue;
6868
}
6969
diff += putEntry(measurements[i], schemas[i], null);

0 commit comments

Comments
 (0)