[iotdb] branch master updated: [ISSUE-3316] Fix constructing firstChunkMetaDatahasNextChunk logic in hasNextChunk() (#3444)

[xiangweiwei]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 7ac39ef  [ISSUE-3316] Fix constructing firstChunkMetaDatahasNextChunk 
logic in hasNextChunk() (#3444)
7ac39ef is described below

commit 7ac39ef139e590b566acc60643bd2e29c0cb4bee
Author: Xiangwei Wei <34242296+alima...@users.noreply.github.com>
AuthorDate: Fri Jun 25 10:09:15 2021 +0800

    [ISSUE-3316] Fix constructing firstChunkMetaDatahasNextChunk logic in 
hasNextChunk() (#3444)
---
 .../java/org/apache/iotdb/db/query/reader/series/SeriesReader.java | 7 +++++--
 1 file changed, 5 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 7c1213f..b225a0f 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
@@ -320,13 +320,16 @@ public class SeriesReader {
       /*
        * first time series metadata is already unpacked, consume cached 
ChunkMetadata
        */
-      if (!cachedChunkMetadata.isEmpty()) {
+      while (!cachedChunkMetadata.isEmpty()) {
         firstChunkMetadata = cachedChunkMetadata.peek();
         unpackAllOverlappedTsFilesToTimeSeriesMetadata(
             
orderUtils.getOverlapCheckTime(firstChunkMetadata.getStatistics()));
         unpackAllOverlappedTimeSeriesMetadataToCachedChunkMetadata(
             
orderUtils.getOverlapCheckTime(firstChunkMetadata.getStatistics()), false);
-        firstChunkMetadata = cachedChunkMetadata.poll();
+        if (firstChunkMetadata.equals(cachedChunkMetadata.peek())) {
+          firstChunkMetadata = cachedChunkMetadata.poll();
+          break;
+        }
       }
     }