Change partition to Long

apache · Feb 26, 2020 · afc2d78 · afc2d78
1 parent c4fc9c3
commit afc2d78
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 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
@@ -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<Element> 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
@@ -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();