You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hu...@apache.org on 2023/03/23 13:40:56 UTC
[iotdb] 04/06: fix bug
This is an automated email from the ASF dual-hosted git repository.
hui pushed a commit to branch lmh/fixLimitPushDownBug1.1
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 8336670398494cb54afe218c00cddc1f72b34704
Author: Minghui Liu <li...@foxmail.com>
AuthorDate: Thu Mar 23 15:52:36 2023 +0800
fix bug
---
.../iotdb/tsfile/read/reader/series/PaginationController.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/PaginationController.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/PaginationController.java
index 5d0f41b970..9b7b0e6435 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/PaginationController.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/series/PaginationController.java
@@ -83,13 +83,17 @@ public class PaginationController {
}
public TsBlock applyTsBlock(TsBlock resultTsBlock) {
+ if (!enable) {
+ return resultTsBlock;
+ }
+
int fromIndex = 0, length = resultTsBlock.getPositionCount();
- if (hasCurOffset()) {
+ if (curOffset > 0) {
fromIndex = (int) Math.min(curOffset, length);
length -= fromIndex;
consumeOffset(fromIndex);
}
- if (hasCurLimit()) {
+ if (hasLimit && curLimit > 0) {
length = (int) Math.min(curLimit, length);
consumeLimit(length);
}