[iotdb] branch WithoutNullBug updated: fix limit bug

[jackietien]

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

jackietien pushed a commit to branch WithoutNullBug
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/WithoutNullBug by this push:
     new 6e9b873  fix limit bug
6e9b873 is described below

commit 6e9b873047f43a47fb26a27540bde2421cd7cdd9
Author: JackieTien97 <jackiet...@foxmail.com>
AuthorDate: Fri May 21 15:53:21 2021 +0800

    fix limit bug
---
 server/src/main/java/org/apache/iotdb/db/utils/QueryDataSetUtils.java | 1 +
 .../java/org/apache/iotdb/tsfile/read/query/dataset/QueryDataSet.java | 4 ++++
 2 files changed, 5 insertions(+)

diff --git 
a/server/src/main/java/org/apache/iotdb/db/utils/QueryDataSetUtils.java 
b/server/src/main/java/org/apache/iotdb/db/utils/QueryDataSetUtils.java
index edf720c..5a27137 100644
--- a/server/src/main/java/org/apache/iotdb/db/utils/QueryDataSetUtils.java
+++ b/server/src/main/java/org/apache/iotdb/db/utils/QueryDataSetUtils.java
@@ -70,6 +70,7 @@ public class QueryDataSetUtils {
         // filter rows whose columns are null according to the rule
         if ((queryDataSet.isWithoutAllNull() && rowRecord.isAllNull())
             || (queryDataSet.isWithoutAnyNull() && rowRecord.hasNullField())) {
+          queryDataSet.decreaseAlreadyReturnedRowNum();
           i--;
           continue;
         }
diff --git 
a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/dataset/QueryDataSet.java
 
b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/dataset/QueryDataSet.java
index c782743..0aaed56 100644
--- 
a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/dataset/QueryDataSet.java
+++ 
b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/query/dataset/QueryDataSet.java
@@ -194,4 +194,8 @@ public abstract class QueryDataSet {
   public void setWithoutAllNull(boolean withoutAllNull) {
     this.withoutAllNull = withoutAllNull;
   }
+
+  public void decreaseAlreadyReturnedRowNum() {
+    alreadyReturnedRowNum--;
+  }
 }