[iotdb] branch rel/0.12 updated: [To rel/0.12][IOTDB-1990] Fix uncheck null result by calling IReaderByTimestamp.getValuesInTimestamps() (#4367)

[qiaojialin]

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

qiaojialin pushed a commit to branch rel/0.12
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/rel/0.12 by this push:
     new 991ea46  [To rel/0.12][IOTDB-1990] Fix uncheck null result by calling 
IReaderByTimestamp.getValuesInTimestamps() (#4367)
991ea46 is described below

commit 991ea469421fd3b140062c0133bdbc48dca0bf15
Author: BaiJian <ericpa...@hotmail.com>
AuthorDate: Fri Nov 12 14:04:37 2021 +0800

    [To rel/0.12][IOTDB-1990] Fix uncheck null result by calling 
IReaderByTimestamp.getValuesInTimestamps() (#4367)
---
 RELEASE_NOTES.md                                                    | 1 +
 .../org/apache/iotdb/cluster/query/fill/ClusterFillExecutor.java    | 2 +-
 .../iotdb/db/query/dataset/RawQueryDataSetWithValueFilter.java      | 4 ++--
 .../org/apache/iotdb/db/query/executor/AggregationExecutor.java     | 6 ++++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index a77af22..4c3c582 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -65,6 +65,7 @@
 * [IOTDB-1872] Fix data increases abnormally after IoTDB restarts
 * [IOTDB-1975] OOM caused by that MaxQueryDeduplicatedPathNum doesn't take 
effect
 * [IOTDB-1983] Fix DescReadWriteBatchData serializing bug
+* [IOTDB-1990] Fix unchecked null result by calling 
IReaderByTimestamp.getValuesInTimestamps()
 * fix merge ClassCastException: MeasurementMNode
 * change sync version check to major version
 * init dummyIndex after restart cluster
diff --git 
a/cluster/src/main/java/org/apache/iotdb/cluster/query/fill/ClusterFillExecutor.java
 
b/cluster/src/main/java/org/apache/iotdb/cluster/query/fill/ClusterFillExecutor.java
index 08cf2f2..b364e99 100644
--- 
a/cluster/src/main/java/org/apache/iotdb/cluster/query/fill/ClusterFillExecutor.java
+++ 
b/cluster/src/main/java/org/apache/iotdb/cluster/query/fill/ClusterFillExecutor.java
@@ -90,7 +90,7 @@ public class ClusterFillExecutor extends FillQueryExecutor {
               plan.isAscending());
 
       Object[] results = reader.getValuesInTimestamps(new long[] {queryTime}, 
1);
-      if (results[0] != null) {
+      if (results != null && results[0] != null) {
         ret.add(new TimeValuePair(queryTime, 
TsPrimitiveType.getByType(dataType, results[0])));
       } else {
         ret.add(null);
diff --git 
a/server/src/main/java/org/apache/iotdb/db/query/dataset/RawQueryDataSetWithValueFilter.java
 
b/server/src/main/java/org/apache/iotdb/db/query/dataset/RawQueryDataSetWithValueFilter.java
index 0a02f94..3e71d2a 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/query/dataset/RawQueryDataSetWithValueFilter.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/query/dataset/RawQueryDataSetWithValueFilter.java
@@ -117,7 +117,7 @@ public class RawQueryDataSetWithValueFilter extends 
QueryDataSet implements UDFI
 
       // 3. use values in results to fill row record
       for (int j = 0; j < cachedTimeCnt; j++) {
-        if (results[j] == null) {
+        if (results == null || results[j] == null) {
           rowRecords[j].addField(null);
         } else {
           hasField[j] = true;
@@ -193,7 +193,7 @@ public class RawQueryDataSetWithValueFilter extends 
QueryDataSet implements UDFI
 
       // 3. use values in results to fill row record
       for (int j = 0; j < cachedTimeCnt; j++) {
-        if (results[j] != null) {
+        if (results != null && results[j] != null) {
           hasField[j] = true;
           rowsInObject[j][i] = results[j];
         }
diff --git 
a/server/src/main/java/org/apache/iotdb/db/query/executor/AggregationExecutor.java
 
b/server/src/main/java/org/apache/iotdb/db/query/executor/AggregationExecutor.java
index 263baef..0371f09 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/query/executor/AggregationExecutor.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/query/executor/AggregationExecutor.java
@@ -444,8 +444,10 @@ public class AggregationExecutor {
                 .updateResultUsingTimestamps(timeArray, timeArrayLength, 
entry.getKey());
           } else {
             Object[] values = entry.getKey().getValuesInTimestamps(timeArray, 
timeArrayLength);
-            for (Integer i : entry.getValue()) {
-              aggregateResults.get(i).updateResultUsingValues(timeArray, 
timeArrayLength, values);
+            if (values != null) {
+              for (Integer i : entry.getValue()) {
+                aggregateResults.get(i).updateResultUsingValues(timeArray, 
timeArrayLength, values);
+              }
             }
           }
         }