This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch new_vector
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/new_vector by this push:
new 96d5c01 format code
new b0d4a50 Merge branch 'new_vector' of https://github.com/apache/iotdb
into new_vector
96d5c01 is described below
commit 96d5c01f4ec2b1661878aff7d3090f525a32bcb5
Author: JackieTien97 <[email protected]>
AuthorDate: Wed Nov 10 19:11:15 2021 +0800
format code
---
.../tsfile/read/reader/page/TimePageReader.java | 3 ++-
.../tsfile/write/chunk/AlignedChunkWriterImpl.java | 7 ++++---
.../TsFileGeneratorForSeriesReaderByTimestamp.java | 3 +--
.../org/apache/iotdb/tsfile/utils/RecordUtils.java | 6 ++++--
.../org/apache/iotdb/tsfile/write/WriteTest.java | 20 +++++++++++---------
.../write/writer/AlignedChunkWriterImplTest.java | 18 +++++++++++-------
.../write/writer/VectorMeasurementSchemaStub.java | 11 ++++++-----
7 files changed, 39 insertions(+), 29 deletions(-)
diff --git
a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/page/TimePageReader.java
b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/page/TimePageReader.java
index a616a96..1cf29fe 100644
---
a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/page/TimePageReader.java
+++
b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/page/TimePageReader.java
@@ -63,7 +63,8 @@ public class TimePageReader {
}
/**
- * In case that we use sequence read, and the page doesn't have statistics,
so we won't know time array's length at first
+ * In case that we use sequence read, and the page doesn't have statistics,
so we won't know time
+ * array's length at first
*/
public long[] getNextTimeBatch() throws IOException {
if (pageHeader.getStatistics() != null) {
diff --git
a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/AlignedChunkWriterImpl.java
b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/AlignedChunkWriterImpl.java
index b3dbf33..4c977ca 100644
---
a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/AlignedChunkWriterImpl.java
+++
b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/AlignedChunkWriterImpl.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,6 +25,10 @@ import org.apache.iotdb.tsfile.utils.Binary;
import org.apache.iotdb.tsfile.write.schema.VectorMeasurementSchema;
import org.apache.iotdb.tsfile.write.writer.TsFileIOWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
public class AlignedChunkWriterImpl implements IChunkWriter {
private final TimeChunkWriter timeChunkWriter;
diff --git
a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TsFileGeneratorForSeriesReaderByTimestamp.java
b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TsFileGeneratorForSeriesReaderByTimestamp.java
index 63a746d..a4e40ed 100755
---
a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TsFileGeneratorForSeriesReaderByTimestamp.java
+++
b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TsFileGeneratorForSeriesReaderByTimestamp.java
@@ -214,8 +214,7 @@ public class TsFileGeneratorForSeriesReaderByTimestamp {
schema.registerTimeseries(
new Path("d1"), new UnaryMeasurementSchema("s4", TSDataType.TEXT,
TSEncoding.PLAIN));
schema.registerTimeseries(
- new Path("d1"),
- new UnaryMeasurementSchema("s5", TSDataType.BOOLEAN,
TSEncoding.PLAIN));
+ new Path("d1"), new UnaryMeasurementSchema("s5", TSDataType.BOOLEAN,
TSEncoding.PLAIN));
schema.registerTimeseries(
new Path("d1"), new UnaryMeasurementSchema("s6", TSDataType.FLOAT,
TSEncoding.RLE));
schema.registerTimeseries(
diff --git
a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/RecordUtils.java
b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/RecordUtils.java
index 8e27ea1..461bcd6 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/RecordUtils.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/RecordUtils.java
@@ -69,8 +69,10 @@ public class RecordUtils {
// get measurementId and value
measurementId = items[i].trim();
MeasurementGroup measurementGroup = schema.getSeriesSchema(new
Path(deviceId));
- IMeasurementSchema measurementSchema = measurementGroup == null ? null :
- measurementGroup.getMeasurementSchemaMap().get(measurementId);
+ IMeasurementSchema measurementSchema =
+ measurementGroup == null
+ ? null
+ : measurementGroup.getMeasurementSchemaMap().get(measurementId);
if (measurementSchema == null) {
LOG.warn("measurementId:{},type not found, pass", measurementId);
continue;
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/WriteTest.java
b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/WriteTest.java
index b98418b..b96abad 100755
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/WriteTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/WriteTest.java
@@ -18,15 +18,6 @@
*/
package org.apache.iotdb.tsfile.write;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Random;
import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
import org.apache.iotdb.tsfile.common.constant.JsonFormatConstant;
@@ -42,12 +33,23 @@ import org.apache.iotdb.tsfile.utils.StringContainer;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.schema.Schema;
import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Random;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
/** test writing processing correction combining writing process and reading
process. */
public class WriteTest {
diff --git
a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/AlignedChunkWriterImplTest.java
b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/AlignedChunkWriterImplTest.java
index ac05405..2e756d3 100644
---
a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/AlignedChunkWriterImplTest.java
+++
b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/AlignedChunkWriterImplTest.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.AlignedChunkWriterImpl;
+
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 AlignedChunkWriterImplTest {
@Test
@@ -48,8 +50,10 @@ public class AlignedChunkWriterImplTest {
}
chunkWriter.sealCurrentPage();
- // time chunk: 7(ChunkHeader Size) + 4(PageHeader Size: uncompressedSize +
compressedSize) + 160(dataSize);
- // value chunk 1: 8(ChunkHeader Size) + 2(PageHeader Size:
uncompressedSize + compressedSize) + 4(bitmap length) + 3(bitmap data) +
80(data size);
+ // time chunk: 7(ChunkHeader Size) + 4(PageHeader Size: uncompressedSize +
compressedSize) +
+ // 160(dataSize);
+ // value chunk 1: 8(ChunkHeader Size) + 2(PageHeader Size:
uncompressedSize + compressedSize) +
+ // 4(bitmap length) + 3(bitmap data) + 80(data size);
// value chunk 2: 8 + 2 + 4 + 3 + 20;
// value chunk 3: 9 + 4 + 4 + 3 + 20 * 8;
assertEquals(485, chunkWriter.getSerializedChunkSize());
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 e0b7ba9e..343d790 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,11 +18,6 @@
*/
package org.apache.iotdb.tsfile.write.writer;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
import org.apache.iotdb.tsfile.encoding.encoder.Encoder;
import org.apache.iotdb.tsfile.encoding.encoder.PlainEncoder;
import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata;
@@ -31,6 +26,12 @@ 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.VectorMeasurementSchema;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
public class VectorMeasurementSchemaStub extends VectorMeasurementSchema {
@Override
