[iotdb] branch rel/0.12 updated: [To rel/0.12][IOTDB-1348] Last plan not work in cluster mode (#3213)

[haonan]

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

haonan 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 99822c7  [To rel/0.12][IOTDB-1348] Last plan not work in cluster mode 
(#3213)
99822c7 is described below

commit 99822c7feb7797f33b0e740b0f3ea38803d11d17
Author: chaow <xunmengzhu...@gmail.com>
AuthorDate: Tue May 18 11:39:15 2021 +0800

    [To rel/0.12][IOTDB-1348] Last plan not work in cluster mode (#3213)
    
    Co-authored-by: chaow <941210...@qq.com>
---
 .../org/apache/iotdb/cluster/query/last/ClusterLastQueryExecutor.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git 
a/cluster/src/main/java/org/apache/iotdb/cluster/query/last/ClusterLastQueryExecutor.java
 
b/cluster/src/main/java/org/apache/iotdb/cluster/query/last/ClusterLastQueryExecutor.java
index 8ebb31d..d5ec324 100644
--- 
a/cluster/src/main/java/org/apache/iotdb/cluster/query/last/ClusterLastQueryExecutor.java
+++ 
b/cluster/src/main/java/org/apache/iotdb/cluster/query/last/ClusterLastQueryExecutor.java
@@ -127,6 +127,7 @@ public class ClusterLastQueryExecutor extends 
LastQueryExecutor {
         List<Pair<Boolean, TimeValuePair>> timeValuePairs = groupFuture.get();
         for (int i = 0; i < timeValuePairs.size(); i++) {
           if (timeValuePairs.get(i) != null
+              && timeValuePairs.get(i).right != null
               && timeValuePairs.get(i).right.getTimestamp() > 
results.get(i).right.getTimestamp()) {
             results.get(i).right = timeValuePairs.get(i).right;
           }