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 9d68a6c Fix TsFile writeAPI test (#4353)
9d68a6c is described below
commit 9d68a6ca0738ff9223158d13de564715425699d5
Author: 周沛辰 <[email protected]>
AuthorDate: Wed Nov 10 19:09:23 2021 +0800
Fix TsFile writeAPI test (#4353)
---
.../org/apache/iotdb/cluster/common/TestUtils.java | 4 +-
.../iotdb/hadoop/tsfile/TSMRWriteExample.java | 6 +-
.../apache/iotdb/hadoop/tsfile/TsFileHelper.java | 8 +-
.../iotdb/hadoop/tsfile/TsFileWriteToHDFS.java | 6 +-
.../iotdb/tsfile/TsFileForceAppendWrite.java | 12 +--
.../iotdb/hadoop/tsfile/TsFileTestHelper.java | 2 +-
.../org/apache/iotdb/hive/TsFileTestHelper.java | 2 +-
.../iotdb/db/engine/cache/ChunkCacheTest.java | 7 +-
.../engine/compaction/cross/MergeOverLapTest.java | 3 +-
.../db/engine/compaction/cross/MergeTaskTest.java | 4 +-
.../db/engine/compaction/cross/MergeTest.java | 3 +-
.../engine/compaction/cross/MergeUpgradeTest.java | 3 +-
.../inner/InnerCompactionMoreDataTest.java | 3 +-
.../compaction/inner/InnerCompactionTest.java | 9 +--
.../db/engine/memtable/MemTableTestUtils.java | 2 +-
...IoTDBLoadExternalTsFileWithTimePartitionIT.java | 2 +-
.../iotdb/db/rescon/ResourceManagerTest.java | 3 +-
.../iotdb/db/tools/TsFileSketchToolTest.java | 2 +-
.../iotdb/db/utils/TsFileRewriteToolTest.java | 7 +-
.../db/writelog/recover/DeviceStringTest.java | 2 +-
.../recover/RecoverResourceFromReaderTest.java | 8 +-
.../writelog/recover/UnseqTsFileRecoverTest.java | 8 +-
.../org/apache/iotdb/spark/tool/TsFileExample.java | 29 ++++----
.../apache/iotdb/spark/tool/TsFileWriteTool.java | 87 +++++++++++-----------
.../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/schema/converter/SchemaBuilderTest.java | 4 +-
.../write/writer/AlignedChunkWriterImplTest.java | 18 +++--
.../write/writer/VectorMeasurementSchemaStub.java | 11 +--
32 files changed, 144 insertions(+), 150 deletions(-)
diff --git
a/cluster/src/test/java/org/apache/iotdb/cluster/common/TestUtils.java
b/cluster/src/test/java/org/apache/iotdb/cluster/common/TestUtils.java
index 6ce06fa..23070a5 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/common/TestUtils.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/common/TestUtils.java
@@ -400,8 +400,8 @@ public class TestUtils {
file.getParentFile().mkdirs();
try (TsFileWriter writer = new TsFileWriter(file)) {
for (int k = 0; k < seriesNum; k++) {
- IMeasurementSchema schema = getTestMeasurementSchema(k);
- writer.registerTimeseries(new Path(getTestSg(sgNum),
schema.getMeasurementId()), schema);
+ UnaryMeasurementSchema schema = (UnaryMeasurementSchema)
getTestMeasurementSchema(k);
+ writer.registerTimeseries(new Path(getTestSg(sgNum)), schema);
}
for (int j = 0; j < ptNum; j++) {
diff --git
a/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSMRWriteExample.java
b/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSMRWriteExample.java
index 2339b04..d67c604 100644
---
a/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSMRWriteExample.java
+++
b/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TSMRWriteExample.java
@@ -59,16 +59,14 @@ public class TSMRWriteExample {
// add measurements into file schema (all with INT64 data type)
for (int i = 0; i < 2; i++) {
schema.registerTimeseries(
- new org.apache.iotdb.tsfile.read.common.Path(
- Constant.DEVICE_1, Constant.SENSOR_PREFIX + (i + 1)),
+ new org.apache.iotdb.tsfile.read.common.Path(Constant.DEVICE_1),
new UnaryMeasurementSchema(
Constant.SENSOR_PREFIX + (i + 1), TSDataType.INT64,
TSEncoding.TS_2DIFF));
}
for (int i = 2; i < sensorNum; i++) {
schema.registerTimeseries(
- new org.apache.iotdb.tsfile.read.common.Path(
- Constant.DEVICE_1, Constant.SENSOR_PREFIX + (i + 1)),
+ new org.apache.iotdb.tsfile.read.common.Path(Constant.DEVICE_1),
new UnaryMeasurementSchema(
Constant.SENSOR_PREFIX + (i + 1), TSDataType.DOUBLE,
TSEncoding.TS_2DIFF));
}
diff --git
a/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TsFileHelper.java
b/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TsFileHelper.java
index 832aa3b..95f5aaa 100644
---
a/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TsFileHelper.java
+++
b/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TsFileHelper.java
@@ -68,17 +68,15 @@ public class TsFileHelper {
UnaryMeasurementSchema measurementSchema =
new UnaryMeasurementSchema(
Constant.SENSOR_PREFIX + (i + 1), TSDataType.INT64,
TSEncoding.TS_2DIFF);
- schema.registerTimeseries(
- new Path(Constant.DEVICE_1, Constant.SENSOR_PREFIX + (i + 1)),
measurementSchema);
+ schema.registerTimeseries(new Path(Constant.DEVICE_1),
measurementSchema);
schemaList.add(measurementSchema);
}
for (int i = 2; i < sensorNum; i++) {
- IMeasurementSchema measurementSchema =
+ UnaryMeasurementSchema measurementSchema =
new UnaryMeasurementSchema(
Constant.SENSOR_PREFIX + (i + 1), TSDataType.DOUBLE,
TSEncoding.TS_2DIFF);
- schema.registerTimeseries(
- new Path(Constant.DEVICE_1, Constant.SENSOR_PREFIX + (i + 1)),
measurementSchema);
+ schema.registerTimeseries(new Path(Constant.DEVICE_1),
measurementSchema);
schemaList.add(measurementSchema);
}
diff --git
a/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TsFileWriteToHDFS.java
b/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TsFileWriteToHDFS.java
index 19da583..140bbca 100644
---
a/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TsFileWriteToHDFS.java
+++
b/example/hadoop/src/main/java/org/apache/iotdb/hadoop/tsfile/TsFileWriteToHDFS.java
@@ -49,13 +49,13 @@ public class TsFileWriteToHDFS {
File f = FSFactoryProducer.getFSFactory().getFile(path);
try (TsFileWriter tsFileWriter = new TsFileWriter(f)) {
tsFileWriter.registerTimeseries(
- new Path(Constant.DEVICE_1, Constant.SENSOR_1),
+ new Path(Constant.DEVICE_1),
new UnaryMeasurementSchema(Constant.SENSOR_1, TSDataType.INT64,
TSEncoding.RLE));
tsFileWriter.registerTimeseries(
- new Path(Constant.DEVICE_1, Constant.SENSOR_2),
+ new Path(Constant.DEVICE_1),
new UnaryMeasurementSchema(Constant.SENSOR_2, TSDataType.INT64,
TSEncoding.RLE));
tsFileWriter.registerTimeseries(
- new Path(Constant.DEVICE_1, Constant.SENSOR_3),
+ new Path(Constant.DEVICE_1),
new UnaryMeasurementSchema(Constant.SENSOR_3, TSDataType.INT64,
TSEncoding.RLE));
// construct TSRecord
diff --git
a/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileForceAppendWrite.java
b/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileForceAppendWrite.java
index f10b59b..6fd454b 100644
---
a/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileForceAppendWrite.java
+++
b/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileForceAppendWrite.java
@@ -51,13 +51,13 @@ public class TsFileForceAppendWrite {
// add measurements into file schema
for (int i = 0; i < 4; i++) {
tsFileWriter.registerTimeseries(
- new Path(Constant.DEVICE_PREFIX + i, Constant.SENSOR_1),
+ new Path(Constant.DEVICE_PREFIX + i),
new UnaryMeasurementSchema(Constant.SENSOR_1, TSDataType.INT64,
TSEncoding.RLE));
tsFileWriter.registerTimeseries(
- new Path(Constant.DEVICE_PREFIX + i, Constant.SENSOR_2),
+ new Path(Constant.DEVICE_PREFIX + i),
new UnaryMeasurementSchema(Constant.SENSOR_2, TSDataType.INT64,
TSEncoding.RLE));
tsFileWriter.registerTimeseries(
- new Path(Constant.DEVICE_PREFIX + i, Constant.SENSOR_3),
+ new Path(Constant.DEVICE_PREFIX + i),
new UnaryMeasurementSchema(Constant.SENSOR_3, TSDataType.INT64,
TSEncoding.RLE));
}
@@ -85,13 +85,13 @@ public class TsFileForceAppendWrite {
// add measurements into file schema
for (int i = 0; i < 4; i++) {
tsFileWriter1.registerTimeseries(
- new Path(Constant.DEVICE_PREFIX + i, Constant.SENSOR_1),
+ new Path(Constant.DEVICE_PREFIX + i),
new UnaryMeasurementSchema(Constant.SENSOR_1, TSDataType.INT64,
TSEncoding.RLE));
tsFileWriter1.registerTimeseries(
- new Path(Constant.DEVICE_PREFIX + i, Constant.SENSOR_2),
+ new Path(Constant.DEVICE_PREFIX + i),
new UnaryMeasurementSchema(Constant.SENSOR_2, TSDataType.INT64,
TSEncoding.RLE));
tsFileWriter1.registerTimeseries(
- new Path(Constant.DEVICE_PREFIX + i, Constant.SENSOR_3),
+ new Path(Constant.DEVICE_PREFIX + i),
new UnaryMeasurementSchema(Constant.SENSOR_3, TSDataType.INT64,
TSEncoding.RLE));
}
// construct TSRecord
diff --git
a/hadoop/src/test/java/org/apache/iotdb/hadoop/tsfile/TsFileTestHelper.java
b/hadoop/src/test/java/org/apache/iotdb/hadoop/tsfile/TsFileTestHelper.java
index bfe7371..08c7393 100644
--- a/hadoop/src/test/java/org/apache/iotdb/hadoop/tsfile/TsFileTestHelper.java
+++ b/hadoop/src/test/java/org/apache/iotdb/hadoop/tsfile/TsFileTestHelper.java
@@ -66,7 +66,7 @@ public class TsFileTestHelper {
for (int i = 0; i < sensorNum; i++) {
UnaryMeasurementSchema measurementSchema =
new UnaryMeasurementSchema("sensor_" + (i + 1), TSDataType.INT64,
TSEncoding.TS_2DIFF);
- schema.registerTimeseries(new Path("device_1", "sensor_" + (i + 1)),
measurementSchema);
+ schema.registerTimeseries(new Path("device_1"), measurementSchema);
schemaList.add(measurementSchema);
}
diff --git
a/hive-connector/src/test/java/org/apache/iotdb/hive/TsFileTestHelper.java
b/hive-connector/src/test/java/org/apache/iotdb/hive/TsFileTestHelper.java
index ea4835f..7463369 100644
--- a/hive-connector/src/test/java/org/apache/iotdb/hive/TsFileTestHelper.java
+++ b/hive-connector/src/test/java/org/apache/iotdb/hive/TsFileTestHelper.java
@@ -71,7 +71,7 @@ public class TsFileTestHelper {
TSDataType.INT64,
TSEncoding.TS_2DIFF,
CompressionType.UNCOMPRESSED);
- schema.registerTimeseries(new Path("device_1", "sensor_" + (i + 1)),
measurementSchema);
+ schema.registerTimeseries(new Path("device_1"), measurementSchema);
schemaList.add(measurementSchema);
}
diff --git
a/server/src/test/java/org/apache/iotdb/db/engine/cache/ChunkCacheTest.java
b/server/src/test/java/org/apache/iotdb/db/engine/cache/ChunkCacheTest.java
index da7e897..c053b5b 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/cache/ChunkCacheTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/cache/ChunkCacheTest.java
@@ -49,7 +49,9 @@ import org.junit.Test;
import java.io.File;
import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
import static org.apache.iotdb.db.conf.IoTDBConstant.PATH_SEPARATOR;
import static org.junit.Assert.assertTrue;
@@ -187,8 +189,7 @@ public class ChunkCacheTest {
TsFileWriter fileWriter = new TsFileWriter(tsFileResource.getTsFile());
for (String deviceId : deviceIds) {
for (UnaryMeasurementSchema measurementSchema : measurementSchemas) {
- fileWriter.registerTimeseries(
- new Path(deviceId, measurementSchema.getMeasurementId()),
measurementSchema);
+ fileWriter.registerTimeseries(new Path(deviceId), measurementSchema);
}
}
for (long i = timeOffset; i < timeOffset + ptNum; i++) {
diff --git
a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/MergeOverLapTest.java
b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/MergeOverLapTest.java
index 9e6eb07..295cec7 100644
---
a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/MergeOverLapTest.java
+++
b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/MergeOverLapTest.java
@@ -115,8 +115,7 @@ public class MergeOverLapTest extends MergeTest {
TsFileWriter fileWriter = new TsFileWriter(tsFileResource.getTsFile());
for (String deviceId : deviceIds) {
for (UnaryMeasurementSchema measurementSchema : measurementSchemas) {
- fileWriter.registerTimeseries(
- new Path(deviceId, measurementSchema.getMeasurementId()),
measurementSchema);
+ fileWriter.registerTimeseries(new Path(deviceId), measurementSchema);
}
}
for (long i = timeOffset; i < timeOffset + ptNum; i++) {
diff --git
a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/MergeTaskTest.java
b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/MergeTaskTest.java
index 62241fd..33baef4 100644
---
a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/MergeTaskTest.java
+++
b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/MergeTaskTest.java
@@ -547,9 +547,7 @@ public class MergeTaskTest extends MergeTest {
TsFileWriter fileWriter = new TsFileWriter(tsFileResource.getTsFile());
for (int i = 0; i < deviceIds.length - 1; i++) {
for (int j = 0; j < measurementSchemas.length - 1; j++) {
- fileWriter.registerTimeseries(
- new Path(deviceIds[i], measurementSchemas[j].getMeasurementId()),
- measurementSchemas[j]);
+ fileWriter.registerTimeseries(new Path(deviceIds[i]),
measurementSchemas[j]);
}
}
for (long i = timeOffset; i < timeOffset + ptNum; i++) {
diff --git
a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/MergeTest.java
b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/MergeTest.java
index 065993b..fe53e61 100644
---
a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/MergeTest.java
+++
b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/MergeTest.java
@@ -181,8 +181,7 @@ abstract class MergeTest {
TsFileWriter fileWriter = new TsFileWriter(tsFileResource.getTsFile());
for (String deviceId : deviceIds) {
for (UnaryMeasurementSchema measurementSchema : measurementSchemas) {
- fileWriter.registerTimeseries(
- new Path(deviceId, measurementSchema.getMeasurementId()),
measurementSchema);
+ fileWriter.registerTimeseries(new Path(deviceId), measurementSchema);
}
}
for (long i = timeOffset; i < timeOffset + ptNum; i++) {
diff --git
a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/MergeUpgradeTest.java
b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/MergeUpgradeTest.java
index 2580103..b6c9e47 100644
---
a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/MergeUpgradeTest.java
+++
b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/MergeUpgradeTest.java
@@ -170,8 +170,7 @@ public class MergeUpgradeTest {
long valueOffset)
throws WriteProcessException, IOException {
for (UnaryMeasurementSchema MeasurementSchema : measurementSchemas) {
- fileWriter.registerTimeseries(
- new Path(deviceName, MeasurementSchema.getMeasurementId()),
MeasurementSchema);
+ fileWriter.registerTimeseries(new Path(deviceName), MeasurementSchema);
}
for (long i = timeOffset; i < timeOffset + ptNum; i++) {
TSRecord record = new TSRecord(i, deviceName);
diff --git
a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionMoreDataTest.java
b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionMoreDataTest.java
index 429d091..b0489a5 100644
---
a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionMoreDataTest.java
+++
b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionMoreDataTest.java
@@ -156,8 +156,7 @@ public class InnerCompactionMoreDataTest extends
InnerCompactionTest {
TsFileWriter fileWriter = new TsFileWriter(tsFileResource.getTsFile());
for (String deviceId : deviceIds) {
for (UnaryMeasurementSchema measurementSchema : measurementSchemas) {
- fileWriter.registerTimeseries(
- new Path(deviceId, measurementSchema.getMeasurementId()),
measurementSchema);
+ fileWriter.registerTimeseries(new Path(deviceId), measurementSchema);
}
}
for (long i = timeOffset; i < timeOffset + ptNum; i++) {
diff --git
a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionTest.java
b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionTest.java
index 900752f..7559da5 100644
---
a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionTest.java
+++
b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionTest.java
@@ -213,8 +213,7 @@ public abstract class InnerCompactionTest {
TsFileWriter fileWriter = new TsFileWriter(tsFileResource.getTsFile());
for (String deviceId : deviceIds) {
for (UnaryMeasurementSchema measurementSchema : measurementSchemas) {
- fileWriter.registerTimeseries(
- new Path(deviceId, measurementSchema.getMeasurementId()),
measurementSchema);
+ fileWriter.registerTimeseries(new Path(deviceId), measurementSchema);
}
}
for (long i = timeOffset; i < timeOffset + ptNum; i++) {
@@ -257,8 +256,7 @@ public abstract class InnerCompactionTest {
tsFileResource1.setClosed(true);
tsFileResource1.updatePlanIndexes((long) 0);
TsFileWriter fileWriter1 = new TsFileWriter(tsFileResource1.getTsFile());
- fileWriter1.registerTimeseries(
- new Path(deviceIds[0], measurementSchemas[0].getMeasurementId()),
measurementSchemas[0]);
+ fileWriter1.registerTimeseries(new Path(deviceIds[0]),
measurementSchemas[0]);
TSRecord record1 = new TSRecord(0, deviceIds[0]);
record1.addTuple(
DataPoint.getDataPoint(
@@ -284,8 +282,7 @@ public abstract class InnerCompactionTest {
tsFileResource2.setClosed(true);
tsFileResource2.updatePlanIndexes((long) 1);
TsFileWriter fileWriter2 = new TsFileWriter(tsFileResource2.getTsFile());
- fileWriter2.registerTimeseries(
- new Path(deviceIds[0], measurementSchemas[1].getMeasurementId()),
measurementSchemas[1]);
+ fileWriter2.registerTimeseries(new Path(deviceIds[0]),
measurementSchemas[1]);
TSRecord record2 = new TSRecord(0, deviceIds[0]);
record2.addTuple(
DataPoint.getDataPoint(
diff --git
a/server/src/test/java/org/apache/iotdb/db/engine/memtable/MemTableTestUtils.java
b/server/src/test/java/org/apache/iotdb/db/engine/memtable/MemTableTestUtils.java
index 279531f..09b21c6 100644
---
a/server/src/test/java/org/apache/iotdb/db/engine/memtable/MemTableTestUtils.java
+++
b/server/src/test/java/org/apache/iotdb/db/engine/memtable/MemTableTestUtils.java
@@ -45,7 +45,7 @@ public class MemTableTestUtils {
static {
schema.registerTimeseries(
- new Path(deviceId0, measurementId0),
+ new Path(deviceId0),
new UnaryMeasurementSchema(measurementId0, dataType0,
TSEncoding.PLAIN));
}
diff --git
a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsFileWithTimePartitionIT.java
b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsFileWithTimePartitionIT.java
index 43b6c17..c5c37b2 100644
---
a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsFileWithTimePartitionIT.java
+++
b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsFileWithTimePartitionIT.java
@@ -124,7 +124,7 @@ public class IoTDBLoadExternalTsFileWithTimePartitionIT {
for (String deviceId : devices) {
for (String measurement : measurements) {
tsFileWriter.registerTimeseries(
- new Path(STORAGE_GROUP + DOT + deviceId, measurement),
+ new Path(STORAGE_GROUP + DOT + deviceId),
new UnaryMeasurementSchema(measurement, TSDataType.INT64,
TSEncoding.RLE));
}
}
diff --git
a/server/src/test/java/org/apache/iotdb/db/rescon/ResourceManagerTest.java
b/server/src/test/java/org/apache/iotdb/db/rescon/ResourceManagerTest.java
index 8943a21..4c04342 100644
--- a/server/src/test/java/org/apache/iotdb/db/rescon/ResourceManagerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/rescon/ResourceManagerTest.java
@@ -157,8 +157,7 @@ public class ResourceManagerTest {
TsFileWriter fileWriter = new TsFileWriter(tsFileResource.getTsFile());
for (String deviceId : deviceIds) {
for (UnaryMeasurementSchema measurementSchema : measurementSchemas) {
- fileWriter.registerTimeseries(
- new Path(deviceId, measurementSchema.getMeasurementId()),
measurementSchema);
+ fileWriter.registerTimeseries(new Path(deviceId), measurementSchema);
}
}
for (long i = timeOffset; i < timeOffset + ptNum; i++) {
diff --git
a/server/src/test/java/org/apache/iotdb/db/tools/TsFileSketchToolTest.java
b/server/src/test/java/org/apache/iotdb/db/tools/TsFileSketchToolTest.java
index ecd0de1..327bca5 100644
--- a/server/src/test/java/org/apache/iotdb/db/tools/TsFileSketchToolTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/tools/TsFileSketchToolTest.java
@@ -69,7 +69,7 @@ public class TsFileSketchToolTest {
sensorPrefix + (i + 1), TSDataType.INT64, TSEncoding.TS_2DIFF);
measurementSchemas.add(measurementSchema);
schema.registerTimeseries(
- new Path(device, sensorPrefix + (i + 1)),
+ new Path(device),
new UnaryMeasurementSchema(
sensorPrefix + (i + 1), TSDataType.INT64,
TSEncoding.TS_2DIFF));
}
diff --git
a/server/src/test/java/org/apache/iotdb/db/utils/TsFileRewriteToolTest.java
b/server/src/test/java/org/apache/iotdb/db/utils/TsFileRewriteToolTest.java
index 6d7cdea..9232627 100644
--- a/server/src/test/java/org/apache/iotdb/db/utils/TsFileRewriteToolTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/utils/TsFileRewriteToolTest.java
@@ -263,7 +263,7 @@ public class TsFileRewriteToolTest {
String device = entry.getKey();
for (String sensor : entry.getValue()) {
tsFileWriter.registerTimeseries(
- new Path(device, sensor),
+ new Path(device),
new UnaryMeasurementSchema(sensor, TSDataType.INT64,
TSEncoding.RLE));
}
}
@@ -304,7 +304,7 @@ public class TsFileRewriteToolTest {
String device = entry.getKey();
for (String sensor : entry.getValue()) {
tsFileWriter.registerTimeseries(
- new Path(device, sensor),
+ new Path(device),
new UnaryMeasurementSchema(sensor, TSDataType.INT64,
TSEncoding.RLE));
}
}
@@ -378,8 +378,7 @@ public class TsFileRewriteToolTest {
// add measurements into file schema
try {
tsFileWriter.registerTimeseries(
- new Path(device, sensor),
- new UnaryMeasurementSchema(sensor, TSDataType.INT64,
TSEncoding.RLE));
+ new Path(device), new UnaryMeasurementSchema(sensor,
TSDataType.INT64, TSEncoding.RLE));
} catch (WriteProcessException e) {
Assert.fail(e.getMessage());
}
diff --git
a/server/src/test/java/org/apache/iotdb/db/writelog/recover/DeviceStringTest.java
b/server/src/test/java/org/apache/iotdb/db/writelog/recover/DeviceStringTest.java
index 3cec1ba..a72a769 100644
---
a/server/src/test/java/org/apache/iotdb/db/writelog/recover/DeviceStringTest.java
+++
b/server/src/test/java/org/apache/iotdb/db/writelog/recover/DeviceStringTest.java
@@ -87,7 +87,7 @@ public class DeviceStringTest {
TSFileDescriptor.getInstance().getConfig().getCompressor(),
Collections.emptyMap());
schema.registerTimeseries(
- new Path(("root.sg.device99"), ("sensor1")),
+ new Path(("root.sg.device99")),
new UnaryMeasurementSchema("sensor1", TSDataType.INT64,
TSEncoding.PLAIN));
mManager.createTimeseries(
new PartialPath("root.sg.device99.sensor1"),
diff --git
a/server/src/test/java/org/apache/iotdb/db/writelog/recover/RecoverResourceFromReaderTest.java
b/server/src/test/java/org/apache/iotdb/db/writelog/recover/RecoverResourceFromReaderTest.java
index c8ce65c..1225cd8 100644
---
a/server/src/test/java/org/apache/iotdb/db/writelog/recover/RecoverResourceFromReaderTest.java
+++
b/server/src/test/java/org/apache/iotdb/db/writelog/recover/RecoverResourceFromReaderTest.java
@@ -98,7 +98,7 @@ public class RecoverResourceFromReaderTest {
new PartialPath("root.sg.device" + i +
IoTDBConstant.PATH_SEPARATOR + "sensor" + j);
UnaryMeasurementSchema measurementSchema =
new UnaryMeasurementSchema("sensor" + j, TSDataType.INT64,
TSEncoding.PLAIN);
- schema.registerTimeseries(path.toTSFilePath(), measurementSchema);
+ schema.registerTimeseries(new Path(path.toTSFilePath().getDevice()),
measurementSchema);
IoTDB.metaManager.createTimeseries(
path,
measurementSchema.getType(),
@@ -108,7 +108,7 @@ public class RecoverResourceFromReaderTest {
}
}
schema.registerTimeseries(
- new Path(("root.sg.device99"), ("sensor4")),
+ new Path(("root.sg.device99")),
new UnaryMeasurementSchema("sensor4", TSDataType.INT64,
TSEncoding.PLAIN));
IoTDB.metaManager.createTimeseries(
new PartialPath("root.sg.device99.sensor4"),
@@ -117,7 +117,7 @@ public class RecoverResourceFromReaderTest {
TSFileDescriptor.getInstance().getConfig().getCompressor(),
Collections.emptyMap());
schema.registerTimeseries(
- new Path(("root.sg.device99"), ("sensor2")),
+ new Path("root.sg.device99"),
new UnaryMeasurementSchema("sensor2", TSDataType.INT64,
TSEncoding.PLAIN));
IoTDB.metaManager.createTimeseries(
new PartialPath("root.sg.device99.sensor2"),
@@ -126,7 +126,7 @@ public class RecoverResourceFromReaderTest {
TSFileDescriptor.getInstance().getConfig().getCompressor(),
Collections.emptyMap());
schema.registerTimeseries(
- new Path(("root.sg.device99"), ("sensor1")),
+ new Path(("root.sg.device99")),
new UnaryMeasurementSchema("sensor1", TSDataType.INT64,
TSEncoding.PLAIN));
IoTDB.metaManager.createTimeseries(
new PartialPath("root.sg.device99.sensor1"),
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 ed51d7c..3c80de0 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
@@ -107,7 +107,7 @@ public class UnseqTsFileRecoverTest {
new PartialPath("root.sg.device" + i +
IoTDBConstant.PATH_SEPARATOR + "sensor" + j);
UnaryMeasurementSchema measurementSchema =
new UnaryMeasurementSchema("sensor" + j, TSDataType.INT64,
TSEncoding.PLAIN);
- schema.registerTimeseries(path.toTSFilePath(), measurementSchema);
+ schema.registerTimeseries(new Path(path.toTSFilePath().getDevice()),
measurementSchema);
IoTDB.metaManager.createTimeseries(
path,
measurementSchema.getType(),
@@ -117,7 +117,7 @@ public class UnseqTsFileRecoverTest {
}
}
schema.registerTimeseries(
- new Path(("root.sg.device99"), ("sensor4")),
+ new Path(("root.sg.device99")),
new UnaryMeasurementSchema("sensor4", TSDataType.INT64,
TSEncoding.PLAIN));
IoTDB.metaManager.createTimeseries(
new PartialPath("root.sg.device99.sensor4"),
@@ -126,7 +126,7 @@ public class UnseqTsFileRecoverTest {
TSFileDescriptor.getInstance().getConfig().getCompressor(),
Collections.emptyMap());
schema.registerTimeseries(
- new Path(("root.sg.device99"), ("sensor2")),
+ new Path(("root.sg.device99")),
new UnaryMeasurementSchema("sensor2", TSDataType.INT64,
TSEncoding.PLAIN));
IoTDB.metaManager.createTimeseries(
new PartialPath("root.sg.device99.sensor2"),
@@ -135,7 +135,7 @@ public class UnseqTsFileRecoverTest {
TSFileDescriptor.getInstance().getConfig().getCompressor(),
Collections.emptyMap());
schema.registerTimeseries(
- new Path(("root.sg.device99"), ("sensor1")),
+ new Path(("root.sg.device99")),
new UnaryMeasurementSchema("sensor1", TSDataType.INT64,
TSEncoding.PLAIN));
IoTDB.metaManager.createTimeseries(
new PartialPath("root.sg.device99.sensor1"),
diff --git
a/spark-tsfile/src/test/scala/org/apache/iotdb/spark/tool/TsFileExample.java
b/spark-tsfile/src/test/scala/org/apache/iotdb/spark/tool/TsFileExample.java
index f4da768..7b8154d 100644
--- a/spark-tsfile/src/test/scala/org/apache/iotdb/spark/tool/TsFileExample.java
+++ b/spark-tsfile/src/test/scala/org/apache/iotdb/spark/tool/TsFileExample.java
@@ -32,9 +32,7 @@ import
org.apache.iotdb.tsfile.write.record.datapoint.FloatDataPoint;
import org.apache.iotdb.tsfile.write.record.datapoint.StringDataPoint;
import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
-/**
- * Write an example TsFile as shown in README.
- */
+/** Write an example TsFile as shown in README. */
public class TsFileExample {
public static void create(String tsfilePath) throws Exception {
@@ -45,18 +43,18 @@ public class TsFileExample {
TsFileWriter tsFileWriter = new TsFileWriter(f);
// add measurements into file schema
- tsFileWriter
- .registerTimeseries(new Path("root.ln.wf01.wt01", "status"),
- new UnaryMeasurementSchema("status", TSDataType.BOOLEAN,
TSEncoding.PLAIN));
- tsFileWriter
- .registerTimeseries(new Path("root.ln.wf01.wt01", "temperature"),
- new UnaryMeasurementSchema("temperature", TSDataType.FLOAT,
TSEncoding.RLE));
- tsFileWriter
- .registerTimeseries(new Path("root.ln.wf02.wt02", "temperature"),
- new UnaryMeasurementSchema("temperature", TSDataType.FLOAT,
TSEncoding.RLE));
- tsFileWriter
- .registerTimeseries(new Path("root.ln.wf02.wt02", "hardware"),
- new UnaryMeasurementSchema("hardware", TSDataType.TEXT,
TSEncoding.PLAIN));
+ tsFileWriter.registerTimeseries(
+ new Path("root.ln.wf01.wt01"),
+ new UnaryMeasurementSchema("status", TSDataType.BOOLEAN,
TSEncoding.PLAIN));
+ tsFileWriter.registerTimeseries(
+ new Path("root.ln.wf01.wt01"),
+ new UnaryMeasurementSchema("temperature", TSDataType.FLOAT,
TSEncoding.RLE));
+ tsFileWriter.registerTimeseries(
+ new Path("root.ln.wf02.wt02"),
+ new UnaryMeasurementSchema("temperature", TSDataType.FLOAT,
TSEncoding.RLE));
+ tsFileWriter.registerTimeseries(
+ new Path("root.ln.wf02.wt02"),
+ new UnaryMeasurementSchema("hardware", TSDataType.TEXT,
TSEncoding.PLAIN));
// construct TSRecord
TSRecord tsRecord = new TSRecord(1, "root.ln.wf01.wt01");
@@ -110,5 +108,4 @@ public class TsFileExample {
// close TsFile
tsFileWriter.close();
}
-
}
diff --git
a/spark-tsfile/src/test/scala/org/apache/iotdb/spark/tool/TsFileWriteTool.java
b/spark-tsfile/src/test/scala/org/apache/iotdb/spark/tool/TsFileWriteTool.java
index a45b813..a521818 100644
---
a/spark-tsfile/src/test/scala/org/apache/iotdb/spark/tool/TsFileWriteTool.java
+++
b/spark-tsfile/src/test/scala/org/apache/iotdb/spark/tool/TsFileWriteTool.java
@@ -22,8 +22,8 @@ import java.io.File;
import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
-import org.apache.iotdb.tsfile.utils.Binary;
import org.apache.iotdb.tsfile.read.common.Path;
+import org.apache.iotdb.tsfile.utils.Binary;
import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.BooleanDataPoint;
@@ -31,12 +31,10 @@ import
org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
import org.apache.iotdb.tsfile.write.record.datapoint.FloatDataPoint;
import org.apache.iotdb.tsfile.write.record.datapoint.IntDataPoint;
import org.apache.iotdb.tsfile.write.record.datapoint.StringDataPoint;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.Schema;
+import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
-/**
- * An example of writing data to TsFile
- */
+/** An example of writing data to TsFile */
public class TsFileWriteTool {
public static int largeNum = 1024 * 1024;
@@ -49,9 +47,14 @@ public class TsFileWriteTool {
}
Schema schema = new Schema();
- schema.extendTemplate(DEFAULT_TEMPLATE, new
UnaryMeasurementSchema("sensor_1", TSDataType.FLOAT, TSEncoding.RLE));
- schema.extendTemplate(DEFAULT_TEMPLATE, new
UnaryMeasurementSchema("sensor_2", TSDataType.INT32, TSEncoding.TS_2DIFF));
- schema.extendTemplate(DEFAULT_TEMPLATE, new
UnaryMeasurementSchema("sensor_3", TSDataType.INT32, TSEncoding.TS_2DIFF));
+ schema.extendTemplate(
+ DEFAULT_TEMPLATE, new UnaryMeasurementSchema("sensor_1",
TSDataType.FLOAT, TSEncoding.RLE));
+ schema.extendTemplate(
+ DEFAULT_TEMPLATE,
+ new UnaryMeasurementSchema("sensor_2", TSDataType.INT32,
TSEncoding.TS_2DIFF));
+ schema.extendTemplate(
+ DEFAULT_TEMPLATE,
+ new UnaryMeasurementSchema("sensor_3", TSDataType.INT32,
TSEncoding.TS_2DIFF));
TsFileWriter tsFileWriter = new TsFileWriter(f, schema);
@@ -146,8 +149,9 @@ public class TsFileWriteTool {
TsFileWriter tsFileWriter = new TsFileWriter(f);
// add measurements into file schema
- tsFileWriter.registerTimeseries(new Path("device_1","sensor_1"),
- new UnaryMeasurementSchema("sensor_1", TSDataType.FLOAT,
TSEncoding.RLE));
+ tsFileWriter.registerTimeseries(
+ new Path("device_1"),
+ new UnaryMeasurementSchema("sensor_1", TSDataType.FLOAT,
TSEncoding.RLE));
for (long i = 0; i < largeNum; i++) {
// construct TSRecord
TSRecord tsRecord = new TSRecord(i, "device_1");
@@ -170,12 +174,12 @@ public class TsFileWriteTool {
// add measurements into file schema
// NOTE the measurments here are different from those defined in create1
and
// create2 function, despite their names are the same.
- tsFileWriter
- .registerTimeseries(new Path("device_1","sensor_1"),
- new UnaryMeasurementSchema("sensor_1", TSDataType.BOOLEAN,
TSEncoding.RLE));
- tsFileWriter
- .registerTimeseries(new Path("device_1","sensor_2"),
- new UnaryMeasurementSchema("sensor_2", TSDataType.TEXT,
TSEncoding.PLAIN));
+ tsFileWriter.registerTimeseries(
+ new Path("device_1"),
+ new UnaryMeasurementSchema("sensor_1", TSDataType.BOOLEAN,
TSEncoding.RLE));
+ tsFileWriter.registerTimeseries(
+ new Path("device_1"),
+ new UnaryMeasurementSchema("sensor_2", TSDataType.TEXT,
TSEncoding.PLAIN));
// construct TSRecord
TSRecord tsRecord = new TSRecord(1, "device_1");
@@ -218,22 +222,19 @@ public class TsFileWriteTool {
}
/**
- * Create a tsfile that contains data from device_1 and device_2;
- * device_1's chunkgroups and device_2's chunkgroups are interleaved.
- *
- * Below is the created tsfile's statistics in one case. Note that the
absolute values may change
- * under different tsfile versions or hardware environments.
+ * Create a tsfile that contains data from device_1 and device_2; device_1's
chunkgroups and
+ * device_2's chunkgroups are interleaved.
*
- * | space pos | device.chunkgroup | time range of this
chunkgroup |
- * | [12,290545] | device_1.chunkgroup_1 | [0,131044]
|
- * | [290545,1042103] | device_2.chunkgroup_1 | [0,262088]
|
- * | [1042103,1345041] | device_1.chunkgroup_2 | [131045,254915]
|
- * | [1345041,2110092] | device_2.chunkgroup_2 | [262090,509830]
|
- * | [2110092,2421676] | device_1.chunkgroup_3 | [254916,376146]
|
- * | [2421676,3194704] | device_2.chunkgroup_3 | [509832,752292]
|
- * | [3194704,3256098] | device_1.chunkgroup_4 | [376147,399999]
|
- * | [3256098,3410323] | device_2.chunkgroup_4 | [752294,799998]
|
+ * <p>Below is the created tsfile's statistics in one case. Note that the
absolute values may
+ * change under different tsfile versions or hardware environments.
*
+ * <p>| space pos | device.chunkgroup | time range of this chunkgroup | |
[12,290545] |
+ * device_1.chunkgroup_1 | [0,131044] | | [290545,1042103] |
device_2.chunkgroup_1 | [0,262088] |
+ * | [1042103,1345041] | device_1.chunkgroup_2 | [131045,254915] | |
[1345041,2110092] |
+ * device_2.chunkgroup_2 | [262090,509830] | | [2110092,2421676] |
device_1.chunkgroup_3 |
+ * [254916,376146] | | [2421676,3194704] | device_2.chunkgroup_3 |
[509832,752292] | |
+ * [3194704,3256098] | device_1.chunkgroup_4 | [376147,399999] | |
[3256098,3410323] |
+ * device_2.chunkgroup_4 | [752294,799998] |
*/
public void create4(String tsfilePath) throws Exception {
TSFileDescriptor.getInstance().getConfig().setGroupSizeInByte(1024 * 1024);
@@ -243,18 +244,18 @@ public class TsFileWriteTool {
}
TsFileWriter tsFileWriter = new TsFileWriter(f);
- tsFileWriter
- .registerTimeseries(new Path("device_1","sensor_1"),
- new UnaryMeasurementSchema("sensor_1", TSDataType.INT32,
TSEncoding.RLE));
- tsFileWriter
- .registerTimeseries(new Path("device_2","sensor_1"),
- new UnaryMeasurementSchema("sensor_1", TSDataType.INT32,
TSEncoding.RLE));
- tsFileWriter
- .registerTimeseries(new Path("device_2","sensor_2"),
- new UnaryMeasurementSchema("sensor_2", TSDataType.FLOAT,
TSEncoding.RLE));
- tsFileWriter
- .registerTimeseries(new Path("device_2","sensor_3"),
- new UnaryMeasurementSchema("sensor_3", TSDataType.BOOLEAN,
TSEncoding.RLE));
+ tsFileWriter.registerTimeseries(
+ new Path("device_1"),
+ new UnaryMeasurementSchema("sensor_1", TSDataType.INT32,
TSEncoding.RLE));
+ tsFileWriter.registerTimeseries(
+ new Path("device_2"),
+ new UnaryMeasurementSchema("sensor_1", TSDataType.INT32,
TSEncoding.RLE));
+ tsFileWriter.registerTimeseries(
+ new Path("device_2"),
+ new UnaryMeasurementSchema("sensor_2", TSDataType.FLOAT,
TSEncoding.RLE));
+ tsFileWriter.registerTimeseries(
+ new Path("device_2"),
+ new UnaryMeasurementSchema("sensor_3", TSDataType.BOOLEAN,
TSEncoding.RLE));
int j = 0;
for (int i = 0; i < 400000; i++) {
@@ -276,4 +277,4 @@ public class TsFileWriteTool {
tsFileWriter.close();
}
-}
\ No newline at end of file
+}
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/schema/converter/SchemaBuilderTest.java
b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/schema/converter/SchemaBuilderTest.java
index 2f3a10a..a285c87 100644
---
a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/schema/converter/SchemaBuilderTest.java
+++
b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/schema/converter/SchemaBuilderTest.java
@@ -46,11 +46,11 @@ public class SchemaBuilderTest {
props.put(JsonFormatConstant.MAX_POINT_NUMBER, "3");
Schema schema = new Schema();
schema.registerTimeseries(
- new Path("d1", "s4"),
+ new Path("d1"),
new UnaryMeasurementSchema(
"s4", TSDataType.DOUBLE, TSEncoding.RLE, CompressionType.SNAPPY,
props));
schema.registerTimeseries(
- new Path("d1", "s5"),
+ new Path("d1"),
new UnaryMeasurementSchema(
"s5", TSDataType.INT32, TSEncoding.TS_2DIFF,
CompressionType.UNCOMPRESSED, null));
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
