From afc2d78359d36445105dbc97b1a0b4cd17d87147 Mon Sep 17 00:00:00 2001 From: samperson1997 Date: Wed, 26 Feb 2020 19:38:03 +0800 Subject: [PATCH] Change partition to Long --- .../iotdb/db/query/reader/universal/PriorityMergeReader.java | 4 ++-- .../org/apache/iotdb/db/integration/IoTDBSeriesReaderIT.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 33b9fc45f6e5..e67bd771cf3b 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 @@ -34,7 +34,7 @@ public class PriorityMergeReader implements IPointReader { // largest end time of all added readers private long currentLargestEndTime; - private final static IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig(); + private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig(); PriorityQueue heap = new PriorityQueue<>((o1, o2) -> { int timeCompare = Long.compare(o1.timeValuePair.getTimestamp(), @@ -75,7 +75,7 @@ public void addReader(IPointReader reader, long priority, long endTime) throws I } if (reader.hasNextTimeValuePair()) { heap.add(new Element(reader, reader.nextTimeValuePair(), priority)); - int partition = Math.round(reader.currentTimeValuePair().getTimestamp() / partitionInterval); + long partition = reader.currentTimeValuePair().getTimestamp() / partitionInterval; // set end time before current partition ends currentLargestEndTime = Math.min((partition + 1) * partitionInterval - 1, Math.max(currentLargestEndTime, endTime)); 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 b63feb71d310..a90de85eb67f 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 @@ -81,7 +81,7 @@ public static void setUp() throws Exception { IoTDBDescriptor.getInstance().getConfig().setMemtableSizeThreshold(1024 * 16); // test result of IBatchReader should not cross partition - IoTDBDescriptor.getInstance().getConfig().setPartitionInterval(6); + IoTDBDescriptor.getInstance().getConfig().setPartitionInterval(2); EnvironmentUtils.envSetUp();