You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by su...@apache.org on 2020/02/29 04:02:25 UTC
[incubator-iotdb] 01/01: Revert "[IOTDB-520] Result of IBatchReader
should not cross partition (#845)"
This is an automated email from the ASF dual-hosted git repository.
sunzesong pushed a commit to branch revert-845-jira_520
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 797a2e3e45f85edfd5e894d618714e3e3b11d656
Author: Zesong Sun <sz...@mails.tsinghua.edu.cn>
AuthorDate: Sat Feb 29 12:02:16 2020 +0800
Revert "[IOTDB-520] Result of IBatchReader should not cross partition (#845)"
This reverts commit 2b8b15418da3431d59302856c65fe93fae61768f.
---
.../SystemDesign/5-DataQuery/2-SeriesReader.md | 2 +-
.../reader/universal/PriorityMergeReader.java | 26 ++++------------------
.../iotdb/db/integration/IoTDBSeriesReaderIT.java | 4 ----
3 files changed, 5 insertions(+), 27 deletions(-)
diff --git a/docs/Documentation-CHN/SystemDesign/5-DataQuery/2-SeriesReader.md b/docs/Documentation-CHN/SystemDesign/5-DataQuery/2-SeriesReader.md
index 54b0f38..32a9964 100644
--- a/docs/Documentation-CHN/SystemDesign/5-DataQuery/2-SeriesReader.md
+++ b/docs/Documentation-CHN/SystemDesign/5-DataQuery/2-SeriesReader.md
@@ -78,7 +78,7 @@ BatchData nextBatch() throws IOException;
#### 一般使用流程
```
-while (batchReader.hasNextBatch()) {
+while (batchReader. hasNextBatch()) {
BatchData batchData = batchReader.nextBatch();
// use batchData to do some work
diff --git a/server/src/main/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReader.java b/server/src/main/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReader.java
index e67bd77..6901250 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReader.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/reader/universal/PriorityMergeReader.java
@@ -18,13 +18,12 @@
*/
package org.apache.iotdb.db.query.reader.universal;
+import org.apache.iotdb.tsfile.read.reader.IPointReader;
+import org.apache.iotdb.tsfile.read.TimeValuePair;
+
import java.io.IOException;
import java.util.List;
import java.util.PriorityQueue;
-import org.apache.iotdb.db.conf.IoTDBConfig;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
-import org.apache.iotdb.tsfile.read.TimeValuePair;
-import org.apache.iotdb.tsfile.read.reader.IPointReader;
/**
* This class implements {@link IPointReader} for data sources with different priorities.
@@ -34,8 +33,6 @@ public class PriorityMergeReader implements IPointReader {
// largest end time of all added readers
private long currentLargestEndTime;
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
-
PriorityQueue<Element> heap = new PriorityQueue<>((o1, o2) -> {
int timeCompare = Long.compare(o1.timeValuePair.getTimestamp(),
o2.timeValuePair.getTimestamp());
@@ -61,24 +58,9 @@ public class PriorityMergeReader implements IPointReader {
}
public void addReader(IPointReader reader, long priority, long endTime) throws IOException {
- long partitionInterval = config.getPartitionInterval();
- switch (config.getTimestampPrecision()) {
- case "ns":
- partitionInterval *= 1000_000_000L;
- break;
- case "us":
- partitionInterval *= 1000_000L;
- break;
- default:
- partitionInterval *= 1000;
- break;
- }
if (reader.hasNextTimeValuePair()) {
heap.add(new Element(reader, reader.nextTimeValuePair(), priority));
- long partition = reader.currentTimeValuePair().getTimestamp() / partitionInterval;
- // set end time before current partition ends
- currentLargestEndTime = Math.min((partition + 1) * partitionInterval - 1,
- Math.max(currentLargestEndTime, endTime));
+ currentLargestEndTime = Math.max(currentLargestEndTime, endTime);
} else {
reader.close();
}
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java
index a90de85..f722651 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java
@@ -80,9 +80,6 @@ public class IoTDBSeriesReaderIT {
tsFileConfig.setGroupSizeInByte(1024 * 1024 * 150);
IoTDBDescriptor.getInstance().getConfig().setMemtableSizeThreshold(1024 * 16);
- // test result of IBatchReader should not cross partition
- IoTDBDescriptor.getInstance().getConfig().setPartitionInterval(2);
-
EnvironmentUtils.envSetUp();
insertData();
@@ -99,7 +96,6 @@ public class IoTDBSeriesReaderIT {
tsFileConfig.setPageSizeInByte(pageSizeInByte);
tsFileConfig.setGroupSizeInByte(groupSizeInByte);
IoTDBDescriptor.getInstance().getConfig().setMemtableSizeThreshold(groupSizeInByte);
- IoTDBDescriptor.getInstance().getConfig().setPartitionInterval(604800);
EnvironmentUtils.cleanEnv();
}