[incubator-iotdb] branch tyPageBug updated: change if to while

[ja...@apache.org]

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

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


The following commit(s) were added to refs/heads/tyPageBug by this push:
     new c0383ad  change if to while
c0383ad is described below

commit c0383ad3f3a19a652e2b41e008e83c902773c0a3
Author: JackieTien97 <Ja...@foxmail.com>
AuthorDate: Mon Apr 13 18:00:13 2020 +0800

    change if to while
---
 .../java/org/apache/iotdb/db/query/reader/series/SeriesReader.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesReader.java b/server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesReader.java
index 5c90746..5b63a84 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesReader.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesReader.java
@@ -193,6 +193,7 @@ class SeriesReader {
     if (!cachedPageReaders.isEmpty()
         || firstPageReader != null
         || mergeReader.hasNextTimeValuePair()) {
+      // cachedPageReaders.isEmpty() is false firstPageReader != null is false mergeReader.hasNextTimeValuePair() = false
       System.out.println("cachedPageReaders.isEmpty() is " + cachedPageReaders.isEmpty() + " firstPageReader != null is " + (firstPageReader != null) + " mergeReader.hasNextTimeValuePair() = " + mergeReader.hasNextTimeValuePair());
       throw new IOException("all cached pages should be consumed first");
     }
@@ -276,7 +277,7 @@ class SeriesReader {
     if (hasCachedNextOverlappedPage) {
       return true;
     } else if (mergeReader.hasNextTimeValuePair()) {
-      if (hasNextOverlappedPage()) {
+      while (hasNextOverlappedPage()) {
         cachedBatchData = nextOverlappedPage();
         if (cachedBatchData != null && cachedBatchData.hasCurrent()) {
           hasCachedNextOverlappedPage = true;
@@ -313,7 +314,7 @@ class SeriesReader {
       /*
        * next page is overlapped, read overlapped data and cache it
        */
-      if (hasNextOverlappedPage()) {
+      while (hasNextOverlappedPage()) {
         cachedBatchData = nextOverlappedPage();
         if (cachedBatchData != null && cachedBatchData.hasCurrent()) {
           hasCachedNextOverlappedPage = true;