This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch TYQuery in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit c281a85662a57330493d1585aadee9048aa3f48b Author: JackieTien97 <[email protected]> AuthorDate: Fri Mar 12 16:08:02 2021 +0800 fix test --- .../iotdb/db/query/executor/fill/LastPointReader.java | 4 ++-- .../db/writelog/recover/UnseqTsFileRecoverTest.java | 18 ++++++++---------- .../org/apache/iotdb/tsfile/write/page/PageWriter.java | 1 - 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/query/executor/fill/LastPointReader.java b/server/src/main/java/org/apache/iotdb/db/query/executor/fill/LastPointReader.java index 49522f6..4374aec 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/executor/fill/LastPointReader.java +++ b/server/src/main/java/org/apache/iotdb/db/query/executor/fill/LastPointReader.java @@ -204,7 +204,7 @@ public class LastPointReader { return unseqTsFilesSet; } - private PriorityQueue<ChunkMetadata> sortUnseqChunkMetadatasByEndtime() { + private PriorityQueue<ChunkMetadata> sortUnseqChunkMetadatasByEndtime() throws IOException { PriorityQueue<ChunkMetadata> chunkMetadataList = new PriorityQueue<>( (o1, o2) -> { @@ -224,7 +224,7 @@ public class LastPointReader { }); for (TimeseriesMetadata timeseriesMetadata : unseqTimeseriesMetadataList) { if (timeseriesMetadata != null) { - for (IChunkMetadata chunkMetadata : timeseriesMetadata.getChunkMetadataList()) { + for (IChunkMetadata chunkMetadata : timeseriesMetadata.loadChunkMetadataList()) { chunkMetadataList.add((ChunkMetadata) chunkMetadata); } } diff --git a/server/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java b/server/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java index 77f7940..a2d3539 100644 --- a/server/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java +++ b/server/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java @@ -19,6 +19,14 @@ package org.apache.iotdb.db.writelog.recover; +import static org.junit.Assert.assertEquals; + +import java.io.File; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.MappedByteBuffer; +import java.util.Collections; +import org.apache.commons.io.FileUtils; import org.apache.iotdb.db.conf.IoTDBConstant; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.constant.TestConstant; @@ -57,20 +65,10 @@ import org.apache.iotdb.tsfile.write.record.TSRecord; import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint; import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; import org.apache.iotdb.tsfile.write.schema.Schema; - -import org.apache.commons.io.FileUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; -import java.io.File; -import java.io.IOException; -import java.nio.ByteBuffer; -import java.nio.MappedByteBuffer; -import java.util.Collections; - -import static org.junit.Assert.assertEquals; - public class UnseqTsFileRecoverTest { private File tsF; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/page/PageWriter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/page/PageWriter.java index 369b809..8467d15 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/page/PageWriter.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/page/PageWriter.java @@ -265,7 +265,6 @@ public class PageWriter { /** reset this page */ public void reset(MeasurementSchema measurementSchema) { timeOut.reset(); - timeEncoder = measurementSchema.getTimeEncoder(); valueOut.reset(); statistics = Statistics.getStatsByType(measurementSchema.getType()); }
