You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2022/01/27 09:15:40 UTC
[iotdb] branch firstPageReaderbug created (now c9ddae4)
This is an automated email from the ASF dual-hosted git repository.
xiangweiwei pushed a change to branch firstPageReaderbug
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
at c9ddae4 fix series reader bug
This branch includes the following new commits:
new c9ddae4 fix series reader bug
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[iotdb] 01/01: fix series reader bug
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiangweiwei pushed a commit to branch firstPageReaderbug
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit c9ddae4b55a452d50f71b0e902b6c95a84370826
Author: Alima777 <wx...@gmail.com>
AuthorDate: Thu Jan 27 17:14:15 2022 +0800
fix series reader bug
---
.../iotdb/db/query/reader/series/SeriesReader.java | 79 +++++++++++-----------
1 file changed, 40 insertions(+), 39 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 e9d7bc8..6e1c635 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
@@ -500,7 +500,7 @@ public class SeriesReader {
/*
* first chunk metadata is already unpacked, consume cached pages
*/
- unpackFirstPageReader();
+ initFirstPageReader();
}
if (isExistOverlappedPage()) {
@@ -511,7 +511,7 @@ public class SeriesReader {
// readers
while (firstPageReader == null && (!seqPageReaders.isEmpty() || !unSeqPageReaders.isEmpty())) {
- unpackFirstPageReader();
+ initFirstPageReader();
if (isExistOverlappedPage()) {
return true;
@@ -520,16 +520,6 @@ public class SeriesReader {
return firstPageReader != null;
}
- private void unpackFirstPageReader() throws IOException {
- initFirstPageReader();
- if (firstPageReader != null) {
- long endpointTime = orderUtils.getOverlapCheckTime(firstPageReader.getStatistics());
- unpackAllOverlappedTsFilesToTimeSeriesMetadata(endpointTime);
- unpackAllOverlappedTimeSeriesMetadataToCachedChunkMetadata(endpointTime, false);
- unpackAllOverlappedChunkMetadataToPageReaders(endpointTime, false);
- }
- }
-
private boolean isExistOverlappedPage() throws IOException {
if (firstPageOverlapped()) {
/*
@@ -756,17 +746,6 @@ public class SeriesReader {
cachedBatchData =
BatchDataFactory.createBatchData(dataType, orderUtils.getAscending(), true);
long currentPageEndPointTime = mergeReader.getCurrentReadStopTime();
- // get data as small as possible
- if (firstPageReader != null) {
- currentPageEndPointTime =
- orderUtils.getCurrentEndPoint(
- currentPageEndPointTime, firstPageReader.getStatistics());
- }
- if (!seqPageReaders.isEmpty()) {
- currentPageEndPointTime =
- orderUtils.getCurrentEndPoint(
- currentPageEndPointTime, seqPageReaders.get(0).getStatistics());
- }
while (mergeReader.hasNextTimeValuePair()) {
/*
@@ -915,17 +894,6 @@ public class SeriesReader {
return;
}
- long currentPageEndpointTime;
-
- if (!unSeqPageReaders.isEmpty()) {
- currentPageEndpointTime =
- orderUtils.getOverlapCheckTime(unSeqPageReaders.peek().getStatistics());
- // unpack all overlapped data for first unseq page
- unpackAllOverlappedTsFilesToTimeSeriesMetadata(currentPageEndpointTime);
- unpackAllOverlappedTimeSeriesMetadataToCachedChunkMetadata(currentPageEndpointTime, false);
- unpackAllOverlappedChunkMetadataToPageReaders(currentPageEndpointTime, false);
- }
-
/*
* init firstPageReader
*/
@@ -933,6 +901,7 @@ public class SeriesReader {
initFirstPageReader();
}
+ long currentPageEndpointTime;
if (mergeReader.hasNextTimeValuePair()) {
currentPageEndpointTime = mergeReader.getCurrentReadStopTime();
} else {
@@ -950,19 +919,51 @@ public class SeriesReader {
unpackAllOverlappedUnseqPageReadersToMergeReader(currentPageEndpointTime);
}
- private void initFirstPageReader() {
+ private void initFirstPageReader() throws IOException {
+ while (this.firstPageReader == null) {
+ VersionPageReader firstPageReader = getFirstPageReaderFromCachedReaders();
+
+ // unpack overlapped page using current page reader
+ if (firstPageReader != null) {
+ long overlapCheckTime = orderUtils.getOverlapCheckTime(firstPageReader.getStatistics());
+ unpackAllOverlappedTsFilesToTimeSeriesMetadata(overlapCheckTime);
+ unpackAllOverlappedTimeSeriesMetadataToCachedChunkMetadata(overlapCheckTime, false);
+ unpackAllOverlappedChunkMetadataToPageReaders(overlapCheckTime, false);
+
+ // this page after unpacking must be the first page
+ if (firstPageReader.equals(getFirstPageReaderFromCachedReaders())) {
+ this.firstPageReader = firstPageReader;
+ if (!seqPageReaders.isEmpty() && firstPageReader.equals(seqPageReaders.get(0))) {
+ seqPageReaders.remove(0);
+ break;
+ } else if (!unSeqPageReaders.isEmpty()
+ && firstPageReader.equals(unSeqPageReaders.peek())) {
+ unSeqPageReaders.poll();
+ break;
+ }
+ }
+ } else {
+ return;
+ }
+ }
+ }
+
+ // We use get() and peek() here in case it's not the first page reader before unpacking
+ private VersionPageReader getFirstPageReaderFromCachedReaders() {
+ VersionPageReader firstPageReader = null;
if (!seqPageReaders.isEmpty() && !unSeqPageReaders.isEmpty()) {
if (orderUtils.isTakeSeqAsFirst(
seqPageReaders.get(0).getStatistics(), unSeqPageReaders.peek().getStatistics())) {
- firstPageReader = seqPageReaders.remove(0);
+ firstPageReader = seqPageReaders.get(0);
} else {
- firstPageReader = unSeqPageReaders.poll();
+ firstPageReader = unSeqPageReaders.peek();
}
} else if (!seqPageReaders.isEmpty()) {
- firstPageReader = seqPageReaders.remove(0);
+ firstPageReader = seqPageReaders.get(0);
} else if (!unSeqPageReaders.isEmpty()) {
- firstPageReader = unSeqPageReaders.poll();
+ firstPageReader = unSeqPageReaders.peek();
}
+ return firstPageReader;
}
private void unpackAllOverlappedUnseqPageReadersToMergeReader(long endpointTime)