You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2021/03/10 12:26:48 UTC
[iotdb] branch TYQuery updated: format code
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
The following commit(s) were added to refs/heads/TYQuery by this push:
new 0f3b377 format code
0f3b377 is described below
commit 0f3b377a417b7341b5ee1537d3915b4c0f7c44a5
Author: JackieTien97 <Ja...@foxmail.com>
AuthorDate: Wed Mar 10 20:26:23 2021 +0800
format code
---
.../java/org/apache/iotdb/db/utils/MergeUtils.java | 9 ++--
.../iotdb/tsfile/file/header/ChunkHeader.java | 4 +-
.../file/metadata/statistics/TimeStatistics.java | 15 +++---
.../apache/iotdb/tsfile/utils/TsPrimitiveType.java | 1 -
.../iotdb/tsfile/write/chunk/ChunkWriterImpl.java | 10 ++--
.../iotdb/tsfile/write/chunk/IChunkWriter.java | 3 +-
.../iotdb/tsfile/write/chunk/TimeChunkWriter.java | 48 ++++++-----------
.../iotdb/tsfile/write/chunk/ValueChunkWriter.java | 48 +++++++----------
.../tsfile/write/chunk/VectorChunkWriterImpl.java | 35 +++++++------
.../iotdb/tsfile/write/page/TimePageWriter.java | 19 ++++---
.../iotdb/tsfile/write/page/ValuePageWriter.java | 13 +++--
.../tsfile/write/schema/IMeasurementSchema.java | 3 +-
.../iotdb/tsfile/write/writer/TsFileIOWriter.java | 60 +++++++++-------------
.../write/writer/RestorableTsFileIOWriterTest.java | 22 ++++----
.../tsfile/write/writer/TestTsFileOutput.java | 4 +-
.../tsfile/write/writer/TimeChunkWriterTest.java | 39 +++++++-------
.../tsfile/write/writer/TimePageWriterTest.java | 19 ++++---
.../tsfile/write/writer/ValueChunkWriterTest.java | 22 ++++----
.../tsfile/write/writer/ValuePageWriterTest.java | 17 +++---
.../write/writer/VectorChunkWriterImplTest.java | 22 ++++----
.../write/writer/VectorMeasurementSchemaStub.java | 12 +++--
21 files changed, 209 insertions(+), 216 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/utils/MergeUtils.java b/server/src/main/java/org/apache/iotdb/db/utils/MergeUtils.java
index c3f39b7..2dbaca3 100644
--- a/server/src/main/java/org/apache/iotdb/db/utils/MergeUtils.java
+++ b/server/src/main/java/org/apache/iotdb/db/utils/MergeUtils.java
@@ -53,13 +53,16 @@ public class MergeUtils {
public static void writeTVPair(TimeValuePair timeValuePair, IChunkWriter chunkWriter) {
switch (chunkWriter.getDataType()) {
case TEXT:
- chunkWriter.write(timeValuePair.getTimestamp(), timeValuePair.getValue().getBinary(), false);
+ chunkWriter.write(
+ timeValuePair.getTimestamp(), timeValuePair.getValue().getBinary(), false);
break;
case DOUBLE:
- chunkWriter.write(timeValuePair.getTimestamp(), timeValuePair.getValue().getDouble(), false);
+ chunkWriter.write(
+ timeValuePair.getTimestamp(), timeValuePair.getValue().getDouble(), false);
break;
case BOOLEAN:
- chunkWriter.write(timeValuePair.getTimestamp(), timeValuePair.getValue().getBoolean(), false);
+ chunkWriter.write(
+ timeValuePair.getTimestamp(), timeValuePair.getValue().getBoolean(), false);
break;
case INT64:
chunkWriter.write(timeValuePair.getTimestamp(), timeValuePair.getValue().getLong(), false);
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/ChunkHeader.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/ChunkHeader.java
index 26d3ca7..48c9134 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/ChunkHeader.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/header/ChunkHeader.java
@@ -70,7 +70,9 @@ public class ChunkHeader {
int numOfPages,
int mask) {
this(
- (byte) ((numOfPages <= 1 ? MetaMarker.ONLY_ONE_PAGE_CHUNK_HEADER : MetaMarker.CHUNK_HEADER) | mask),
+ (byte)
+ ((numOfPages <= 1 ? MetaMarker.ONLY_ONE_PAGE_CHUNK_HEADER : MetaMarker.CHUNK_HEADER)
+ | mask),
measurementID,
dataSize,
getSerializedSize(measurementID, dataSize),
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/TimeStatistics.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/TimeStatistics.java
index ba29554..74bd701 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/TimeStatistics.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/statistics/TimeStatistics.java
@@ -18,12 +18,13 @@
*/
package org.apache.iotdb.tsfile.file.metadata.statistics;
+import org.apache.iotdb.tsfile.exception.filter.StatisticsClassException;
+import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
+
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.nio.ByteBuffer;
-import org.apache.iotdb.tsfile.exception.filter.StatisticsClassException;
-import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
public class TimeStatistics extends Statistics {
@@ -95,9 +96,7 @@ public class TimeStatistics extends Statistics {
}
@Override
- protected void mergeStatisticsValue(Statistics stats) {
-
- }
+ protected void mergeStatisticsValue(Statistics stats) {}
@Override
public byte[] getMinValueBytes() {
@@ -155,10 +154,8 @@ public class TimeStatistics extends Statistics {
}
@Override
- public void deserialize(InputStream inputStream) throws IOException {
- }
+ public void deserialize(InputStream inputStream) throws IOException {}
@Override
- public void deserialize(ByteBuffer byteBuffer) {
- }
+ public void deserialize(ByteBuffer byteBuffer) {}
}
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/TsPrimitiveType.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/TsPrimitiveType.java
index 2dce654..6c00f43 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/TsPrimitiveType.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/TsPrimitiveType.java
@@ -481,7 +481,6 @@ public abstract class TsPrimitiveType implements Serializable {
this.value = value;
}
-
@Override
public TsPrimitiveType[] getVector() {
return value;
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ChunkWriterImpl.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ChunkWriterImpl.java
index 0ae34ef..2beda20 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ChunkWriterImpl.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ChunkWriterImpl.java
@@ -18,10 +18,6 @@
*/
package org.apache.iotdb.tsfile.write.chunk;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.channels.Channels;
-import java.nio.channels.WritableByteChannel;
import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
import org.apache.iotdb.tsfile.compress.ICompressor;
import org.apache.iotdb.tsfile.encoding.encoder.SDTEncoder;
@@ -36,9 +32,15 @@ import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils;
import org.apache.iotdb.tsfile.write.page.PageWriter;
import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.writer.TsFileIOWriter;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.Channels;
+import java.nio.channels.WritableByteChannel;
+
public class ChunkWriterImpl implements IChunkWriter {
private static final Logger logger = LoggerFactory.getLogger(ChunkWriterImpl.class);
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/IChunkWriter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/IChunkWriter.java
index 70752ec..963ef64 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/IChunkWriter.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/IChunkWriter.java
@@ -18,11 +18,12 @@
*/
package org.apache.iotdb.tsfile.write.chunk;
-import java.io.IOException;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.utils.Binary;
import org.apache.iotdb.tsfile.write.writer.TsFileIOWriter;
+import java.io.IOException;
+
/** IChunkWriter provides a list of writing methods for different value types. */
public interface IChunkWriter {
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/TimeChunkWriter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/TimeChunkWriter.java
index 87c051e..df9ded9 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/TimeChunkWriter.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/TimeChunkWriter.java
@@ -18,7 +18,6 @@
*/
package org.apache.iotdb.tsfile.write.chunk;
-import java.io.IOException;
import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
import org.apache.iotdb.tsfile.compress.ICompressor;
import org.apache.iotdb.tsfile.encoding.encoder.Encoder;
@@ -32,9 +31,12 @@ import org.apache.iotdb.tsfile.file.metadata.statistics.TimeStatistics;
import org.apache.iotdb.tsfile.utils.PublicBAOS;
import org.apache.iotdb.tsfile.write.page.TimePageWriter;
import org.apache.iotdb.tsfile.write.writer.TsFileIOWriter;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.IOException;
+
public class TimeChunkWriter {
private static final Logger logger = LoggerFactory.getLogger(TimeChunkWriter.class);
@@ -45,47 +47,38 @@ public class TimeChunkWriter {
private final CompressionType compressionType;
- /**
- * all pages of this chunk.
- */
+ /** all pages of this chunk. */
private final PublicBAOS pageBuffer;
private int numOfPages;
- /**
- * write data into current page
- */
+ /** write data into current page */
private TimePageWriter pageWriter;
- /**
- * page size threshold.
- */
+ /** page size threshold. */
private final long pageSizeThreshold;
private final int maxNumberOfPointsInPage;
- /**
- * value count in current page.
- */
+ /** value count in current page. */
private int valueCountInOnePageForNextCheck;
// initial value for valueCountInOnePageForNextCheck
private static final int MINIMUM_RECORD_COUNT_FOR_CHECK = 1500;
- /**
- * statistic of this chunk.
- */
+ /** statistic of this chunk. */
private TimeStatistics statistics;
- /**
- * first page info
- */
+ /** first page info */
private int sizeWithoutStatistic;
private Statistics<?> firstPageStatistics;
- public TimeChunkWriter(String measurementId, CompressionType compressionType,
- TSEncoding encodingType, Encoder timeEncoder) {
+ public TimeChunkWriter(
+ String measurementId,
+ CompressionType compressionType,
+ TSEncoding encodingType,
+ Encoder timeEncoder) {
this.measurementId = measurementId;
this.encodingType = encodingType;
this.compressionType = compressionType;
@@ -101,7 +94,6 @@ public class TimeChunkWriter {
this.statistics = new TimeStatistics();
this.pageWriter = new TimePageWriter(timeEncoder, ICompressor.getCompressor(compressionType));
-
}
public void write(long time) {
@@ -182,7 +174,6 @@ public class TimeChunkWriter {
this.statistics = new TimeStatistics();
}
-
public long estimateMaxSeriesMemSize() {
return pageBuffer.size()
+ pageWriter.estimateMaxMemSize()
@@ -190,7 +181,6 @@ public class TimeChunkWriter {
+ pageWriter.getStatistics().getSerializedSize();
}
-
public long getCurrentChunkSize() {
if (pageBuffer.size() == 0) {
return 0;
@@ -200,7 +190,6 @@ public class TimeChunkWriter {
+ (long) pageBuffer.size();
}
-
public void sealCurrentPage() {
if (pageWriter != null && pageWriter.getPointNumber() > 0) {
writePageToPageBuffer();
@@ -222,11 +211,10 @@ public class TimeChunkWriter {
/**
* write the page to specified IOWriter.
*
- * @param writer the specified IOWriter
+ * @param writer the specified IOWriter
* @throws IOException exception in IO
*/
- public void writeAllPagesOfChunkToTsFile(TsFileIOWriter writer)
- throws IOException {
+ public void writeAllPagesOfChunkToTsFile(TsFileIOWriter writer) throws IOException {
if (statistics.getCount() == 0) {
return;
}
@@ -260,9 +248,7 @@ public class TimeChunkWriter {
writer.endCurrentChunk();
}
- /**
- * only used for test
- */
+ /** only used for test */
public PublicBAOS getPageBuffer() {
return pageBuffer;
}
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ValueChunkWriter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ValueChunkWriter.java
index 865036f..17e137d 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ValueChunkWriter.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ValueChunkWriter.java
@@ -18,7 +18,6 @@
*/
package org.apache.iotdb.tsfile.write.chunk;
-import java.io.IOException;
import org.apache.iotdb.tsfile.compress.ICompressor;
import org.apache.iotdb.tsfile.encoding.encoder.Encoder;
import org.apache.iotdb.tsfile.file.header.ChunkHeader;
@@ -31,9 +30,12 @@ import org.apache.iotdb.tsfile.utils.Binary;
import org.apache.iotdb.tsfile.utils.PublicBAOS;
import org.apache.iotdb.tsfile.write.page.ValuePageWriter;
import org.apache.iotdb.tsfile.write.writer.TsFileIOWriter;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.IOException;
+
public class ValueChunkWriter {
private static final Logger logger = LoggerFactory.getLogger(ValueChunkWriter.class);
@@ -42,38 +44,32 @@ public class ValueChunkWriter {
private final TSEncoding encodingType;
-
private final TSDataType dataType;
private final CompressionType compressionType;
- /**
- * all pages of this chunk.
- */
+ /** all pages of this chunk. */
private final PublicBAOS pageBuffer;
private int numOfPages;
- /**
- * write data into current page
- */
+ /** write data into current page */
private ValuePageWriter pageWriter;
-
- /**
- * statistic of this chunk.
- */
+ /** statistic of this chunk. */
private Statistics<?> statistics;
- /**
- * first page info
- */
+ /** first page info */
private int sizeWithoutStatistic;
private Statistics<?> firstPageStatistics;
- public ValueChunkWriter(String measurementId, CompressionType compressionType,
- TSDataType dataType, TSEncoding encodingType, Encoder valueEncoder) {
+ public ValueChunkWriter(
+ String measurementId,
+ CompressionType compressionType,
+ TSDataType dataType,
+ TSEncoding encodingType,
+ Encoder valueEncoder) {
this.measurementId = measurementId;
this.encodingType = encodingType;
this.dataType = dataType;
@@ -83,9 +79,8 @@ public class ValueChunkWriter {
// init statistics for this chunk and page
this.statistics = Statistics.getStatsByType(dataType);
- this.pageWriter = new ValuePageWriter(valueEncoder, ICompressor.getCompressor(compressionType),
- dataType);
-
+ this.pageWriter =
+ new ValuePageWriter(valueEncoder, ICompressor.getCompressor(compressionType), dataType);
}
public void write(long time, long value, boolean isNull) {
@@ -164,7 +159,6 @@ public class ValueChunkWriter {
}
}
-
public void writeToFileWriter(TsFileIOWriter tsfileWriter) throws IOException {
sealCurrentPage();
writeAllPagesOfChunkToTsFile(tsfileWriter);
@@ -203,25 +197,21 @@ public class ValueChunkWriter {
pageWriter = null;
}
-
public int getNumOfPages() {
return numOfPages;
}
-
public TSDataType getDataType() {
return dataType;
}
-
/**
* write the page to specified IOWriter.
*
- * @param writer the specified IOWriter
+ * @param writer the specified IOWriter
* @throws IOException exception in IO
*/
- public void writeAllPagesOfChunkToTsFile(TsFileIOWriter writer)
- throws IOException {
+ public void writeAllPagesOfChunkToTsFile(TsFileIOWriter writer) throws IOException {
if (statistics.getCount() == 0) {
return;
}
@@ -255,9 +245,7 @@ public class ValueChunkWriter {
writer.endCurrentChunk();
}
- /**
- * only used for test
- */
+ /** only used for test */
public PublicBAOS getPageBuffer() {
return pageBuffer;
}
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/VectorChunkWriterImpl.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/VectorChunkWriterImpl.java
index eb4b0e1..af71ecd 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/VectorChunkWriterImpl.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/VectorChunkWriterImpl.java
@@ -18,9 +18,6 @@
*/
package org.apache.iotdb.tsfile.write.chunk;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
import org.apache.iotdb.tsfile.encoding.encoder.Encoder;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
@@ -28,19 +25,24 @@ import org.apache.iotdb.tsfile.utils.Binary;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
import org.apache.iotdb.tsfile.write.writer.TsFileIOWriter;
-public class VectorChunkWriterImpl implements IChunkWriter {
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+public class VectorChunkWriterImpl implements IChunkWriter {
private final TimeChunkWriter timeChunkWriter;
private final List<ValueChunkWriter> valueChunkWriterList;
private int valueIndex;
- /**
- * @param schema schema of this measurement
- */
+ /** @param schema schema of this measurement */
public VectorChunkWriterImpl(IMeasurementSchema schema) {
- timeChunkWriter = new TimeChunkWriter(schema.getMeasurementId(), schema.getCompressor(),
- schema.getTimeTSEncoding(), schema.getTimeEncoder());
+ timeChunkWriter =
+ new TimeChunkWriter(
+ schema.getMeasurementId(),
+ schema.getCompressor(),
+ schema.getTimeTSEncoding(),
+ schema.getTimeEncoder());
List<String> valueMeasurementIdList = schema.getValueMeasurementIdList();
List<TSDataType> valueTSDataTypeList = schema.getValueTSDataTypeList();
@@ -48,10 +50,14 @@ public class VectorChunkWriterImpl implements IChunkWriter {
List<Encoder> valueEncoderList = schema.getValueEncoderList();
valueChunkWriterList = new ArrayList<>(valueMeasurementIdList.size());
- for (int i= 0; i < valueMeasurementIdList.size(); i++) {
- valueChunkWriterList.add(new ValueChunkWriter(valueMeasurementIdList.get(i),
- schema.getCompressor(),
- valueTSDataTypeList.get(i), valueTSEncodingList.get(i), valueEncoderList.get(i)));
+ for (int i = 0; i < valueMeasurementIdList.size(); i++) {
+ valueChunkWriterList.add(
+ new ValueChunkWriter(
+ valueMeasurementIdList.get(i),
+ schema.getCompressor(),
+ valueTSDataTypeList.get(i),
+ valueTSEncodingList.get(i),
+ valueEncoderList.get(i)));
}
this.valueIndex = 0;
@@ -110,19 +116,16 @@ public class VectorChunkWriterImpl implements IChunkWriter {
@Override
public void write(long[] timestamps, boolean[] values, int batchSize) {
throw new UnsupportedOperationException();
-
}
@Override
public void write(long[] timestamps, float[] values, int batchSize) {
throw new UnsupportedOperationException();
-
}
@Override
public void write(long[] timestamps, double[] values, int batchSize) {
throw new UnsupportedOperationException();
-
}
@Override
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/page/TimePageWriter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/page/TimePageWriter.java
index 9a1336c..5223d18 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/page/TimePageWriter.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/page/TimePageWriter.java
@@ -18,21 +18,24 @@
*/
package org.apache.iotdb.tsfile.write.page;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.channels.Channels;
-import java.nio.channels.WritableByteChannel;
import org.apache.iotdb.tsfile.compress.ICompressor;
import org.apache.iotdb.tsfile.encoding.encoder.Encoder;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
import org.apache.iotdb.tsfile.file.metadata.statistics.TimeStatistics;
import org.apache.iotdb.tsfile.utils.PublicBAOS;
import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.Channels;
+import java.nio.channels.WritableByteChannel;
+
/**
- * This writer is used to write time into a page. It consists of a time encoder and respective OutputStream.
+ * This writer is used to write time into a page. It consists of a time encoder and respective
+ * OutputStream.
*/
public class TimePageWriter {
@@ -126,7 +129,8 @@ public class TimePageWriter {
}
// write page content to temp PBAOS
- logger.trace("start to flush a time page data into buffer, buffer position {} ", pageBuffer.size());
+ logger.trace(
+ "start to flush a time page data into buffer, buffer position {} ", pageBuffer.size());
if (compressor.getType().equals(CompressionType.UNCOMPRESSED)) {
try (WritableByteChannel channel = Channels.newChannel(pageBuffer)) {
channel.write(pageData);
@@ -134,7 +138,8 @@ public class TimePageWriter {
} else {
pageBuffer.write(compressedBytes, 0, compressedSize);
}
- logger.trace("finish flushing a time page data into buffer, buffer position {} ", pageBuffer.size());
+ logger.trace(
+ "finish flushing a time page data into buffer, buffer position {} ", pageBuffer.size());
return sizeWithoutStatistic;
}
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/page/ValuePageWriter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/page/ValuePageWriter.java
index db20cf7..0fbfdbd 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/page/ValuePageWriter.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/page/ValuePageWriter.java
@@ -18,10 +18,6 @@
*/
package org.apache.iotdb.tsfile.write.page;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.channels.Channels;
-import java.nio.channels.WritableByteChannel;
import org.apache.iotdb.tsfile.compress.ICompressor;
import org.apache.iotdb.tsfile.encoding.encoder.Encoder;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
@@ -30,11 +26,18 @@ import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics;
import org.apache.iotdb.tsfile.utils.Binary;
import org.apache.iotdb.tsfile.utils.PublicBAOS;
import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.Channels;
+import java.nio.channels.WritableByteChannel;
+
/**
- * This writer is used to write value into a page. It consists of a value encoder and respective OutputStream.
+ * This writer is used to write value into a page. It consists of a value encoder and respective
+ * OutputStream.
*/
public class ValuePageWriter {
private static final Logger logger = LoggerFactory.getLogger(ValuePageWriter.class);
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/IMeasurementSchema.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/IMeasurementSchema.java
index 2098833..855e5fc 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/IMeasurementSchema.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/IMeasurementSchema.java
@@ -18,12 +18,13 @@
*/
package org.apache.iotdb.tsfile.write.schema;
-import java.util.List;
import org.apache.iotdb.tsfile.encoding.encoder.Encoder;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
+import java.util.List;
+
public interface IMeasurementSchema {
String getMeasurementId();
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriter.java
index dc1b59a..c68c78b 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriter.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriter.java
@@ -18,15 +18,6 @@
*/
package org.apache.iotdb.tsfile.write.writer;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
import org.apache.iotdb.tsfile.file.MetaMarker;
@@ -48,9 +39,20 @@ import org.apache.iotdb.tsfile.read.common.Path;
import org.apache.iotdb.tsfile.utils.BytesUtils;
import org.apache.iotdb.tsfile.utils.PublicBAOS;
import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
/**
* TsFileIOWriter is used to construct metadata and write data stored in memory to output stream.
*/
@@ -89,11 +91,8 @@ public class TsFileIOWriter {
private long minPlanIndex;
private long maxPlanIndex;
- /**
- * empty construct function.
- */
- protected TsFileIOWriter() {
- }
+ /** empty construct function. */
+ protected TsFileIOWriter() {}
/**
* for writing a new tsfile.
@@ -120,9 +119,7 @@ public class TsFileIOWriter {
startFile();
}
- /**
- * for test only
- */
+ /** for test only */
public TsFileIOWriter(TsFileOutput output, boolean test) {
this.out = output;
}
@@ -170,12 +167,12 @@ public class TsFileIOWriter {
/**
* start a {@linkplain ChunkMetadata ChunkMetaData}.
*
- * @param measurementId - measurementId of this time series
+ * @param measurementId - measurementId of this time series
* @param compressionCodecName - compression name of this time series
- * @param tsDataType - data type
- * @param statistics - Chunk statistics
- * @param dataSize - the serialized size of all pages
- * @param mask - 0x80 for time chunk, 0x40 for value chunk, 0x00 for common chunk
+ * @param tsDataType - data type
+ * @param statistics - Chunk statistics
+ * @param dataSize - the serialized size of all pages
+ * @param mask - 0x80 for time chunk, 0x40 for value chunk, 0x00 for common chunk
* @throws IOException if I/O error occurs
*/
public void startFlushChunk(
@@ -190,8 +187,7 @@ public class TsFileIOWriter {
throws IOException {
currentChunkMetadata =
- new ChunkMetadata(
- measurementId, tsDataType, out.getPosition(), statistics);
+ new ChunkMetadata(measurementId, tsDataType, out.getPosition(), statistics);
ChunkHeader header =
new ChunkHeader(
@@ -205,9 +201,7 @@ public class TsFileIOWriter {
header.serializeTo(out.wrapAsStream());
}
- /**
- * Write a whole chunk in another file into this file. Providing fast merge for IoTDB.
- */
+ /** Write a whole chunk in another file into this file. Providing fast merge for IoTDB. */
public void writeChunk(Chunk chunk, ChunkMetadata chunkMetadata) throws IOException {
ChunkHeader chunkHeader = chunk.getHeader();
currentChunkMetadata =
@@ -227,9 +221,7 @@ public class TsFileIOWriter {
}
}
- /**
- * end chunk and write some log.
- */
+ /** end chunk and write some log. */
public void endCurrentChunk() {
chunkMetadataList.add(currentChunkMetadata);
currentChunkMetadata = null;
@@ -382,11 +374,11 @@ public class TsFileIOWriter {
}
void writeSeparatorMaskForTest() throws IOException {
- out.write(new byte[]{MetaMarker.SEPARATOR});
+ out.write(new byte[] {MetaMarker.SEPARATOR});
}
void writeChunkMaskForTest() throws IOException {
- out.write(new byte[]{MetaMarker.CHUNK_HEADER});
+ out.write(new byte[] {MetaMarker.CHUNK_HEADER});
}
public File getFile() {
@@ -397,9 +389,7 @@ public class TsFileIOWriter {
this.file = file;
}
- /**
- * Remove such ChunkMetadata that its startTime is not in chunkStartTimes
- */
+ /** Remove such ChunkMetadata that its startTime is not in chunkStartTimes */
public void filterChunks(Map<Path, List<Long>> chunkStartTimes) {
Map<Path, Integer> startTimeIdxes = new HashMap<>();
chunkStartTimes.forEach((p, t) -> startTimeIdxes.put(p, 0));
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/RestorableTsFileIOWriterTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/RestorableTsFileIOWriterTest.java
index fd7c83b..e16ee55 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/RestorableTsFileIOWriterTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/RestorableTsFileIOWriterTest.java
@@ -19,16 +19,6 @@
package org.apache.iotdb.tsfile.write.writer;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.util.ArrayList;
-import java.util.List;
import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
import org.apache.iotdb.tsfile.constant.TestConstant;
import org.apache.iotdb.tsfile.exception.NotCompatibleTsFileException;
@@ -52,8 +42,20 @@ import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.FloatDataPoint;
import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
+
import org.junit.Test;
+import java.io.File;
+import java.io.FileWriter;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
@SuppressWarnings("squid:S4042") // Suppress use java.nio.Files#delete warning
public class RestorableTsFileIOWriterTest {
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/TestTsFileOutput.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/TestTsFileOutput.java
index 6317459..df46b6f 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/TestTsFileOutput.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/TestTsFileOutput.java
@@ -1,9 +1,10 @@
package org.apache.iotdb.tsfile.write.writer;
+import org.apache.iotdb.tsfile.utils.PublicBAOS;
+
import java.io.IOException;
import java.io.OutputStream;
import java.nio.ByteBuffer;
-import org.apache.iotdb.tsfile.utils.PublicBAOS;
public class TestTsFileOutput implements TsFileOutput {
@@ -42,7 +43,6 @@ public class TestTsFileOutput implements TsFileOutput {
@Override
public void flush() throws IOException {
publicBAOS.flush();
-
}
@Override
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/TimeChunkWriterTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/TimeChunkWriterTest.java
index 0c62d06..9968815 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/TimeChunkWriterTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/TimeChunkWriterTest.java
@@ -18,12 +18,6 @@
*/
package org.apache.iotdb.tsfile.write.writer;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
import org.apache.iotdb.tsfile.encoding.encoder.Encoder;
import org.apache.iotdb.tsfile.encoding.encoder.PlainEncoder;
import org.apache.iotdb.tsfile.file.MetaMarker;
@@ -34,22 +28,30 @@ import org.apache.iotdb.tsfile.utils.PublicBAOS;
import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils;
import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
import org.apache.iotdb.tsfile.write.chunk.TimeChunkWriter;
+
import org.junit.Test;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.fail;
+
public class TimeChunkWriterTest {
@Test
public void testWrite1() {
Encoder timeEncoder = new PlainEncoder(TSDataType.INT64, 0);
- TimeChunkWriter chunkWriter = new TimeChunkWriter("c1", CompressionType.UNCOMPRESSED,
- TSEncoding.PLAIN, timeEncoder);
- for (long time = 1; time <= 10; time++) {
- chunkWriter.write(time);
- }
- assertFalse(chunkWriter.checkPageSizeAndMayOpenANewPage());
- chunkWriter.sealCurrentPage();
- // page without statistics size: 82 + chunk header size: 8
- assertEquals(90L, chunkWriter.getCurrentChunkSize());
+ TimeChunkWriter chunkWriter =
+ new TimeChunkWriter("c1", CompressionType.UNCOMPRESSED, TSEncoding.PLAIN, timeEncoder);
+ for (long time = 1; time <= 10; time++) {
+ chunkWriter.write(time);
+ }
+ assertFalse(chunkWriter.checkPageSizeAndMayOpenANewPage());
+ chunkWriter.sealCurrentPage();
+ // page without statistics size: 82 + chunk header size: 8
+ assertEquals(90L, chunkWriter.getCurrentChunkSize());
try {
TestTsFileOutput testTsFileOutput = new TestTsFileOutput();
@@ -57,7 +59,8 @@ public class TimeChunkWriterTest {
chunkWriter.writeAllPagesOfChunkToTsFile(writer);
PublicBAOS publicBAOS = testTsFileOutput.publicBAOS;
ByteBuffer buffer = ByteBuffer.wrap(publicBAOS.getBuf(), 0, publicBAOS.size());
- assertEquals((byte) (0x80 | MetaMarker.ONLY_ONE_PAGE_CHUNK_HEADER), ReadWriteIOUtils.readByte(buffer));
+ assertEquals(
+ (byte) (0x80 | MetaMarker.ONLY_ONE_PAGE_CHUNK_HEADER), ReadWriteIOUtils.readByte(buffer));
assertEquals("c1", ReadWriteIOUtils.readVarIntString(buffer));
assertEquals(82, ReadWriteForEncodingUtils.readUnsignedVarInt(buffer));
assertEquals(TSDataType.Vector.serialize(), ReadWriteIOUtils.readByte(buffer));
@@ -73,8 +76,8 @@ public class TimeChunkWriterTest {
@Test
public void testWrite2() {
Encoder timeEncoder = new PlainEncoder(TSDataType.INT64, 0);
- TimeChunkWriter chunkWriter = new TimeChunkWriter("c1", CompressionType.UNCOMPRESSED,
- TSEncoding.PLAIN, timeEncoder);
+ TimeChunkWriter chunkWriter =
+ new TimeChunkWriter("c1", CompressionType.UNCOMPRESSED, TSEncoding.PLAIN, timeEncoder);
for (long time = 1; time <= 10; time++) {
chunkWriter.write(time);
}
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/TimePageWriterTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/TimePageWriterTest.java
index 6adfb8c..2ec6294 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/TimePageWriterTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/TimePageWriterTest.java
@@ -18,11 +18,6 @@
*/
package org.apache.iotdb.tsfile.write.writer;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
import org.apache.iotdb.tsfile.compress.ICompressor;
import org.apache.iotdb.tsfile.compress.IUnCompressor;
import org.apache.iotdb.tsfile.encoding.decoder.PlainDecoder;
@@ -35,10 +30,16 @@ import org.apache.iotdb.tsfile.utils.PublicBAOS;
import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils;
import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
import org.apache.iotdb.tsfile.write.page.TimePageWriter;
+
import org.junit.Test;
-public class TimePageWriterTest {
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+public class TimePageWriterTest {
@Test
public void testWrite() {
@@ -63,7 +64,6 @@ public class TimePageWriterTest {
}
}
-
@Test
public void testWritePageHeaderAndDataIntoBuffWithoutCompress1() {
Encoder timeEncoder = new PlainEncoder(TSDataType.INT64, 0);
@@ -118,8 +118,8 @@ public class TimePageWriterTest {
assertEquals(24, ReadWriteForEncodingUtils.readUnsignedVarInt(buffer));
// compressedSize
assertEquals(24, ReadWriteForEncodingUtils.readUnsignedVarInt(buffer));
- TimeStatistics testStatistics = (TimeStatistics) TimeStatistics
- .deserialize(buffer, TSDataType.Vector);
+ TimeStatistics testStatistics =
+ (TimeStatistics) TimeStatistics.deserialize(buffer, TSDataType.Vector);
assertEquals(1L, testStatistics.getStartTime());
assertEquals(3L, testStatistics.getEndTime());
assertEquals(3, testStatistics.getCount());
@@ -131,7 +131,6 @@ public class TimePageWriterTest {
}
}
-
@Test
public void testWritePageHeaderAndDataIntoBuffWithSnappy() {
Encoder timeEncoder = new PlainEncoder(TSDataType.INT64, 0);
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/ValueChunkWriterTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/ValueChunkWriterTest.java
index 0be1d96..3cc8272 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/ValueChunkWriterTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/ValueChunkWriterTest.java
@@ -18,11 +18,6 @@
*/
package org.apache.iotdb.tsfile.write.writer;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
import org.apache.iotdb.tsfile.encoding.encoder.Encoder;
import org.apache.iotdb.tsfile.encoding.encoder.PlainEncoder;
import org.apache.iotdb.tsfile.file.MetaMarker;
@@ -33,15 +28,23 @@ import org.apache.iotdb.tsfile.utils.PublicBAOS;
import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils;
import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
import org.apache.iotdb.tsfile.write.chunk.ValueChunkWriter;
+
import org.junit.Test;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
public class ValueChunkWriterTest {
@Test
public void testWrite1() {
Encoder valueEncoder = new PlainEncoder(TSDataType.FLOAT, 0);
- ValueChunkWriter chunkWriter = new ValueChunkWriter("s1", CompressionType.UNCOMPRESSED,
- TSDataType.FLOAT, TSEncoding.PLAIN, valueEncoder);
+ ValueChunkWriter chunkWriter =
+ new ValueChunkWriter(
+ "s1", CompressionType.UNCOMPRESSED, TSDataType.FLOAT, TSEncoding.PLAIN, valueEncoder);
for (int time = 1; time <= 20; time++) {
chunkWriter.write(time, (float) time, time % 4 == 0);
}
@@ -71,8 +74,9 @@ public class ValueChunkWriterTest {
@Test
public void testWrite2() {
Encoder valueEncoder = new PlainEncoder(TSDataType.FLOAT, 0);
- ValueChunkWriter chunkWriter = new ValueChunkWriter("s1", CompressionType.UNCOMPRESSED,
- TSDataType.FLOAT, TSEncoding.PLAIN, valueEncoder);
+ ValueChunkWriter chunkWriter =
+ new ValueChunkWriter(
+ "s1", CompressionType.UNCOMPRESSED, TSDataType.FLOAT, TSEncoding.PLAIN, valueEncoder);
for (int time = 1; time <= 20; time++) {
chunkWriter.write(time, (float) time, time % 4 == 0);
}
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/ValuePageWriterTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/ValuePageWriterTest.java
index c0557c5..a43159f 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/ValuePageWriterTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/ValuePageWriterTest.java
@@ -18,11 +18,6 @@
*/
package org.apache.iotdb.tsfile.write.writer;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
import org.apache.iotdb.tsfile.compress.ICompressor;
import org.apache.iotdb.tsfile.compress.IUnCompressor;
import org.apache.iotdb.tsfile.encoding.decoder.PlainDecoder;
@@ -36,8 +31,15 @@ import org.apache.iotdb.tsfile.utils.PublicBAOS;
import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils;
import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
import org.apache.iotdb.tsfile.write.page.ValuePageWriter;
+
import org.junit.Test;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
public class ValuePageWriterTest {
@Test
@@ -203,8 +205,8 @@ public class ValuePageWriterTest {
assertEquals(67, ReadWriteForEncodingUtils.readUnsignedVarInt(buffer));
// Statistics
- FloatStatistics testStatistics = (FloatStatistics) FloatStatistics
- .deserialize(buffer, TSDataType.FLOAT);
+ FloatStatistics testStatistics =
+ (FloatStatistics) FloatStatistics.deserialize(buffer, TSDataType.FLOAT);
assertEquals(1L, testStatistics.getStartTime());
assertEquals(19L, testStatistics.getEndTime());
assertEquals(15, testStatistics.getCount());
@@ -220,7 +222,6 @@ public class ValuePageWriterTest {
assertEquals(((byte) (0xEE)), ReadWriteIOUtils.readByte(buffer));
assertEquals(((byte) (0xE0)), ReadWriteIOUtils.readByte(buffer));
-
for (int value = 1; value <= 20; value++) {
if (value % 4 != 0) {
assertEquals((float) value, ReadWriteIOUtils.readFloat(buffer), 0.000001f);
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/VectorChunkWriterImplTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/VectorChunkWriterImplTest.java
index c91d79e..93e18bb 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/VectorChunkWriterImplTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/VectorChunkWriterImplTest.java
@@ -18,11 +18,6 @@
*/
package org.apache.iotdb.tsfile.write.writer;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
import org.apache.iotdb.tsfile.file.MetaMarker;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
@@ -31,8 +26,15 @@ import org.apache.iotdb.tsfile.utils.PublicBAOS;
import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils;
import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
import org.apache.iotdb.tsfile.write.chunk.VectorChunkWriterImpl;
+
import org.junit.Test;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
public class VectorChunkWriterImplTest {
@Test
@@ -48,7 +50,8 @@ public class VectorChunkWriterImplTest {
}
chunkWriter.sealCurrentPage();
- // time chunk: 14 + 4 + 160; value chunk 1: 8 + 2 + 4 + 3 + 80; value chunk 2: 8 + 2 + 4 + 3 + 20; value chunk 3: 9 + 4 + 7 + 20 * 8;
+ // time chunk: 14 + 4 + 160; value chunk 1: 8 + 2 + 4 + 3 + 80; value chunk 2: 8 + 2 + 4 + 3 +
+ // 20; value chunk 3: 9 + 4 + 7 + 20 * 8;
assertEquals(492L, chunkWriter.getCurrentChunkSize());
try {
@@ -58,8 +61,8 @@ public class VectorChunkWriterImplTest {
PublicBAOS publicBAOS = testTsFileOutput.publicBAOS;
ByteBuffer buffer = ByteBuffer.wrap(publicBAOS.getBuf(), 0, publicBAOS.size());
// time chunk
- assertEquals((byte) (0x80 | MetaMarker.ONLY_ONE_PAGE_CHUNK_HEADER),
- ReadWriteIOUtils.readByte(buffer));
+ assertEquals(
+ (byte) (0x80 | MetaMarker.ONLY_ONE_PAGE_CHUNK_HEADER), ReadWriteIOUtils.readByte(buffer));
assertEquals("s1.time", ReadWriteIOUtils.readVarIntString(buffer));
assertEquals(164, ReadWriteForEncodingUtils.readUnsignedVarInt(buffer));
assertEquals(TSDataType.Vector.serialize(), ReadWriteIOUtils.readByte(buffer));
@@ -132,8 +135,7 @@ public class VectorChunkWriterImplTest {
PublicBAOS publicBAOS = testTsFileOutput.publicBAOS;
ByteBuffer buffer = ByteBuffer.wrap(publicBAOS.getBuf(), 0, publicBAOS.size());
// time chunk
- assertEquals((byte) (0x80 | MetaMarker.CHUNK_HEADER),
- ReadWriteIOUtils.readByte(buffer));
+ assertEquals((byte) (0x80 | MetaMarker.CHUNK_HEADER), ReadWriteIOUtils.readByte(buffer));
assertEquals("s1.time", ReadWriteIOUtils.readVarIntString(buffer));
assertEquals(362, ReadWriteForEncodingUtils.readUnsignedVarInt(buffer));
assertEquals(TSDataType.Vector.serialize(), ReadWriteIOUtils.readByte(buffer));
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/VectorMeasurementSchemaStub.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/VectorMeasurementSchemaStub.java
index f823034..795a0a6 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/VectorMeasurementSchemaStub.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/VectorMeasurementSchemaStub.java
@@ -18,8 +18,6 @@
*/
package org.apache.iotdb.tsfile.write.writer;
-import java.util.Arrays;
-import java.util.List;
import org.apache.iotdb.tsfile.encoding.encoder.Encoder;
import org.apache.iotdb.tsfile.encoding.encoder.PlainEncoder;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
@@ -27,6 +25,9 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
+import java.util.Arrays;
+import java.util.List;
+
public class VectorMeasurementSchemaStub implements IMeasurementSchema {
@Override
@@ -71,8 +72,9 @@ public class VectorMeasurementSchemaStub implements IMeasurementSchema {
@Override
public List<Encoder> getValueEncoderList() {
- return Arrays
- .asList(new PlainEncoder(TSDataType.FLOAT, 0), new PlainEncoder(TSDataType.INT32, 0),
- new PlainEncoder(TSDataType.DOUBLE, 0));
+ return Arrays.asList(
+ new PlainEncoder(TSDataType.FLOAT, 0),
+ new PlainEncoder(TSDataType.INT32, 0),
+ new PlainEncoder(TSDataType.DOUBLE, 0));
}
}