You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2021/05/21 08:01:40 UTC
[iotdb] 03/03: fix limit bug
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch WithoutNullBug12
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit fa611b01c8b2ab16b1bbb89e594745c3e04db30d
Author: JackieTien97 <Ja...@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 a88b074..3164375 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--;
+ }
}