You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2022/03/27 01:51:17 UTC
[iotdb] branch rel/0.12 updated: [IOTDB-2773] Fix overlapped data should be consumed first bug (#5345)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch rel/0.12
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/0.12 by this push:
new 5876d2b [IOTDB-2773] Fix overlapped data should be consumed first bug (#5345)
5876d2b is described below
commit 5876d2b911b5ddf1b34478fb82fc55d1343e16ff
Author: Jackie Tien <ja...@gmail.com>
AuthorDate: Sun Mar 27 09:50:28 2022 +0800
[IOTDB-2773] Fix overlapped data should be consumed first bug (#5345)
---
.../iotdb/db/query/reader/series/SeriesReader.java | 51 +++++++++++-----------
1 file changed, 26 insertions(+), 25 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 82f3a86..52344fc 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
@@ -526,35 +526,36 @@ public class SeriesReader {
if (CONFIG.isEnablePerformanceTracing()) {
addTotalPageNumInTracing(pageReaderList.size());
}
- pageReaderList.forEach(
- pageReader -> {
- if (chunkMetaData.isSeq()) {
- // addLast for asc; addFirst for desc
- if (orderUtils.getAscending()) {
- seqPageReaders.add(
- new VersionPageReader(
- chunkMetaData.getVersion(),
- chunkMetaData.getOffsetOfChunkHeader(),
- pageReader,
- true));
- } else {
- seqPageReaders.add(
- 0,
+ if (chunkMetaData.isSeq()) {
+ if (orderUtils.getAscending()) {
+ for (IPageReader iPageReader : pageReaderList) {
+ seqPageReaders.add(
+ new VersionPageReader(
+ chunkMetaData.getVersion(),
+ chunkMetaData.getOffsetOfChunkHeader(),
+ iPageReader,
+ true));
+ }
+ } else {
+ for (int i = pageReaderList.size() - 1; i >= 0; i--) {
+ seqPageReaders.add(
+ new VersionPageReader(
+ chunkMetaData.getVersion(),
+ chunkMetaData.getOffsetOfChunkHeader(),
+ pageReaderList.get(i),
+ true));
+ }
+ }
+ } else {
+ pageReaderList.forEach(
+ pageReader ->
+ unSeqPageReaders.add(
new VersionPageReader(
chunkMetaData.getVersion(),
chunkMetaData.getOffsetOfChunkHeader(),
pageReader,
- true));
- }
- } else {
- unSeqPageReaders.add(
- new VersionPageReader(
- chunkMetaData.getVersion(),
- chunkMetaData.getOffsetOfChunkHeader(),
- pageReader,
- false));
- }
- });
+ false)));
+ }
}
private void addTotalPageNumInTracing(int pageNum) {