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/11/23 05:49:07 UTC
[iotdb] branch MeasurementSchema created (now 39939d7)
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch MeasurementSchema
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
at 39939d7 Change UnaryMeasurementSchema back to MeasurementSchema
This branch includes the following new commits:
new 39939d7 Change UnaryMeasurementSchema back to MeasurementSchema
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[iotdb] 01/01: Change UnaryMeasurementSchema back to MeasurementSchema
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch MeasurementSchema
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 39939d7a5518ca7665325fcfe75e24d8281496b3
Author: JackieTien97 <Ja...@foxmail.com>
AuthorDate: Tue Nov 23 13:48:23 2021 +0800
Change UnaryMeasurementSchema back to MeasurementSchema
---
.../java/org/apache/iotdb/cluster/ClientMain.java | 4 +-
.../apache/iotdb/cluster/metadata/MetaPuller.java | 4 +-
.../caller/PullMeasurementSchemaHandler.java | 4 +-
.../iotdb/cluster/utils/ClusterQueryUtils.java | 5 +--
.../cluster/client/sync/SyncClientAdaptorTest.java | 4 +-
.../org/apache/iotdb/cluster/common/IoTDBTest.java | 5 +--
.../org/apache/iotdb/cluster/common/TestUtils.java | 8 ++--
.../apache/iotdb/flink/FlinkTsFileBatchSink.java | 11 ++---
.../apache/iotdb/flink/FlinkTsFileStreamSink.java | 11 ++---
.../java/org/apache/iotdb/flink/TsFileUtils.java | 9 ++--
.../iotdb/hadoop/tsfile/TSMRWriteExample.java | 6 +--
.../apache/iotdb/hadoop/tsfile/TsFileHelper.java | 10 ++---
.../iotdb/hadoop/tsfile/TsFileWriteToHDFS.java | 8 ++--
.../iotdb/AlignedTimeseriesSessionExample.java | 26 +++++------
.../org/apache/iotdb/DataMigrationExample.java | 4 +-
.../iotdb/HybridTimeseriesSessionExample.java | 6 +--
.../org/apache/iotdb/SessionConcurrentExample.java | 8 ++--
.../main/java/org/apache/iotdb/SessionExample.java | 20 ++++-----
.../main/java/org/apache/iotdb/TabletExample.java | 4 +-
.../iotdb/tsfile/TsFileForceAppendWrite.java | 14 +++---
.../tsfile/TsFileWriteAlignedWithTSRecord.java | 10 ++---
.../iotdb/tsfile/TsFileWriteAlignedWithTablet.java | 18 ++++----
.../iotdb/tsfile/TsFileWriteWithTSRecord.java | 10 ++---
.../apache/iotdb/tsfile/TsFileWriteWithTablet.java | 10 ++---
.../tsfile/RowTsFileOutputFormatTestBase.java | 10 ++---
.../apache/iotdb/flink/util/TsFileWriteUtil.java | 18 +++-----
.../iotdb/hadoop/tsfile/TsFileTestHelper.java | 6 +--
.../org/apache/iotdb/hive/TsFileTestHelper.java | 6 +--
.../iotdb/db/metadata/logfile/MLogWriter.java | 4 +-
.../org/apache/iotdb/db/metadata/mtree/MTree.java | 6 +--
.../iotdb/db/metadata/path/MeasurementPath.java | 4 +-
.../iotdb/db/metadata/template/Template.java | 13 +++---
.../iotdb/db/qp/physical/crud/InsertRowPlan.java | 4 +-
.../db/qp/physical/sys/MeasurementMNodePlan.java | 4 +-
.../apache/iotdb/db/tools/TsFileRewriteTool.java | 18 ++++----
.../db/tools/upgrade/TsFileOnlineUpgradeTool.java | 10 ++---
.../org/apache/iotdb/db/utils/SchemaUtils.java | 4 +-
.../db/engine/cache/BloomFilterCacheTest.java | 8 ++--
.../iotdb/db/engine/cache/ChunkCacheTest.java | 12 ++---
.../engine/compaction/cross/MergeOverLapTest.java | 4 +-
.../db/engine/compaction/cross/MergeTaskTest.java | 4 +-
.../db/engine/compaction/cross/MergeTest.java | 12 ++---
.../engine/compaction/cross/MergeUpgradeTest.java | 11 ++---
.../inner/InnerCompactionMoreDataTest.java | 10 ++---
.../compaction/inner/InnerCompactionTest.java | 12 ++---
.../SizeTieredCompactionRecoverTest.java | 12 ++---
.../inner/sizetiered/SizeTieredCompactionTest.java | 12 ++---
.../utils/CompactionFileGeneratorUtils.java | 6 +--
.../db/engine/memtable/MemTableTestUtils.java | 13 +++---
.../db/engine/memtable/MemtableBenchmark.java | 4 +-
.../db/engine/memtable/PrimitiveMemTableTest.java | 28 ++++++------
.../storagegroup/StorageGroupProcessorTest.java | 20 ++++-----
.../iotdb/db/engine/storagegroup/TTLTest.java | 12 ++---
.../engine/storagegroup/TsFileProcessorTest.java | 10 ++---
...IoTDBLoadExternalTsFileWithTimePartitionIT.java | 4 +-
.../iotdb/db/metadata/MManagerBasicTest.java | 6 +--
.../org/apache/iotdb/db/metadata/TemplateTest.java | 6 +--
.../reader/series/SeriesAggregateReaderTest.java | 4 +-
.../reader/series/SeriesReaderByTimestampTest.java | 4 +-
.../db/query/reader/series/SeriesReaderTest.java | 4 +-
.../query/reader/series/SeriesReaderTestUtil.java | 21 +++++----
.../iotdb/db/rescon/ResourceManagerTest.java | 12 ++---
.../iotdb/db/tools/TsFileAndModSettleToolTest.java | 5 +--
.../iotdb/db/tools/TsFileSketchToolTest.java | 8 ++--
.../iotdb/db/utils/TsFileRewriteToolTest.java | 10 ++---
.../db/writelog/recover/DeviceStringTest.java | 8 ++--
.../iotdb/db/writelog/recover/LogReplayerTest.java | 6 +--
.../recover/RecoverResourceFromReaderTest.java | 12 ++---
.../db/writelog/recover/SeqTsFileRecoverTest.java | 12 +++--
.../writelog/recover/UnseqTsFileRecoverTest.java | 12 ++---
.../java/org/apache/iotdb/session/Session.java | 4 +-
.../apache/iotdb/session/util/SessionUtils.java | 4 +-
.../iotdb/session/IoTDBSessionComplexIT.java | 20 ++++-----
.../session/IoTDBSessionDisableMemControlIT.java | 14 +++---
.../apache/iotdb/session/IoTDBSessionSimpleIT.java | 48 ++++++++++----------
.../session/IoTDBSessionVectorAggregationIT.java | 6 +--
.../iotdb/session/IoTDBSessionVectorInsertIT.java | 12 ++---
.../apache/iotdb/session/SessionCacheLeaderUT.java | 20 ++++-----
.../java/org/apache/iotdb/session/SessionTest.java | 12 ++---
.../iotdb/spark/tsfile/NarrowConverter.scala | 6 +--
.../apache/iotdb/spark/tsfile/WideConverter.scala | 6 +--
.../org/apache/iotdb/spark/tool/TsFileExample.java | 10 ++---
.../apache/iotdb/spark/tool/TsFileWriteTool.java | 22 ++++-----
.../iotdb/tsfile/read/TsFileSequenceReader.java | 4 +-
.../iotdb/tsfile/utils/MeasurementGroup.java | 15 +++----
.../apache/iotdb/tsfile/write/TsFileWriter.java | 18 ++++----
...asurementSchema.java => MeasurementSchema.java} | 32 ++++++-------
.../apache/iotdb/tsfile/write/schema/Schema.java | 6 +--
.../tsfile/file/metadata/utils/TestHelper.java | 6 +--
.../apache/iotdb/tsfile/read/TsFileReaderTest.java | 4 +-
.../read/query/timegenerator/ReadWriteTest.java | 8 ++--
.../timegenerator/TimeGeneratorReadEmptyTest.java | 6 +--
.../timegenerator/TimeGeneratorReadWriteTest.java | 6 +--
.../TsFileGeneratorForSeriesReaderByTimestamp.java | 26 +++++------
.../apache/iotdb/tsfile/utils/FileGenerator.java | 28 ++++++------
.../apache/iotdb/tsfile/utils/RecordUtilsTest.java | 18 +++-----
.../iotdb/tsfile/utils/TsFileGeneratorForTest.java | 47 ++++++++++---------
.../tsfile/write/DefaultSchemaTemplateTest.java | 10 ++---
.../tsfile/write/MetadataIndexConstructorTest.java | 10 ++---
.../org/apache/iotdb/tsfile/write/PerfTest.java | 24 ++++------
.../iotdb/tsfile/write/ReadPageInMemTest.java | 26 ++++-------
...SameMeasurementsWithDifferentDataTypesTest.java | 12 ++---
.../iotdb/tsfile/write/TsFileIOWriterTest.java | 12 ++---
.../iotdb/tsfile/write/TsFileReadWriteTest.java | 8 ++--
.../iotdb/tsfile/write/TsFileWriteApiTest.java | 40 ++++++++---------
.../iotdb/tsfile/write/TsFileWriterTest.java | 42 ++++++++---------
.../org/apache/iotdb/tsfile/write/WriteTest.java | 16 +++----
.../write/schema/converter/SchemaBuilderTest.java | 20 ++++-----
.../write/writer/ForceAppendTsFileWriterTest.java | 10 ++---
.../writer/MeasurementSchemaSerializeTest.java | 14 +++---
.../iotdb/tsfile/write/writer/PageWriterTest.java | 14 +++---
.../write/writer/RestorableTsFileIOWriterTest.java | 52 +++++++++++-----------
112 files changed, 649 insertions(+), 719 deletions(-)
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/ClientMain.java b/cluster/src/main/java/org/apache/iotdb/cluster/ClientMain.java
index 28b0a3f..e3a13db 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/ClientMain.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/ClientMain.java
@@ -42,7 +42,7 @@ import org.apache.iotdb.service.rpc.thrift.TSStatus;
import org.apache.iotdb.session.SessionDataSet;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
@@ -291,7 +291,7 @@ public class ClientMain {
for (int i = 0; i < MEASUREMENTS.length; i++) {
String measurement = MEASUREMENTS[i];
schemas.add(
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
device + IoTDBConstant.PATH_SEPARATOR + measurement, DATA_TYPES[i]));
}
}
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/metadata/MetaPuller.java b/cluster/src/main/java/org/apache/iotdb/cluster/metadata/MetaPuller.java
index ce58c08..31d8e8d 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/metadata/MetaPuller.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/metadata/MetaPuller.java
@@ -40,8 +40,8 @@ import org.apache.iotdb.db.qp.constant.SQLConstant;
import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.SchemaUtils;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.TimeseriesSchema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.VectorMeasurementSchema;
import org.apache.thrift.TException;
@@ -247,7 +247,7 @@ public class MetaPuller {
for (int i = 0; i < size; i++) {
schemas.add(
buffer.get() == 0
- ? UnaryMeasurementSchema.partialDeserializeFrom(buffer)
+ ? MeasurementSchema.partialDeserializeFrom(buffer)
: VectorMeasurementSchema.partialDeserializeFrom(buffer));
}
} catch (TException e) {
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/server/handlers/caller/PullMeasurementSchemaHandler.java b/cluster/src/main/java/org/apache/iotdb/cluster/server/handlers/caller/PullMeasurementSchemaHandler.java
index cd4ae77..c456ef5 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/server/handlers/caller/PullMeasurementSchemaHandler.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/server/handlers/caller/PullMeasurementSchemaHandler.java
@@ -22,7 +22,7 @@ package org.apache.iotdb.cluster.server.handlers.caller;
import org.apache.iotdb.cluster.rpc.thrift.Node;
import org.apache.iotdb.cluster.rpc.thrift.PullSchemaResp;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.VectorMeasurementSchema;
import org.apache.thrift.async.AsyncMethodCallback;
@@ -59,7 +59,7 @@ public class PullMeasurementSchemaHandler implements AsyncMethodCallback<PullSch
for (int i = 0; i < size; i++) {
schemas.add(
buffer.get() == 0
- ? UnaryMeasurementSchema.partialDeserializeFrom(buffer)
+ ? MeasurementSchema.partialDeserializeFrom(buffer)
: VectorMeasurementSchema.partialDeserializeFrom(buffer));
}
synchronized (timeseriesSchemas) {
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/utils/ClusterQueryUtils.java b/cluster/src/main/java/org/apache/iotdb/cluster/utils/ClusterQueryUtils.java
index 3cec0a8..c33f504 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/utils/ClusterQueryUtils.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/utils/ClusterQueryUtils.java
@@ -28,7 +28,7 @@ import org.apache.iotdb.db.metadata.path.PartialPath;
import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.read.common.Path;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -74,8 +74,7 @@ public class ClusterQueryUtils {
try {
MeasurementPath matchedPath = new MeasurementPath(pathString);
matchedPath.setMeasurementSchema(
- new UnaryMeasurementSchema(
- matchedPath.getMeasurement(), TSDataType.deserialize(dataType)));
+ new MeasurementSchema(matchedPath.getMeasurement(), TSDataType.deserialize(dataType)));
return matchedPath;
} catch (IllegalPathException e) {
logger.error("Failed to create partial path, fullPath is {}.", pathString, e);
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/client/sync/SyncClientAdaptorTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/client/sync/SyncClientAdaptorTest.java
index 1247c4c..8969601 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/client/sync/SyncClientAdaptorTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/client/sync/SyncClientAdaptorTest.java
@@ -52,8 +52,8 @@ import org.apache.iotdb.db.query.context.QueryContext;
import org.apache.iotdb.service.rpc.thrift.TSStatus;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.TimeseriesSchema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import org.apache.thrift.TException;
import org.apache.thrift.async.AsyncMethodCallback;
@@ -113,7 +113,7 @@ public class SyncClientAdaptorTest {
snapshotMap = new HashMap<>();
for (int i = 0; i < 3; i++) {
snapshotMap.put(i, new SimpleSnapshot(i, i));
- measurementSchemas.add(new UnaryMeasurementSchema(String.valueOf(i), TSDataType.INT64));
+ measurementSchemas.add(new MeasurementSchema(String.valueOf(i), TSDataType.INT64));
timeseriesSchemas.add(new TimeseriesSchema(String.valueOf(i), TSDataType.INT64));
}
lastResult = ByteBuffer.wrap("last".getBytes());
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/common/IoTDBTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/common/IoTDBTest.java
index cabf0d9..78e31d4 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/common/IoTDBTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/common/IoTDBTest.java
@@ -44,7 +44,7 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.read.expression.IExpression;
import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
@@ -165,8 +165,7 @@ public abstract class IoTDBTest {
List<PartialPath> paths = new ArrayList<>();
for (String pathStr : pathStrs) {
MeasurementPath path = new MeasurementPath(pathStr);
- path.setMeasurementSchema(
- new UnaryMeasurementSchema(path.getMeasurement(), TSDataType.DOUBLE));
+ path.setMeasurementSchema(new MeasurementSchema(path.getMeasurement(), TSDataType.DOUBLE));
paths.add(path);
}
queryPlan.setDeduplicatedPathsAndUpdate(paths);
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 25c2f17..93fa281 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
@@ -56,8 +56,8 @@ import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.TimeseriesSchema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import java.io.File;
import java.io.IOException;
@@ -210,7 +210,7 @@ public class TestUtils {
public static IMeasurementSchema getTestMeasurementSchema(int seriesNum) {
TSDataType dataType = TSDataType.DOUBLE;
TSEncoding encoding = IoTDBDescriptor.getInstance().getConfig().getDefaultDoubleEncoding();
- return new UnaryMeasurementSchema(
+ return new MeasurementSchema(
TestUtils.getTestMeasurement(seriesNum),
dataType,
encoding,
@@ -222,7 +222,7 @@ public class TestUtils {
TSDataType dataType = TSDataType.DOUBLE;
TSEncoding encoding = IoTDBDescriptor.getInstance().getConfig().getDefaultDoubleEncoding();
IMeasurementSchema measurementSchema =
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
TestUtils.getTestMeasurement(seriesNum),
dataType,
encoding,
@@ -407,7 +407,7 @@ public class TestUtils {
file.getParentFile().mkdirs();
try (TsFileWriter writer = new TsFileWriter(file)) {
for (int k = 0; k < seriesNum; k++) {
- UnaryMeasurementSchema schema = (UnaryMeasurementSchema) getTestMeasurementSchema(k);
+ MeasurementSchema schema = (MeasurementSchema) getTestMeasurementSchema(k);
writer.registerTimeseries(new Path(getTestSg(sgNum)), schema);
}
diff --git a/example/flink/src/main/java/org/apache/iotdb/flink/FlinkTsFileBatchSink.java b/example/flink/src/main/java/org/apache/iotdb/flink/FlinkTsFileBatchSink.java
index bd657d7..9e81019 100644
--- a/example/flink/src/main/java/org/apache/iotdb/flink/FlinkTsFileBatchSink.java
+++ b/example/flink/src/main/java/org/apache/iotdb/flink/FlinkTsFileBatchSink.java
@@ -23,8 +23,8 @@ import org.apache.iotdb.tsfile.common.constant.QueryConstant;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
import org.apache.iotdb.tsfile.read.common.Path;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.Schema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.api.common.typeinfo.Types;
@@ -64,14 +64,11 @@ public class FlinkTsFileBatchSink {
RowTypeInfo rowTypeInfo = new RowTypeInfo(typeInformations, filedNames);
Schema schema = new Schema();
schema.extendTemplate(
- DEFAULT_TEMPLATE,
- new UnaryMeasurementSchema("sensor_1", TSDataType.INT64, TSEncoding.TS_2DIFF));
+ DEFAULT_TEMPLATE, new MeasurementSchema("sensor_1", TSDataType.INT64, TSEncoding.TS_2DIFF));
schema.extendTemplate(
- DEFAULT_TEMPLATE,
- new UnaryMeasurementSchema("sensor_2", TSDataType.INT64, TSEncoding.TS_2DIFF));
+ DEFAULT_TEMPLATE, new MeasurementSchema("sensor_2", TSDataType.INT64, TSEncoding.TS_2DIFF));
schema.extendTemplate(
- DEFAULT_TEMPLATE,
- new UnaryMeasurementSchema("sensor_3", TSDataType.INT64, TSEncoding.TS_2DIFF));
+ DEFAULT_TEMPLATE, new MeasurementSchema("sensor_3", TSDataType.INT64, TSEncoding.TS_2DIFF));
RowTSRecordConverter converter = new RowTSRecordConverter(rowTypeInfo);
TSRecordOutputFormat<Row> outputFormat = new TSRecordOutputFormat<>(schema, converter);
diff --git a/example/flink/src/main/java/org/apache/iotdb/flink/FlinkTsFileStreamSink.java b/example/flink/src/main/java/org/apache/iotdb/flink/FlinkTsFileStreamSink.java
index 6e4a3d9..c714792 100644
--- a/example/flink/src/main/java/org/apache/iotdb/flink/FlinkTsFileStreamSink.java
+++ b/example/flink/src/main/java/org/apache/iotdb/flink/FlinkTsFileStreamSink.java
@@ -23,8 +23,8 @@ import org.apache.iotdb.tsfile.common.constant.QueryConstant;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
import org.apache.iotdb.tsfile.read.common.Path;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.Schema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.api.common.typeinfo.Types;
@@ -64,14 +64,11 @@ public class FlinkTsFileStreamSink {
RowTypeInfo rowTypeInfo = new RowTypeInfo(typeInformations, filedNames);
Schema schema = new Schema();
schema.extendTemplate(
- DEFAULT_TEMPLATE,
- new UnaryMeasurementSchema("sensor_1", TSDataType.INT64, TSEncoding.TS_2DIFF));
+ DEFAULT_TEMPLATE, new MeasurementSchema("sensor_1", TSDataType.INT64, TSEncoding.TS_2DIFF));
schema.extendTemplate(
- DEFAULT_TEMPLATE,
- new UnaryMeasurementSchema("sensor_2", TSDataType.INT64, TSEncoding.TS_2DIFF));
+ DEFAULT_TEMPLATE, new MeasurementSchema("sensor_2", TSDataType.INT64, TSEncoding.TS_2DIFF));
schema.extendTemplate(
- DEFAULT_TEMPLATE,
- new UnaryMeasurementSchema("sensor_3", TSDataType.INT64, TSEncoding.TS_2DIFF));
+ DEFAULT_TEMPLATE, new MeasurementSchema("sensor_3", TSDataType.INT64, TSEncoding.TS_2DIFF));
RowTSRecordConverter converter = new RowTSRecordConverter(rowTypeInfo);
TSRecordOutputFormat<Row> outputFormat = new TSRecordOutputFormat<>(schema, converter);
outputFormat.setOutputFilePath(new org.apache.flink.core.fs.Path(path));
diff --git a/example/flink/src/main/java/org/apache/iotdb/flink/TsFileUtils.java b/example/flink/src/main/java/org/apache/iotdb/flink/TsFileUtils.java
index 8218583..2df95ad 100644
--- a/example/flink/src/main/java/org/apache/iotdb/flink/TsFileUtils.java
+++ b/example/flink/src/main/java/org/apache/iotdb/flink/TsFileUtils.java
@@ -30,8 +30,8 @@ import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
import org.apache.iotdb.tsfile.write.record.datapoint.LongDataPoint;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.Schema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -57,14 +57,13 @@ public class TsFileUtils {
Files.delete(f.toPath());
Schema schema = new Schema();
schema.extendTemplate(
- DEFAULT_TEMPLATE,
- new UnaryMeasurementSchema("sensor_1", TSDataType.FLOAT, TSEncoding.RLE));
+ DEFAULT_TEMPLATE, new MeasurementSchema("sensor_1", TSDataType.FLOAT, TSEncoding.RLE));
schema.extendTemplate(
DEFAULT_TEMPLATE,
- new UnaryMeasurementSchema("sensor_2", TSDataType.INT32, TSEncoding.TS_2DIFF));
+ new MeasurementSchema("sensor_2", TSDataType.INT32, TSEncoding.TS_2DIFF));
schema.extendTemplate(
DEFAULT_TEMPLATE,
- new UnaryMeasurementSchema("sensor_3", TSDataType.INT32, TSEncoding.TS_2DIFF));
+ new MeasurementSchema("sensor_3", TSDataType.INT32, TSEncoding.TS_2DIFF));
try (TsFileWriter tsFileWriter = new TsFileWriter(f, schema)) {
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 d67c604..9a88de8 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
@@ -24,8 +24,8 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
import org.apache.iotdb.tsfile.write.record.datapoint.DoubleDataPoint;
import org.apache.iotdb.tsfile.write.record.datapoint.LongDataPoint;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.Schema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
@@ -60,14 +60,14 @@ public class TSMRWriteExample {
for (int i = 0; i < 2; i++) {
schema.registerTimeseries(
new org.apache.iotdb.tsfile.read.common.Path(Constant.DEVICE_1),
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
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),
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
Constant.SENSOR_PREFIX + (i + 1), TSDataType.DOUBLE, TSEncoding.TS_2DIFF));
}
TSFOutputFormat.setSchema(schema);
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 95f5aaa..baef0c0 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
@@ -25,8 +25,8 @@ import org.apache.iotdb.tsfile.read.common.Path;
import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.Tablet;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.Schema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -65,16 +65,16 @@ public class TsFileHelper {
// add measurements into file schema (all with INT64 data type)
for (int i = 0; i < 2; i++) {
- UnaryMeasurementSchema measurementSchema =
- new UnaryMeasurementSchema(
+ MeasurementSchema measurementSchema =
+ new MeasurementSchema(
Constant.SENSOR_PREFIX + (i + 1), TSDataType.INT64, TSEncoding.TS_2DIFF);
schema.registerTimeseries(new Path(Constant.DEVICE_1), measurementSchema);
schemaList.add(measurementSchema);
}
for (int i = 2; i < sensorNum; i++) {
- UnaryMeasurementSchema measurementSchema =
- new UnaryMeasurementSchema(
+ MeasurementSchema measurementSchema =
+ new MeasurementSchema(
Constant.SENSOR_PREFIX + (i + 1), TSDataType.DOUBLE, TSEncoding.TS_2DIFF);
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 140bbca..52e7fc6 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
@@ -30,7 +30,7 @@ import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
import org.apache.iotdb.tsfile.write.record.datapoint.LongDataPoint;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -50,13 +50,13 @@ public class TsFileWriteToHDFS {
try (TsFileWriter tsFileWriter = new TsFileWriter(f)) {
tsFileWriter.registerTimeseries(
new Path(Constant.DEVICE_1),
- new UnaryMeasurementSchema(Constant.SENSOR_1, TSDataType.INT64, TSEncoding.RLE));
+ new MeasurementSchema(Constant.SENSOR_1, TSDataType.INT64, TSEncoding.RLE));
tsFileWriter.registerTimeseries(
new Path(Constant.DEVICE_1),
- new UnaryMeasurementSchema(Constant.SENSOR_2, TSDataType.INT64, TSEncoding.RLE));
+ new MeasurementSchema(Constant.SENSOR_2, TSDataType.INT64, TSEncoding.RLE));
tsFileWriter.registerTimeseries(
new Path(Constant.DEVICE_1),
- new UnaryMeasurementSchema(Constant.SENSOR_3, TSDataType.INT64, TSEncoding.RLE));
+ new MeasurementSchema(Constant.SENSOR_3, TSDataType.INT64, TSEncoding.RLE));
// construct TSRecord
for (int i = 0; i < 100; i++) {
diff --git a/example/session/src/main/java/org/apache/iotdb/AlignedTimeseriesSessionExample.java b/example/session/src/main/java/org/apache/iotdb/AlignedTimeseriesSessionExample.java
index 17c16e2..4679ed5 100644
--- a/example/session/src/main/java/org/apache/iotdb/AlignedTimeseriesSessionExample.java
+++ b/example/session/src/main/java/org/apache/iotdb/AlignedTimeseriesSessionExample.java
@@ -32,7 +32,7 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
import org.apache.iotdb.tsfile.utils.BitMap;
import org.apache.iotdb.tsfile.write.record.Tablet;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import java.io.IOException;
import java.security.SecureRandom;
@@ -300,8 +300,8 @@ public class AlignedTimeseriesSessionExample {
// The schema of measurements of one device
// only measurementId and data type in MeasurementSchema take effects in Tablet
List<IMeasurementSchema> schemaList = new ArrayList<>();
- schemaList.add(new UnaryMeasurementSchema("s1", TSDataType.INT64));
- schemaList.add(new UnaryMeasurementSchema("s2", TSDataType.INT32));
+ schemaList.add(new MeasurementSchema("s1", TSDataType.INT64));
+ schemaList.add(new MeasurementSchema("s2", TSDataType.INT32));
Tablet tablet = new Tablet(ROOT_SG1_D1, schemaList);
tablet.setAligned(true);
@@ -335,8 +335,8 @@ public class AlignedTimeseriesSessionExample {
// The schema of measurements of one device
// only measurementId and data type in MeasurementSchema take effects in Tablet
List<IMeasurementSchema> schemaList = new ArrayList<>();
- schemaList.add(new UnaryMeasurementSchema("s1", TSDataType.INT64));
- schemaList.add(new UnaryMeasurementSchema("s2", TSDataType.INT32));
+ schemaList.add(new MeasurementSchema("s1", TSDataType.INT64));
+ schemaList.add(new MeasurementSchema("s2", TSDataType.INT32));
Tablet tablet = new Tablet(ROOT_SG1_D1_VECTOR2, schemaList);
tablet.setAligned(true);
@@ -372,8 +372,8 @@ public class AlignedTimeseriesSessionExample {
// The schema of measurements of one device
// only measurementId and data type in MeasurementSchema take effects in Tablet
List<IMeasurementSchema> schemaList = new ArrayList<>();
- schemaList.add(new UnaryMeasurementSchema("s1", TSDataType.INT64));
- schemaList.add(new UnaryMeasurementSchema("s2", TSDataType.INT32));
+ schemaList.add(new MeasurementSchema("s1", TSDataType.INT64));
+ schemaList.add(new MeasurementSchema("s2", TSDataType.INT32));
Tablet tablet = new Tablet(ROOT_SG1_D1_VECTOR3, schemaList);
tablet.setAligned(true);
@@ -546,16 +546,16 @@ public class AlignedTimeseriesSessionExample {
throws IoTDBConnectionException, StatementExecutionException {
List<IMeasurementSchema> schemaList1 = new ArrayList<>();
- schemaList1.add(new UnaryMeasurementSchema("s1", TSDataType.INT64));
- schemaList1.add(new UnaryMeasurementSchema("s2", TSDataType.INT64));
+ schemaList1.add(new MeasurementSchema("s1", TSDataType.INT64));
+ schemaList1.add(new MeasurementSchema("s2", TSDataType.INT64));
List<IMeasurementSchema> schemaList2 = new ArrayList<>();
- schemaList1.add(new UnaryMeasurementSchema("s1", TSDataType.INT64));
- schemaList1.add(new UnaryMeasurementSchema("s2", TSDataType.INT64));
+ schemaList1.add(new MeasurementSchema("s1", TSDataType.INT64));
+ schemaList1.add(new MeasurementSchema("s2", TSDataType.INT64));
List<IMeasurementSchema> schemaList3 = new ArrayList<>();
- schemaList1.add(new UnaryMeasurementSchema("s1", TSDataType.INT64));
- schemaList1.add(new UnaryMeasurementSchema("s2", TSDataType.INT64));
+ schemaList1.add(new MeasurementSchema("s1", TSDataType.INT64));
+ schemaList1.add(new MeasurementSchema("s2", TSDataType.INT64));
Tablet tablet1 = new Tablet(ROOT_SG2_D1_VECTOR6, schemaList1, 100);
Tablet tablet2 = new Tablet(ROOT_SG2_D1_VECTOR7, schemaList2, 100);
diff --git a/example/session/src/main/java/org/apache/iotdb/DataMigrationExample.java b/example/session/src/main/java/org/apache/iotdb/DataMigrationExample.java
index 2959f1e..251a36e 100644
--- a/example/session/src/main/java/org/apache/iotdb/DataMigrationExample.java
+++ b/example/session/src/main/java/org/apache/iotdb/DataMigrationExample.java
@@ -28,7 +28,7 @@ import org.apache.iotdb.tsfile.read.common.Path;
import org.apache.iotdb.tsfile.utils.Binary;
import org.apache.iotdb.tsfile.write.record.Tablet;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import java.util.ArrayList;
import java.util.List;
@@ -128,7 +128,7 @@ public class DataMigrationExample {
public Void call() {
List<IMeasurementSchema> schemaList = new ArrayList<>();
- schemaList.add(new UnaryMeasurementSchema(measurement, dataType));
+ schemaList.add(new MeasurementSchema(measurement, dataType));
tablet = new Tablet(device, schemaList, 300000);
SessionDataSetWrapper dataSet = null;
diff --git a/example/session/src/main/java/org/apache/iotdb/HybridTimeseriesSessionExample.java b/example/session/src/main/java/org/apache/iotdb/HybridTimeseriesSessionExample.java
index 7c13681..b8ec1a9 100644
--- a/example/session/src/main/java/org/apache/iotdb/HybridTimeseriesSessionExample.java
+++ b/example/session/src/main/java/org/apache/iotdb/HybridTimeseriesSessionExample.java
@@ -25,7 +25,7 @@ import org.apache.iotdb.session.SessionDataSet;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.write.record.Tablet;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import java.util.ArrayList;
import java.util.List;
@@ -73,8 +73,8 @@ public class HybridTimeseriesSessionExample {
// The schema of measurements of one device
// only measurementId and data type in MeasurementSchema take effects in Tablet
List<IMeasurementSchema> schemaList = new ArrayList<>();
- schemaList.add(new UnaryMeasurementSchema("s1", TSDataType.INT64));
- schemaList.add(new UnaryMeasurementSchema("s2", TSDataType.INT32));
+ schemaList.add(new MeasurementSchema("s1", TSDataType.INT64));
+ schemaList.add(new MeasurementSchema("s2", TSDataType.INT32));
Tablet tablet = new Tablet(ROOT_SG1_D1_VECTOR1, schemaList);
tablet.setAligned(true);
diff --git a/example/session/src/main/java/org/apache/iotdb/SessionConcurrentExample.java b/example/session/src/main/java/org/apache/iotdb/SessionConcurrentExample.java
index 7516c66..7f70ad3 100644
--- a/example/session/src/main/java/org/apache/iotdb/SessionConcurrentExample.java
+++ b/example/session/src/main/java/org/apache/iotdb/SessionConcurrentExample.java
@@ -29,7 +29,7 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
import org.apache.iotdb.tsfile.write.record.Tablet;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import java.io.IOException;
import java.util.ArrayList;
@@ -136,9 +136,9 @@ public class SessionConcurrentExample {
// The schema of measurements of one device
// only measurementId and data type in MeasurementSchema take effects in Tablet
List<IMeasurementSchema> schemaList = new ArrayList<>();
- schemaList.add(new UnaryMeasurementSchema("s1", TSDataType.INT64));
- schemaList.add(new UnaryMeasurementSchema("s2", TSDataType.INT64));
- schemaList.add(new UnaryMeasurementSchema("s3", TSDataType.INT64));
+ schemaList.add(new MeasurementSchema("s1", TSDataType.INT64));
+ schemaList.add(new MeasurementSchema("s2", TSDataType.INT64));
+ schemaList.add(new MeasurementSchema("s3", TSDataType.INT64));
Tablet tablet = new Tablet(deviceId, schemaList, 100);
diff --git a/example/session/src/main/java/org/apache/iotdb/SessionExample.java b/example/session/src/main/java/org/apache/iotdb/SessionExample.java
index 1f1c164..5fc77f6 100644
--- a/example/session/src/main/java/org/apache/iotdb/SessionExample.java
+++ b/example/session/src/main/java/org/apache/iotdb/SessionExample.java
@@ -33,7 +33,7 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
import org.apache.iotdb.tsfile.utils.BitMap;
import org.apache.iotdb.tsfile.write.record.Tablet;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import java.io.IOException;
import java.util.ArrayList;
@@ -374,9 +374,9 @@ public class SessionExample {
// The schema of measurements of one device
// only measurementId and data type in MeasurementSchema take effects in Tablet
List<IMeasurementSchema> schemaList = new ArrayList<>();
- schemaList.add(new UnaryMeasurementSchema("s1", TSDataType.INT64));
- schemaList.add(new UnaryMeasurementSchema("s2", TSDataType.INT64));
- schemaList.add(new UnaryMeasurementSchema("s3", TSDataType.INT64));
+ schemaList.add(new MeasurementSchema("s1", TSDataType.INT64));
+ schemaList.add(new MeasurementSchema("s2", TSDataType.INT64));
+ schemaList.add(new MeasurementSchema("s3", TSDataType.INT64));
Tablet tablet = new Tablet(ROOT_SG1_D1, schemaList, 100);
@@ -438,9 +438,9 @@ public class SessionExample {
// The schema of measurements of one device
// only measurementId and data type in MeasurementSchema take effects in Tablet
List<IMeasurementSchema> schemaList = new ArrayList<>();
- schemaList.add(new UnaryMeasurementSchema("s1", TSDataType.INT64));
- schemaList.add(new UnaryMeasurementSchema("s2", TSDataType.INT64));
- schemaList.add(new UnaryMeasurementSchema("s3", TSDataType.INT64));
+ schemaList.add(new MeasurementSchema("s1", TSDataType.INT64));
+ schemaList.add(new MeasurementSchema("s2", TSDataType.INT64));
+ schemaList.add(new MeasurementSchema("s3", TSDataType.INT64));
Tablet tablet = new Tablet(ROOT_SG1_D1, schemaList, 100);
@@ -510,9 +510,9 @@ public class SessionExample {
// The schema of measurements of one device
// only measurementId and data type in MeasurementSchema take effects in Tablet
List<IMeasurementSchema> schemaList = new ArrayList<>();
- schemaList.add(new UnaryMeasurementSchema("s1", TSDataType.INT64));
- schemaList.add(new UnaryMeasurementSchema("s2", TSDataType.INT64));
- schemaList.add(new UnaryMeasurementSchema("s3", TSDataType.INT64));
+ schemaList.add(new MeasurementSchema("s1", TSDataType.INT64));
+ schemaList.add(new MeasurementSchema("s2", TSDataType.INT64));
+ schemaList.add(new MeasurementSchema("s3", TSDataType.INT64));
Tablet tablet1 = new Tablet(ROOT_SG1_D1, schemaList, 100);
Tablet tablet2 = new Tablet("root.sg1.d2", schemaList, 100);
diff --git a/example/session/src/main/java/org/apache/iotdb/TabletExample.java b/example/session/src/main/java/org/apache/iotdb/TabletExample.java
index 7e23a34..dab79f8 100644
--- a/example/session/src/main/java/org/apache/iotdb/TabletExample.java
+++ b/example/session/src/main/java/org/apache/iotdb/TabletExample.java
@@ -23,7 +23,7 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.utils.Binary;
import org.apache.iotdb.tsfile.write.record.Tablet;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import java.io.BufferedReader;
import java.io.FileReader;
@@ -145,7 +145,7 @@ public class TabletExample {
measureTSTypeInfos.put("s4", TSDataType.INT64);
measureTSTypeInfos.put("s5", TSDataType.TEXT);
List<IMeasurementSchema> schemas = new ArrayList<>();
- measureTSTypeInfos.forEach((mea, type) -> schemas.add(new UnaryMeasurementSchema(mea, type)));
+ measureTSTypeInfos.forEach((mea, type) -> schemas.add(new MeasurementSchema(mea, type)));
System.out.println(
String.format(
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 6fd454b..6499b6c 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
@@ -26,7 +26,7 @@ import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
import org.apache.iotdb.tsfile.write.record.datapoint.LongDataPoint;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.writer.ForceAppendTsFileWriter;
import org.slf4j.Logger;
@@ -52,13 +52,13 @@ public class TsFileForceAppendWrite {
for (int i = 0; i < 4; i++) {
tsFileWriter.registerTimeseries(
new Path(Constant.DEVICE_PREFIX + i),
- new UnaryMeasurementSchema(Constant.SENSOR_1, TSDataType.INT64, TSEncoding.RLE));
+ new MeasurementSchema(Constant.SENSOR_1, TSDataType.INT64, TSEncoding.RLE));
tsFileWriter.registerTimeseries(
new Path(Constant.DEVICE_PREFIX + i),
- new UnaryMeasurementSchema(Constant.SENSOR_2, TSDataType.INT64, TSEncoding.RLE));
+ new MeasurementSchema(Constant.SENSOR_2, TSDataType.INT64, TSEncoding.RLE));
tsFileWriter.registerTimeseries(
new Path(Constant.DEVICE_PREFIX + i),
- new UnaryMeasurementSchema(Constant.SENSOR_3, TSDataType.INT64, TSEncoding.RLE));
+ new MeasurementSchema(Constant.SENSOR_3, TSDataType.INT64, TSEncoding.RLE));
}
// construct TSRecord
@@ -86,13 +86,13 @@ public class TsFileForceAppendWrite {
for (int i = 0; i < 4; i++) {
tsFileWriter1.registerTimeseries(
new Path(Constant.DEVICE_PREFIX + i),
- new UnaryMeasurementSchema(Constant.SENSOR_1, TSDataType.INT64, TSEncoding.RLE));
+ new MeasurementSchema(Constant.SENSOR_1, TSDataType.INT64, TSEncoding.RLE));
tsFileWriter1.registerTimeseries(
new Path(Constant.DEVICE_PREFIX + i),
- new UnaryMeasurementSchema(Constant.SENSOR_2, TSDataType.INT64, TSEncoding.RLE));
+ new MeasurementSchema(Constant.SENSOR_2, TSDataType.INT64, TSEncoding.RLE));
tsFileWriter1.registerTimeseries(
new Path(Constant.DEVICE_PREFIX + i),
- new UnaryMeasurementSchema(Constant.SENSOR_3, TSDataType.INT64, TSEncoding.RLE));
+ new MeasurementSchema(Constant.SENSOR_3, TSDataType.INT64, TSEncoding.RLE));
}
// construct TSRecord
for (int i = 100; i < 120; i++) {
diff --git a/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileWriteAlignedWithTSRecord.java b/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileWriteAlignedWithTSRecord.java
index c4d8b56..a6dd75a 100644
--- a/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileWriteAlignedWithTSRecord.java
+++ b/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileWriteAlignedWithTSRecord.java
@@ -28,7 +28,7 @@ import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
import org.apache.iotdb.tsfile.write.record.datapoint.LongDataPoint;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -48,10 +48,10 @@ public class TsFileWriteAlignedWithTSRecord {
throw new RuntimeException("can not delete " + f.getAbsolutePath());
}
try (TsFileWriter tsFileWriter = new TsFileWriter(f)) {
- List<UnaryMeasurementSchema> measurementSchemas = new ArrayList<>();
- measurementSchemas.add(new UnaryMeasurementSchema("s1", TSDataType.INT64, TSEncoding.RLE));
- measurementSchemas.add(new UnaryMeasurementSchema("s2", TSDataType.INT64, TSEncoding.RLE));
- measurementSchemas.add(new UnaryMeasurementSchema("s3", TSDataType.INT64, TSEncoding.RLE));
+ List<MeasurementSchema> measurementSchemas = new ArrayList<>();
+ measurementSchemas.add(new MeasurementSchema("s1", TSDataType.INT64, TSEncoding.RLE));
+ measurementSchemas.add(new MeasurementSchema("s2", TSDataType.INT64, TSEncoding.RLE));
+ measurementSchemas.add(new MeasurementSchema("s3", TSDataType.INT64, TSEncoding.RLE));
// register timeseries
tsFileWriter.registerAlignedTimeseries(new Path("root.sg.d1"), measurementSchemas);
diff --git a/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileWriteAlignedWithTablet.java b/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileWriteAlignedWithTablet.java
index e1dd6f7..ef0bcd8 100644
--- a/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileWriteAlignedWithTablet.java
+++ b/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileWriteAlignedWithTablet.java
@@ -27,7 +27,7 @@ import org.apache.iotdb.tsfile.utils.Binary;
import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.Tablet;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -47,10 +47,10 @@ public class TsFileWriteAlignedWithTablet {
throw new RuntimeException("can not delete " + f.getAbsolutePath());
}
try (TsFileWriter tsFileWriter = new TsFileWriter(f)) {
- List<UnaryMeasurementSchema> measurementSchemas = new ArrayList<>();
- measurementSchemas.add(new UnaryMeasurementSchema("s1", TSDataType.TEXT, TSEncoding.PLAIN));
- measurementSchemas.add(new UnaryMeasurementSchema("s2", TSDataType.TEXT, TSEncoding.PLAIN));
- measurementSchemas.add(new UnaryMeasurementSchema("s3", TSDataType.TEXT, TSEncoding.PLAIN));
+ List<MeasurementSchema> measurementSchemas = new ArrayList<>();
+ measurementSchemas.add(new MeasurementSchema("s1", TSDataType.TEXT, TSEncoding.PLAIN));
+ measurementSchemas.add(new MeasurementSchema("s2", TSDataType.TEXT, TSEncoding.PLAIN));
+ measurementSchemas.add(new MeasurementSchema("s3", TSDataType.TEXT, TSEncoding.PLAIN));
// register align timeseries
tsFileWriter.registerAlignedTimeseries(new Path(deviceId), measurementSchemas);
@@ -105,13 +105,13 @@ public class TsFileWriteAlignedWithTablet {
throws WriteProcessException, IOException {
// register nonAlign timeseries
tsFileWriter.registerTimeseries(
- new Path("root.sg.d2"), new UnaryMeasurementSchema("s1", TSDataType.INT64, TSEncoding.RLE));
+ new Path("root.sg.d2"), new MeasurementSchema("s1", TSDataType.INT64, TSEncoding.RLE));
tsFileWriter.registerTimeseries(
- new Path("root.sg.d2"), new UnaryMeasurementSchema("s2", TSDataType.INT64, TSEncoding.RLE));
+ new Path("root.sg.d2"), new MeasurementSchema("s2", TSDataType.INT64, TSEncoding.RLE));
// construct Tablet
List<IMeasurementSchema> measurementSchemas = new ArrayList<>();
- measurementSchemas.add(new UnaryMeasurementSchema("s1", TSDataType.INT64, TSEncoding.RLE));
- measurementSchemas.add(new UnaryMeasurementSchema("s2", TSDataType.INT64, TSEncoding.RLE));
+ measurementSchemas.add(new MeasurementSchema("s1", TSDataType.INT64, TSEncoding.RLE));
+ measurementSchemas.add(new MeasurementSchema("s2", TSDataType.INT64, TSEncoding.RLE));
Tablet tablet = new Tablet("root.sg.d2", measurementSchemas);
long[] timestamps = tablet.timestamps;
Object[] values = tablet.values;
diff --git a/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileWriteWithTSRecord.java b/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileWriteWithTSRecord.java
index 2a1ee19..21e7491 100644
--- a/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileWriteWithTSRecord.java
+++ b/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileWriteWithTSRecord.java
@@ -29,7 +29,7 @@ import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
import org.apache.iotdb.tsfile.write.record.datapoint.LongDataPoint;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import java.io.File;
import java.io.IOException;
@@ -52,10 +52,10 @@ public class TsFileWriteWithTSRecord {
}
try (TsFileWriter tsFileWriter = new TsFileWriter(f)) {
- List<UnaryMeasurementSchema> schemas = new ArrayList<>();
- schemas.add(new UnaryMeasurementSchema("s1", TSDataType.INT64, TSEncoding.RLE));
- schemas.add(new UnaryMeasurementSchema("s2", TSDataType.INT64, TSEncoding.RLE));
- schemas.add(new UnaryMeasurementSchema("s3", TSDataType.INT64, TSEncoding.RLE));
+ List<MeasurementSchema> schemas = new ArrayList<>();
+ schemas.add(new MeasurementSchema("s1", TSDataType.INT64, TSEncoding.RLE));
+ schemas.add(new MeasurementSchema("s2", TSDataType.INT64, TSEncoding.RLE));
+ schemas.add(new MeasurementSchema("s3", TSDataType.INT64, TSEncoding.RLE));
// register timeseries
tsFileWriter.registerTimeseries(new Path(deviceId), schemas);
diff --git a/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileWriteWithTablet.java b/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileWriteWithTablet.java
index 95c01bc..4199295 100644
--- a/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileWriteWithTablet.java
+++ b/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileWriteWithTablet.java
@@ -28,7 +28,7 @@ import org.apache.iotdb.tsfile.utils.Binary;
import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.Tablet;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -51,10 +51,10 @@ public class TsFileWriteWithTablet {
throw new RuntimeException("can not delete " + f.getAbsolutePath());
}
try (TsFileWriter tsFileWriter = new TsFileWriter(f)) {
- List<UnaryMeasurementSchema> measurementSchemas = new ArrayList<>();
- measurementSchemas.add(new UnaryMeasurementSchema("s1", TSDataType.TEXT, TSEncoding.PLAIN));
- measurementSchemas.add(new UnaryMeasurementSchema("s2", TSDataType.TEXT, TSEncoding.PLAIN));
- measurementSchemas.add(new UnaryMeasurementSchema("s3", TSDataType.TEXT, TSEncoding.PLAIN));
+ List<MeasurementSchema> measurementSchemas = new ArrayList<>();
+ measurementSchemas.add(new MeasurementSchema("s1", TSDataType.TEXT, TSEncoding.PLAIN));
+ measurementSchemas.add(new MeasurementSchema("s2", TSDataType.TEXT, TSEncoding.PLAIN));
+ measurementSchemas.add(new MeasurementSchema("s3", TSDataType.TEXT, TSEncoding.PLAIN));
// register nonAligned timeseries
tsFileWriter.registerTimeseries(new Path("root.sg.d1"), measurementSchemas);
diff --git a/flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/tsfile/RowTsFileOutputFormatTestBase.java b/flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/tsfile/RowTsFileOutputFormatTestBase.java
index caddbf3..a35b7f3 100644
--- a/flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/tsfile/RowTsFileOutputFormatTestBase.java
+++ b/flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/tsfile/RowTsFileOutputFormatTestBase.java
@@ -27,8 +27,8 @@ import org.apache.iotdb.tsfile.read.common.Path;
import org.apache.iotdb.tsfile.read.common.RowRecord;
import org.apache.iotdb.tsfile.read.expression.QueryExpression;
import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.Schema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import org.apache.flink.api.java.DataSet;
import org.apache.flink.api.java.ExecutionEnvironment;
@@ -58,13 +58,11 @@ public abstract class RowTsFileOutputFormatTestBase extends RowTsFileConnectorTe
protected TSRecordOutputFormat<Row> prepareTSRecordOutputFormat(String path) {
schema = new Schema();
schema.extendTemplate(
- DEFAULT_TEMPLATE, new UnaryMeasurementSchema("sensor_1", TSDataType.FLOAT, TSEncoding.RLE));
+ DEFAULT_TEMPLATE, new MeasurementSchema("sensor_1", TSDataType.FLOAT, TSEncoding.RLE));
schema.extendTemplate(
- DEFAULT_TEMPLATE,
- new UnaryMeasurementSchema("sensor_2", TSDataType.INT32, TSEncoding.TS_2DIFF));
+ DEFAULT_TEMPLATE, new MeasurementSchema("sensor_2", TSDataType.INT32, TSEncoding.TS_2DIFF));
schema.extendTemplate(
- DEFAULT_TEMPLATE,
- new UnaryMeasurementSchema("sensor_3", TSDataType.INT32, TSEncoding.TS_2DIFF));
+ DEFAULT_TEMPLATE, new MeasurementSchema("sensor_3", TSDataType.INT32, TSEncoding.TS_2DIFF));
rowTSRecordConverter = new RowTSRecordConverter(rowTypeInfo);
return new TSRecordOutputFormat<>(path, schema, rowTSRecordConverter, config);
}
diff --git a/flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/util/TsFileWriteUtil.java b/flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/util/TsFileWriteUtil.java
index d19ca7a..c38ade4 100644
--- a/flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/util/TsFileWriteUtil.java
+++ b/flink-tsfile-connector/src/test/java/org/apache/iotdb/flink/util/TsFileWriteUtil.java
@@ -26,8 +26,8 @@ import org.apache.iotdb.tsfile.write.record.TSRecord;
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.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.Schema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import java.io.File;
@@ -44,13 +44,11 @@ public class TsFileWriteUtil {
}
Schema schema = new Schema();
schema.extendTemplate(
- DEFAULT_TEMPLATE, new UnaryMeasurementSchema("sensor_1", TSDataType.FLOAT, TSEncoding.RLE));
+ DEFAULT_TEMPLATE, new MeasurementSchema("sensor_1", TSDataType.FLOAT, TSEncoding.RLE));
schema.extendTemplate(
- DEFAULT_TEMPLATE,
- new UnaryMeasurementSchema("sensor_2", TSDataType.INT32, TSEncoding.TS_2DIFF));
+ DEFAULT_TEMPLATE, new MeasurementSchema("sensor_2", TSDataType.INT32, TSEncoding.TS_2DIFF));
schema.extendTemplate(
- DEFAULT_TEMPLATE,
- new UnaryMeasurementSchema("sensor_3", TSDataType.INT32, TSEncoding.TS_2DIFF));
+ DEFAULT_TEMPLATE, new MeasurementSchema("sensor_3", TSDataType.INT32, TSEncoding.TS_2DIFF));
TsFileWriter tsFileWriter = new TsFileWriter(f, schema);
@@ -143,13 +141,11 @@ public class TsFileWriteUtil {
}
Schema schema = new Schema();
schema.extendTemplate(
- DEFAULT_TEMPLATE, new UnaryMeasurementSchema("sensor_1", TSDataType.FLOAT, TSEncoding.RLE));
+ DEFAULT_TEMPLATE, new MeasurementSchema("sensor_1", TSDataType.FLOAT, TSEncoding.RLE));
schema.extendTemplate(
- DEFAULT_TEMPLATE,
- new UnaryMeasurementSchema("sensor_2", TSDataType.INT32, TSEncoding.TS_2DIFF));
+ DEFAULT_TEMPLATE, new MeasurementSchema("sensor_2", TSDataType.INT32, TSEncoding.TS_2DIFF));
schema.extendTemplate(
- DEFAULT_TEMPLATE,
- new UnaryMeasurementSchema("sensor_3", TSDataType.INT32, TSEncoding.TS_2DIFF));
+ DEFAULT_TEMPLATE, new MeasurementSchema("sensor_3", TSDataType.INT32, TSEncoding.TS_2DIFF));
TsFileWriter tsFileWriter = new TsFileWriter(f, schema);
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 08c7393..c9ef693 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
@@ -25,8 +25,8 @@ import org.apache.iotdb.tsfile.read.common.Path;
import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.Tablet;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.Schema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -64,8 +64,8 @@ public class TsFileTestHelper {
// add timeseries into file schema (all with INT64 data type)
for (int i = 0; i < sensorNum; i++) {
- UnaryMeasurementSchema measurementSchema =
- new UnaryMeasurementSchema("sensor_" + (i + 1), TSDataType.INT64, TSEncoding.TS_2DIFF);
+ MeasurementSchema measurementSchema =
+ new MeasurementSchema("sensor_" + (i + 1), TSDataType.INT64, TSEncoding.TS_2DIFF);
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 7463369..8b6f4a9 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
@@ -26,8 +26,8 @@ import org.apache.iotdb.tsfile.read.common.Path;
import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.Tablet;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.Schema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -65,8 +65,8 @@ public class TsFileTestHelper {
// add measurements into file schema (all with INT64 data type)
for (int i = 0; i < sensorNum; i++) {
- UnaryMeasurementSchema measurementSchema =
- new UnaryMeasurementSchema(
+ MeasurementSchema measurementSchema =
+ new MeasurementSchema(
"sensor_" + (i + 1),
TSDataType.INT64,
TSEncoding.TS_2DIFF,
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/logfile/MLogWriter.java b/server/src/main/java/org/apache/iotdb/db/metadata/logfile/MLogWriter.java
index 62f2796..2f1c8f9 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/logfile/MLogWriter.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/logfile/MLogWriter.java
@@ -49,7 +49,7 @@ import org.apache.iotdb.db.writelog.io.LogWriter;
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 org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -259,7 +259,7 @@ public class MLogWriter implements AutoCloseable {
"".equals(words[2]) ? null : words[2],
Long.parseLong(words[words.length - 2]),
Integer.parseInt(words[words.length - 1]),
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
words[1],
TSDataType.values()[Integer.parseInt(words[3])],
TSEncoding.values()[Integer.parseInt(words[4])],
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/MTree.java b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/MTree.java
index 13e43da..2a5e159 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/MTree.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/MTree.java
@@ -71,8 +71,8 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
import org.apache.iotdb.tsfile.utils.Pair;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.TimeseriesSchema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -403,7 +403,7 @@ public class MTree implements Serializable {
MeasurementMNode.getMeasurementMNode(
entityMNode,
leafName,
- new UnaryMeasurementSchema(leafName, dataType, encoding, compressor, props),
+ new MeasurementSchema(leafName, dataType, encoding, compressor, props),
alias);
entityMNode.addChild(leafName, measurementMNode);
// link alias to LeafMNode
@@ -469,7 +469,7 @@ public class MTree implements Serializable {
MeasurementMNode.getMeasurementMNode(
entityMNode,
measurements.get(i),
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
measurements.get(i), dataTypes.get(i), encodings.get(i), compressors.get(i)),
null);
entityMNode.addChild(measurements.get(i), measurementMNode);
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/path/MeasurementPath.java b/server/src/main/java/org/apache/iotdb/db/metadata/path/MeasurementPath.java
index 9d4277a..310b36e 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/path/MeasurementPath.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/path/MeasurementPath.java
@@ -42,7 +42,7 @@ import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics;
import org.apache.iotdb.tsfile.read.common.TimeRange;
import org.apache.iotdb.tsfile.read.filter.basic.Filter;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.writer.RestorableTsFileIOWriter;
import org.slf4j.Logger;
@@ -74,7 +74,7 @@ public class MeasurementPath extends PartialPath {
public MeasurementPath(String measurementPath, TSDataType type) throws IllegalPathException {
super(measurementPath);
- this.measurementSchema = new UnaryMeasurementSchema(getMeasurement(), type);
+ this.measurementSchema = new MeasurementSchema(getMeasurement(), type);
}
public MeasurementPath(PartialPath measurementPath, IMeasurementSchema measurementSchema) {
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/template/Template.java b/server/src/main/java/org/apache/iotdb/db/metadata/template/Template.java
index c001191..4af2cfb 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/template/Template.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/template/Template.java
@@ -35,7 +35,7 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.VectorMeasurementSchema;
import org.apache.commons.lang3.builder.HashCodeBuilder;
@@ -115,7 +115,7 @@ public class Template {
// normal measurement
else {
curSchema =
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
plan.getMeasurements().get(i).get(0),
plan.getDataTypes().get(i).get(0),
plan.getEncodings().get(i).get(0),
@@ -241,7 +241,7 @@ public class Template {
private IMeasurementSchema constructSchema(
String nodeName, TSDataType dataType, TSEncoding encoding, CompressionType compressor) {
- return new UnaryMeasurementSchema(nodeName, dataType, encoding, compressor);
+ return new MeasurementSchema(nodeName, dataType, encoding, compressor);
}
private IMeasurementSchema[] constructSchemas(
@@ -249,10 +249,9 @@ public class Template {
TSDataType[] dataTypes,
TSEncoding[] encodings,
CompressionType[] compressors) {
- UnaryMeasurementSchema[] schemas = new UnaryMeasurementSchema[nodeNames.length];
+ MeasurementSchema[] schemas = new MeasurementSchema[nodeNames.length];
for (int i = 0; i < nodeNames.length; i++) {
- schemas[i] =
- new UnaryMeasurementSchema(nodeNames[i], dataTypes[i], encodings[i], compressors[i]);
+ schemas[i] = new MeasurementSchema(nodeNames[i], dataTypes[i], encodings[i], compressors[i]);
}
return schemas;
}
@@ -620,7 +619,7 @@ public class Template {
byte flag = ReadWriteIOUtils.readByte(buffer);
IMeasurementSchema measurementSchema = null;
if (flag == (byte) 0) {
- measurementSchema = UnaryMeasurementSchema.partialDeserializeFrom(buffer);
+ measurementSchema = MeasurementSchema.partialDeserializeFrom(buffer);
} else if (flag == (byte) 1) {
measurementSchema = VectorMeasurementSchema.partialDeserializeFrom(buffer);
}
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertRowPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertRowPlan.java
index 6be7392..7bff48f 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertRowPlan.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertRowPlan.java
@@ -37,7 +37,7 @@ import org.apache.iotdb.tsfile.utils.Binary;
import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
import org.apache.iotdb.tsfile.utils.TsPrimitiveType;
import org.apache.iotdb.tsfile.write.record.TSRecord;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -195,7 +195,7 @@ public class InsertRowPlan extends InsertPlan {
MeasurementMNode.getMeasurementMNode(
null,
measurements[i],
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
measurements[i], tsRecord.dataPointList.get(i).getType(), TSEncoding.PLAIN),
null);
dataTypes[i] = tsRecord.dataPointList.get(i).getType();
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/MeasurementMNodePlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/MeasurementMNodePlan.java
index efa98de..d1e1648 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/MeasurementMNodePlan.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/sys/MeasurementMNodePlan.java
@@ -22,7 +22,7 @@ package org.apache.iotdb.db.qp.physical.sys;
import org.apache.iotdb.db.metadata.path.PartialPath;
import org.apache.iotdb.db.qp.logical.Operator;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import java.io.DataOutputStream;
import java.io.IOException;
@@ -87,7 +87,7 @@ public class MeasurementMNodePlan extends MNodePlan {
alias = readString(buffer);
offset = buffer.getLong();
childSize = buffer.getInt();
- schema = UnaryMeasurementSchema.deserializeFrom(buffer);
+ schema = MeasurementSchema.deserializeFrom(buffer);
index = buffer.getLong();
}
diff --git a/server/src/main/java/org/apache/iotdb/db/tools/TsFileRewriteTool.java b/server/src/main/java/org/apache/iotdb/db/tools/TsFileRewriteTool.java
index 8c61368..3f04c28 100644
--- a/server/src/main/java/org/apache/iotdb/db/tools/TsFileRewriteTool.java
+++ b/server/src/main/java/org/apache/iotdb/db/tools/TsFileRewriteTool.java
@@ -49,7 +49,7 @@ import org.apache.iotdb.tsfile.utils.Binary;
import org.apache.iotdb.tsfile.v2.read.TsFileSequenceReaderForV2;
import org.apache.iotdb.tsfile.write.chunk.ChunkWriterImpl;
import org.apache.iotdb.tsfile.write.chunk.IChunkWriter;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.writer.TsFileIOWriter;
import org.slf4j.Logger;
@@ -181,8 +181,8 @@ public class TsFileRewriteTool implements AutoCloseable {
case MetaMarker.ONLY_ONE_PAGE_CHUNK_HEADER:
chunkHeaderOffset = reader.position() - 1;
ChunkHeader header = reader.readChunkHeader(marker);
- UnaryMeasurementSchema measurementSchema =
- new UnaryMeasurementSchema(
+ MeasurementSchema measurementSchema =
+ new MeasurementSchema(
header.getMeasurementID(),
header.getDataType(),
header.getEncodingType(),
@@ -265,7 +265,7 @@ public class TsFileRewriteTool implements AutoCloseable {
* false.
*/
protected boolean checkIfNeedToDecode(
- UnaryMeasurementSchema schema, String deviceId, PageHeader pageHeader, long chunkHeaderOffset)
+ MeasurementSchema schema, String deviceId, PageHeader pageHeader, long chunkHeaderOffset)
throws IllegalPathException {
if (pageHeader.getStatistics() == null) {
return true;
@@ -299,7 +299,7 @@ public class TsFileRewriteTool implements AutoCloseable {
protected void reWriteChunk(
String deviceId,
boolean firstChunkInChunkGroup,
- UnaryMeasurementSchema schema,
+ MeasurementSchema schema,
List<PageHeader> pageHeadersInChunk,
List<ByteBuffer> pageDataInChunk,
List<Boolean> needToDecodeInfoInChunk,
@@ -369,7 +369,7 @@ public class TsFileRewriteTool implements AutoCloseable {
}
protected void writePage(
- UnaryMeasurementSchema schema,
+ MeasurementSchema schema,
PageHeader pageHeader,
ByteBuffer pageData,
Map<Long, ChunkWriterImpl> partitionChunkWriterMap)
@@ -383,7 +383,7 @@ public class TsFileRewriteTool implements AutoCloseable {
protected void decodeAndWritePage(
String deviceId,
- UnaryMeasurementSchema schema,
+ MeasurementSchema schema,
ByteBuffer pageData,
Map<Long, ChunkWriterImpl> partitionChunkWriterMap,
long chunkHeaderOffset)
@@ -400,7 +400,7 @@ public class TsFileRewriteTool implements AutoCloseable {
}
private List<TimeRange> getOldSortedDeleteIntervals(
- String deviceId, UnaryMeasurementSchema schema, long chunkHeaderOffset)
+ String deviceId, MeasurementSchema schema, long chunkHeaderOffset)
throws IllegalPathException {
if (oldModification != null) {
ChunkMetadata chunkMetadata = new ChunkMetadata();
@@ -424,7 +424,7 @@ public class TsFileRewriteTool implements AutoCloseable {
protected void rewritePageIntoFiles(
BatchData batchData,
- UnaryMeasurementSchema schema,
+ MeasurementSchema schema,
Map<Long, ChunkWriterImpl> partitionChunkWriterMap) {
while (batchData.hasCurrent()) {
long time = batchData.currentTime();
diff --git a/server/src/main/java/org/apache/iotdb/db/tools/upgrade/TsFileOnlineUpgradeTool.java b/server/src/main/java/org/apache/iotdb/db/tools/upgrade/TsFileOnlineUpgradeTool.java
index 1457df4..9079944 100644
--- a/server/src/main/java/org/apache/iotdb/db/tools/upgrade/TsFileOnlineUpgradeTool.java
+++ b/server/src/main/java/org/apache/iotdb/db/tools/upgrade/TsFileOnlineUpgradeTool.java
@@ -35,7 +35,7 @@ import org.apache.iotdb.tsfile.read.common.BatchData;
import org.apache.iotdb.tsfile.v2.read.TsFileSequenceReaderForV2;
import org.apache.iotdb.tsfile.v2.read.reader.page.PageReaderV2;
import org.apache.iotdb.tsfile.write.chunk.ChunkWriterImpl;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.writer.TsFileIOWriter;
import org.slf4j.Logger;
@@ -122,8 +122,8 @@ public class TsFileOnlineUpgradeTool extends TsFileRewriteTool {
}
} else {
ChunkHeader header = ((TsFileSequenceReaderForV2) reader).readChunkHeader();
- UnaryMeasurementSchema measurementSchema =
- new UnaryMeasurementSchema(
+ MeasurementSchema measurementSchema =
+ new MeasurementSchema(
header.getMeasurementID(),
header.getDataType(),
header.getEncodingType(),
@@ -243,7 +243,7 @@ public class TsFileOnlineUpgradeTool extends TsFileRewriteTool {
TSDataType dataType,
TSEncoding encoding,
PageHeader pageHeader,
- UnaryMeasurementSchema schema,
+ MeasurementSchema schema,
String deviceId,
long chunkHeaderOffset)
throws IllegalPathException {
@@ -256,7 +256,7 @@ public class TsFileOnlineUpgradeTool extends TsFileRewriteTool {
}
protected void decodeAndWritePage(
- UnaryMeasurementSchema schema,
+ MeasurementSchema schema,
ByteBuffer pageData,
Map<Long, ChunkWriterImpl> partitionChunkWriterMap)
throws IOException {
diff --git a/server/src/main/java/org/apache/iotdb/db/utils/SchemaUtils.java b/server/src/main/java/org/apache/iotdb/db/utils/SchemaUtils.java
index 3df6ed7..c94a4b0 100644
--- a/server/src/main/java/org/apache/iotdb/db/utils/SchemaUtils.java
+++ b/server/src/main/java/org/apache/iotdb/db/utils/SchemaUtils.java
@@ -33,8 +33,8 @@ 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 org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.TimeseriesSchema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -119,7 +119,7 @@ public class SchemaUtils {
TSEncoding encoding = schema.getEncodingType();
CompressionType compressionType = schema.getCompressor();
IMeasurementSchema measurementSchema =
- new UnaryMeasurementSchema(path.getMeasurement(), dataType, encoding, compressionType);
+ new MeasurementSchema(path.getMeasurement(), dataType, encoding, compressionType);
IMeasurementMNode measurementMNode =
MeasurementMNode.getMeasurementMNode(null, path.getMeasurement(), measurementSchema, null);
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/cache/BloomFilterCacheTest.java b/server/src/test/java/org/apache/iotdb/db/engine/cache/BloomFilterCacheTest.java
index bd60c9f..ce6719c 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/cache/BloomFilterCacheTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/cache/BloomFilterCacheTest.java
@@ -28,8 +28,8 @@ import org.apache.iotdb.tsfile.utils.BloomFilter;
import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.Tablet;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.Schema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import org.apache.commons.io.FileUtils;
import org.junit.*;
@@ -166,13 +166,11 @@ public class BloomFilterCacheTest {
// add measurements into file schema (all with INT64 data type)
for (int i = 0; i < sensorNum; i++) {
IMeasurementSchema measurementSchema =
- new UnaryMeasurementSchema(
- sensorPrefix + (i + 1), TSDataType.INT64, TSEncoding.TS_2DIFF);
+ new MeasurementSchema(sensorPrefix + (i + 1), TSDataType.INT64, TSEncoding.TS_2DIFF);
measurementSchemas.add(measurementSchema);
schema.registerTimeseries(
new Path(device),
- new UnaryMeasurementSchema(
- sensorPrefix + (i + 1), TSDataType.INT64, TSEncoding.TS_2DIFF));
+ new MeasurementSchema(sensorPrefix + (i + 1), TSDataType.INT64, TSEncoding.TS_2DIFF));
}
// add measurements into TSFileWriter
try (TsFileWriter tsFileWriter = new TsFileWriter(f, schema)) {
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 33eab71..e2eb088 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
@@ -40,7 +40,7 @@ import org.apache.iotdb.tsfile.read.common.Path;
import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Assert;
@@ -69,7 +69,7 @@ public class ChunkCacheTest {
long flushInterval = 20;
String[] deviceIds;
- UnaryMeasurementSchema[] measurementSchemas;
+ MeasurementSchema[] measurementSchemas;
List<TsFileResource> seqResources = new ArrayList<>();
List<TsFileResource> unseqResources = new ArrayList<>();
@@ -135,10 +135,10 @@ public class ChunkCacheTest {
}
void prepareSeries() throws MetadataException {
- measurementSchemas = new UnaryMeasurementSchema[measurementNum];
+ measurementSchemas = new MeasurementSchema[measurementNum];
for (int i = 0; i < measurementNum; i++) {
measurementSchemas[i] =
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"sensor" + i, TSDataType.DOUBLE, TSEncoding.PLAIN, CompressionType.UNCOMPRESSED);
}
deviceIds = new String[deviceNum];
@@ -147,7 +147,7 @@ public class ChunkCacheTest {
}
IoTDB.metaManager.setStorageGroup(new PartialPath(TEST_SG));
for (String device : deviceIds) {
- for (UnaryMeasurementSchema measurementSchema : measurementSchemas) {
+ for (MeasurementSchema measurementSchema : measurementSchemas) {
PartialPath devicePath = new PartialPath(device);
IoTDB.metaManager.createTimeseries(
devicePath.concatNode(measurementSchema.getMeasurementId()),
@@ -188,7 +188,7 @@ public class ChunkCacheTest {
throws IOException, WriteProcessException {
TsFileWriter fileWriter = new TsFileWriter(tsFileResource.getTsFile());
for (String deviceId : deviceIds) {
- for (UnaryMeasurementSchema measurementSchema : measurementSchemas) {
+ for (MeasurementSchema measurementSchema : measurementSchemas) {
fileWriter.registerTimeseries(new Path(deviceId), measurementSchema);
}
}
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 63ca108..7eb2c84 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
@@ -38,7 +38,7 @@ import org.apache.iotdb.tsfile.read.reader.IBatchReader;
import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.commons.io.FileUtils;
import org.junit.After;
@@ -116,7 +116,7 @@ public class MergeOverLapTest extends MergeTest {
TsFileWriter fileWriter = new TsFileWriter(tsFileResource.getTsFile());
fileWriter.setIsUnseq(true);
for (String deviceId : deviceIds) {
- for (UnaryMeasurementSchema measurementSchema : measurementSchemas) {
+ for (MeasurementSchema measurementSchema : measurementSchemas) {
fileWriter.registerTimeseries(new Path(deviceId), measurementSchema);
}
}
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 7ebea08..ec80116 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
@@ -41,7 +41,7 @@ import org.apache.iotdb.tsfile.read.reader.IBatchReader;
import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.commons.io.FileUtils;
import org.junit.After;
@@ -157,7 +157,7 @@ public class MergeTaskTest extends MergeTest {
// remove all data of first file
for (String deviceId : deviceIds) {
- for (UnaryMeasurementSchema measurementSchema : measurementSchemas) {
+ for (MeasurementSchema measurementSchema : measurementSchemas) {
PartialPath device = new PartialPath(deviceId);
seqResources
.get(0)
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 fe53e61..c444bf8 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
@@ -39,7 +39,7 @@ import org.apache.iotdb.tsfile.read.common.Path;
import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Assert;
@@ -66,7 +66,7 @@ abstract class MergeTest {
TSEncoding encoding = TSEncoding.PLAIN;
String[] deviceIds;
- UnaryMeasurementSchema[] measurementSchemas;
+ MeasurementSchema[] measurementSchemas;
List<TsFileResource> seqResources = new ArrayList<>();
List<TsFileResource> unseqResources = new ArrayList<>();
@@ -101,10 +101,10 @@ abstract class MergeTest {
}
private void prepareSeries() throws MetadataException {
- measurementSchemas = new UnaryMeasurementSchema[measurementNum];
+ measurementSchemas = new MeasurementSchema[measurementNum];
for (int i = 0; i < measurementNum; i++) {
measurementSchemas[i] =
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"sensor" + i, TSDataType.DOUBLE, encoding, CompressionType.UNCOMPRESSED);
}
deviceIds = new String[deviceNum];
@@ -113,7 +113,7 @@ abstract class MergeTest {
}
IoTDB.metaManager.setStorageGroup(new PartialPath(MERGE_TEST_SG));
for (String device : deviceIds) {
- for (UnaryMeasurementSchema measurementSchema : measurementSchemas) {
+ for (MeasurementSchema measurementSchema : measurementSchemas) {
PartialPath devicePath = new PartialPath(device);
IoTDB.metaManager.createTimeseries(
devicePath.concatNode(measurementSchema.getMeasurementId()),
@@ -180,7 +180,7 @@ abstract class MergeTest {
throws IOException, WriteProcessException {
TsFileWriter fileWriter = new TsFileWriter(tsFileResource.getTsFile());
for (String deviceId : deviceIds) {
- for (UnaryMeasurementSchema measurementSchema : measurementSchemas) {
+ for (MeasurementSchema measurementSchema : measurementSchemas) {
fileWriter.registerTimeseries(new Path(deviceId), measurementSchema);
}
}
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 b6c9e47..f301c69 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
@@ -35,7 +35,7 @@ import org.apache.iotdb.tsfile.read.common.Path;
import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
@@ -56,7 +56,7 @@ public class MergeUpgradeTest {
private int seqFileNum = 2;
private TSEncoding encoding = TSEncoding.RLE;
- private UnaryMeasurementSchema[] measurementSchemas;
+ private MeasurementSchema[] measurementSchemas;
private int timeseriesNum = 5;
private long ptNum = 10;
private boolean changeVersion = true;
@@ -122,10 +122,10 @@ public class MergeUpgradeTest {
}
private void prepareSeries() {
- measurementSchemas = new UnaryMeasurementSchema[timeseriesNum];
+ measurementSchemas = new MeasurementSchema[timeseriesNum];
for (int i = 0; i < timeseriesNum; i++) {
measurementSchemas[i] =
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"sensor" + i, TSDataType.DOUBLE, encoding, CompressionType.UNCOMPRESSED);
}
}
@@ -169,7 +169,8 @@ public class MergeUpgradeTest {
long ptNum,
long valueOffset)
throws WriteProcessException, IOException {
- for (UnaryMeasurementSchema MeasurementSchema : measurementSchemas) {
+ for (org.apache.iotdb.tsfile.write.schema.MeasurementSchema MeasurementSchema :
+ measurementSchemas) {
fileWriter.registerTimeseries(new Path(deviceName), MeasurementSchema);
}
for (long i = timeOffset; i < timeOffset + ptNum; i++) {
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 572e7de..e8f7e00 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
@@ -42,7 +42,7 @@ import org.apache.iotdb.tsfile.read.reader.IBatchReader;
import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.commons.io.FileUtils;
import org.junit.After;
@@ -67,10 +67,10 @@ public class InnerCompactionMoreDataTest extends InnerCompactionTest {
@Override
void prepareSeries() throws MetadataException {
- measurementSchemas = new UnaryMeasurementSchema[measurementNum];
+ measurementSchemas = new MeasurementSchema[measurementNum];
for (int i = 0; i < measurementNum; i++) {
measurementSchemas[i] =
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"sensor" + i, TSDataType.DOUBLE, encoding, CompressionType.UNCOMPRESSED);
}
deviceIds = new String[deviceNum];
@@ -79,7 +79,7 @@ public class InnerCompactionMoreDataTest extends InnerCompactionTest {
}
IoTDB.metaManager.setStorageGroup(new PartialPath(COMPACTION_TEST_SG));
for (String device : deviceIds) {
- for (UnaryMeasurementSchema measurementSchema : measurementSchemas) {
+ for (MeasurementSchema measurementSchema : measurementSchemas) {
PartialPath devicePath = new PartialPath(device);
IoTDB.metaManager.createTimeseries(
devicePath.concatNode(measurementSchema.getMeasurementId()),
@@ -156,7 +156,7 @@ public class InnerCompactionMoreDataTest extends InnerCompactionTest {
throws IOException, WriteProcessException {
TsFileWriter fileWriter = new TsFileWriter(tsFileResource.getTsFile());
for (String deviceId : deviceIds) {
- for (UnaryMeasurementSchema measurementSchema : measurementSchemas) {
+ for (MeasurementSchema measurementSchema : measurementSchemas) {
fileWriter.registerTimeseries(new Path(deviceId), measurementSchema);
}
}
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 7559da5..084f524 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
@@ -41,7 +41,7 @@ import org.apache.iotdb.tsfile.read.common.Path;
import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
@@ -68,7 +68,7 @@ public abstract class InnerCompactionTest {
protected TSEncoding encoding = TSEncoding.PLAIN;
protected String[] deviceIds;
- protected UnaryMeasurementSchema[] measurementSchemas;
+ protected MeasurementSchema[] measurementSchemas;
protected List<TsFileResource> seqResources = new ArrayList<>();
protected List<TsFileResource> unseqResources = new ArrayList<>();
@@ -101,10 +101,10 @@ public abstract class InnerCompactionTest {
}
void prepareSeries() throws MetadataException {
- measurementSchemas = new UnaryMeasurementSchema[measurementNum];
+ measurementSchemas = new MeasurementSchema[measurementNum];
for (int i = 0; i < measurementNum; i++) {
measurementSchemas[i] =
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"sensor" + i, TSDataType.DOUBLE, encoding, CompressionType.UNCOMPRESSED);
}
deviceIds = new String[deviceNum];
@@ -113,7 +113,7 @@ public abstract class InnerCompactionTest {
}
IoTDB.metaManager.setStorageGroup(new PartialPath(COMPACTION_TEST_SG));
for (String device : deviceIds) {
- for (UnaryMeasurementSchema measurementSchema : measurementSchemas) {
+ for (MeasurementSchema measurementSchema : measurementSchemas) {
PartialPath devicePath = new PartialPath(device);
IoTDB.metaManager.createTimeseries(
devicePath.concatNode(measurementSchema.getMeasurementId()),
@@ -212,7 +212,7 @@ public abstract class InnerCompactionTest {
throws IOException, WriteProcessException {
TsFileWriter fileWriter = new TsFileWriter(tsFileResource.getTsFile());
for (String deviceId : deviceIds) {
- for (UnaryMeasurementSchema measurementSchema : measurementSchemas) {
+ for (MeasurementSchema measurementSchema : measurementSchemas) {
fileWriter.registerTimeseries(new Path(deviceId), measurementSchema);
}
}
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/sizetiered/SizeTieredCompactionRecoverTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/sizetiered/SizeTieredCompactionRecoverTest.java
index c573611..6e6cea5 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/sizetiered/SizeTieredCompactionRecoverTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/sizetiered/SizeTieredCompactionRecoverTest.java
@@ -51,7 +51,7 @@ import org.apache.iotdb.tsfile.read.reader.IBatchReader;
import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.writer.TsFileOutput;
import org.apache.commons.io.FileUtils;
@@ -118,7 +118,7 @@ public class SizeTieredCompactionRecoverTest {
+ "0";
protected String[] deviceIds;
- protected UnaryMeasurementSchema[] measurementSchemas;
+ protected MeasurementSchema[] measurementSchemas;
protected List<TsFileResource> seqResources = new ArrayList<>();
protected List<TsFileResource> unseqResources = new ArrayList<>();
@@ -160,10 +160,10 @@ public class SizeTieredCompactionRecoverTest {
}
void prepareSeries() throws MetadataException {
- measurementSchemas = new UnaryMeasurementSchema[measurementNum];
+ measurementSchemas = new MeasurementSchema[measurementNum];
for (int i = 0; i < measurementNum; i++) {
measurementSchemas[i] =
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"sensor" + i, TSDataType.DOUBLE, encoding, CompressionType.UNCOMPRESSED);
}
deviceIds = new String[deviceNum];
@@ -172,7 +172,7 @@ public class SizeTieredCompactionRecoverTest {
}
IoTDB.metaManager.setStorageGroup(new PartialPath(COMPACTION_TEST_SG));
for (String device : deviceIds) {
- for (UnaryMeasurementSchema measurementSchema : measurementSchemas) {
+ for (MeasurementSchema measurementSchema : measurementSchemas) {
PartialPath devicePath = new PartialPath(device);
IoTDB.metaManager.createTimeseries(
devicePath.concatNode(measurementSchema.getMeasurementId()),
@@ -247,7 +247,7 @@ public class SizeTieredCompactionRecoverTest {
throws IOException, WriteProcessException {
TsFileWriter fileWriter = new TsFileWriter(tsFileResource.getTsFile());
for (String deviceId : deviceIds) {
- for (UnaryMeasurementSchema measurementSchema : measurementSchemas) {
+ for (MeasurementSchema measurementSchema : measurementSchemas) {
fileWriter.registerTimeseries(new Path(deviceId), measurementSchema);
}
}
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/sizetiered/SizeTieredCompactionTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/sizetiered/SizeTieredCompactionTest.java
index ad4b53d..e9ac8f1 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/sizetiered/SizeTieredCompactionTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/sizetiered/SizeTieredCompactionTest.java
@@ -40,7 +40,7 @@ import org.apache.iotdb.tsfile.read.common.Path;
import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
@@ -65,7 +65,7 @@ public class SizeTieredCompactionTest {
TSEncoding encoding = TSEncoding.PLAIN;
String[] deviceIds;
- UnaryMeasurementSchema[] measurementSchemas;
+ MeasurementSchema[] measurementSchemas;
List<TsFileResource> seqResources = new ArrayList<>();
List<TsFileResource> unseqResources = new ArrayList<>();
@@ -98,10 +98,10 @@ public class SizeTieredCompactionTest {
}
void prepareSeries() throws MetadataException {
- measurementSchemas = new UnaryMeasurementSchema[measurementNum];
+ measurementSchemas = new MeasurementSchema[measurementNum];
for (int i = 0; i < measurementNum; i++) {
measurementSchemas[i] =
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"sensor" + i, TSDataType.DOUBLE, encoding, CompressionType.UNCOMPRESSED);
}
deviceIds = new String[deviceNum];
@@ -110,7 +110,7 @@ public class SizeTieredCompactionTest {
}
IoTDB.metaManager.setStorageGroup(new PartialPath(COMPACTION_TEST_SG));
for (String device : deviceIds) {
- for (UnaryMeasurementSchema measurementSchema : measurementSchemas) {
+ for (MeasurementSchema measurementSchema : measurementSchemas) {
PartialPath devicePath = new PartialPath(device);
IoTDB.metaManager.createTimeseries(
devicePath.concatNode(measurementSchema.getMeasurementId()),
@@ -209,7 +209,7 @@ public class SizeTieredCompactionTest {
throws IOException, WriteProcessException {
TsFileWriter fileWriter = new TsFileWriter(tsFileResource.getTsFile());
for (String deviceId : deviceIds) {
- for (UnaryMeasurementSchema measurementSchema : measurementSchemas) {
+ for (MeasurementSchema measurementSchema : measurementSchemas) {
fileWriter.registerTimeseries(
new Path(deviceId, measurementSchema.getMeasurementId()), measurementSchema);
}
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/utils/CompactionFileGeneratorUtils.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/utils/CompactionFileGeneratorUtils.java
index 57b4b6b..df5f417 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/utils/CompactionFileGeneratorUtils.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/utils/CompactionFileGeneratorUtils.java
@@ -32,7 +32,7 @@ import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.utils.Pair;
import org.apache.iotdb.tsfile.write.chunk.ChunkWriterImpl;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.writer.RestorableTsFileIOWriter;
import java.io.File;
@@ -126,7 +126,7 @@ public class CompactionFileGeneratorUtils {
long currTime = startTime;
for (List<Long> chunk : chunkPagePointsNum) {
ChunkWriterImpl chunkWriter =
- new ChunkWriterImpl(new UnaryMeasurementSchema(sensor, TSDataType.INT64), true);
+ new ChunkWriterImpl(new MeasurementSchema(sensor, TSDataType.INT64), true);
for (Long page : chunk) {
for (long i = 0; i < page; i++) {
chunkWriter.write(currTime, currTime);
@@ -183,7 +183,7 @@ public class CompactionFileGeneratorUtils {
for (String sensor : deviceMeasurementEntry.getValue()) {
List<long[][]> chunks = chunkPagePointsNum.get(currChunksIndex);
ChunkWriterImpl chunkWriter =
- new ChunkWriterImpl(new UnaryMeasurementSchema(sensor, TSDataType.INT64), true);
+ new ChunkWriterImpl(new MeasurementSchema(sensor, TSDataType.INT64), true);
for (long[][] pages : chunks) {
for (long[] starEndTime : pages) {
for (long i = starEndTime[0]; i < starEndTime[1]; i++) {
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 00a6fd1..999f0d1 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
@@ -28,8 +28,8 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
import org.apache.iotdb.tsfile.read.common.Path;
import org.apache.iotdb.tsfile.utils.BitMap;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.Schema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import java.util.ArrayList;
import java.util.Collections;
@@ -46,8 +46,7 @@ public class MemTableTestUtils {
static {
schema.registerTimeseries(
- new Path(deviceId0),
- new UnaryMeasurementSchema(measurementId0, dataType0, TSEncoding.PLAIN));
+ new Path(deviceId0), new MeasurementSchema(measurementId0, dataType0, TSEncoding.PLAIN));
}
public static void produceData(
@@ -64,7 +63,7 @@ public class MemTableTestUtils {
iMemTable.write(
deviceId,
Collections.singletonList(
- new UnaryMeasurementSchema(measurementId, dataType, TSEncoding.PLAIN)),
+ new MeasurementSchema(measurementId, dataType, TSEncoding.PLAIN)),
l,
new Object[] {(int) l});
}
@@ -91,10 +90,8 @@ public class MemTableTestUtils {
encodings[1] = TSEncoding.GORILLA;
IMeasurementMNode[] mNodes = new IMeasurementMNode[2];
- IMeasurementSchema schema0 =
- new UnaryMeasurementSchema(measurements[0], dataTypes[0], encodings[0]);
- IMeasurementSchema schema1 =
- new UnaryMeasurementSchema(measurements[1], dataTypes[1], encodings[1]);
+ IMeasurementSchema schema0 = new MeasurementSchema(measurements[0], dataTypes[0], encodings[0]);
+ IMeasurementSchema schema1 = new MeasurementSchema(measurements[1], dataTypes[1], encodings[1]);
mNodes[0] = MeasurementMNode.getMeasurementMNode(null, "sensor0", schema0, null);
mNodes[1] = MeasurementMNode.getMeasurementMNode(null, "sensor1", schema1, null);
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/memtable/MemtableBenchmark.java b/server/src/test/java/org/apache/iotdb/db/engine/memtable/MemtableBenchmark.java
index 086a647..afbdc1a 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/memtable/MemtableBenchmark.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/memtable/MemtableBenchmark.java
@@ -20,7 +20,7 @@ package org.apache.iotdb.db.engine.memtable;
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.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import java.util.Collections;
@@ -49,7 +49,7 @@ public class MemtableBenchmark {
memTable.write(
deviceId,
Collections.singletonList(
- new UnaryMeasurementSchema(measurementId[j], tsDataType, TSEncoding.PLAIN)),
+ new MeasurementSchema(measurementId[j], tsDataType, TSEncoding.PLAIN)),
System.nanoTime(),
new Object[] {String.valueOf(System.currentTimeMillis())});
}
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTableTest.java b/server/src/test/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTableTest.java
index 6be17a0..bf3a250 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTableTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/memtable/PrimitiveMemTableTest.java
@@ -39,7 +39,7 @@ import org.apache.iotdb.tsfile.read.reader.IPointReader;
import org.apache.iotdb.tsfile.utils.Binary;
import org.apache.iotdb.tsfile.utils.TsPrimitiveType;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.junit.Assert;
import org.junit.Before;
@@ -65,7 +65,7 @@ public class PrimitiveMemTableTest {
public void memSeriesSortIteratorTest() throws IOException {
TSDataType dataType = TSDataType.INT32;
WritableMemChunk series =
- new WritableMemChunk(new UnaryMeasurementSchema("s1", dataType, TSEncoding.PLAIN));
+ new WritableMemChunk(new MeasurementSchema("s1", dataType, TSEncoding.PLAIN));
int count = 1000;
for (int i = 0; i < count; i++) {
series.write(i, i);
@@ -83,7 +83,7 @@ public class PrimitiveMemTableTest {
public void memSeriesToStringTest() throws IOException {
TSDataType dataType = TSDataType.INT32;
WritableMemChunk series =
- new WritableMemChunk(new UnaryMeasurementSchema("s1", dataType, TSEncoding.PLAIN));
+ new WritableMemChunk(new MeasurementSchema("s1", dataType, TSEncoding.PLAIN));
int count = 100;
for (int i = 0; i < count; i++) {
series.write(i, i);
@@ -120,7 +120,7 @@ public class PrimitiveMemTableTest {
memTable.write(
deviceId,
Collections.singletonList(
- new UnaryMeasurementSchema(measurementId[0], TSDataType.INT32, TSEncoding.PLAIN)),
+ new MeasurementSchema(measurementId[0], TSDataType.INT32, TSEncoding.PLAIN)),
dataSize - i - 1,
new Object[] {i + 10});
}
@@ -128,7 +128,7 @@ public class PrimitiveMemTableTest {
memTable.write(
deviceId,
Collections.singletonList(
- new UnaryMeasurementSchema(measurementId[0], TSDataType.INT32, TSEncoding.PLAIN)),
+ new MeasurementSchema(measurementId[0], TSDataType.INT32, TSEncoding.PLAIN)),
i,
new Object[] {i});
}
@@ -136,7 +136,7 @@ public class PrimitiveMemTableTest {
new MeasurementPath(
deviceId,
measurementId[0],
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
measurementId[0],
TSDataType.INT32,
TSEncoding.RLE,
@@ -165,7 +165,7 @@ public class PrimitiveMemTableTest {
for (TimeValuePair aRet : ret) {
memTable.write(
deviceId,
- Collections.singletonList(new UnaryMeasurementSchema(sensorId, dataType, encoding)),
+ Collections.singletonList(new MeasurementSchema(sensorId, dataType, encoding)),
aRet.getTimestamp(),
new Object[] {aRet.getValue().getValue()});
}
@@ -173,7 +173,7 @@ public class PrimitiveMemTableTest {
new MeasurementPath(
deviceId,
sensorId,
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
sensorId,
dataType,
encoding,
@@ -218,7 +218,7 @@ public class PrimitiveMemTableTest {
"root.sg.device5",
Collections.singletonList("sensor1"),
Collections.singletonList(
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"sensor1",
TSDataType.INT64,
TSEncoding.GORILLA,
@@ -237,13 +237,13 @@ public class PrimitiveMemTableTest {
"root.sg.device5",
Arrays.asList("sensor0", "sensor1"),
Arrays.asList(
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"sensor0",
TSDataType.BOOLEAN,
TSEncoding.PLAIN,
CompressionType.UNCOMPRESSED,
Collections.emptyMap()),
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"sensor1",
TSDataType.INT64,
TSEncoding.GORILLA,
@@ -348,10 +348,8 @@ public class PrimitiveMemTableTest {
String deviceId = "root.sg.device5";
IMeasurementMNode[] mNodes = new IMeasurementMNode[2];
- IMeasurementSchema schema0 =
- new UnaryMeasurementSchema(measurements[0], dataTypes[0], encodings[0]);
- IMeasurementSchema schema1 =
- new UnaryMeasurementSchema(measurements[1], dataTypes[1], encodings[1]);
+ IMeasurementSchema schema0 = new MeasurementSchema(measurements[0], dataTypes[0], encodings[0]);
+ IMeasurementSchema schema1 = new MeasurementSchema(measurements[1], dataTypes[1], encodings[1]);
mNodes[0] = MeasurementMNode.getMeasurementMNode(null, "sensor0", schema0, null);
mNodes[1] = MeasurementMNode.getMeasurementMNode(null, "sensor1", schema1, null);
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessorTest.java b/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessorTest.java
index f5fec46..230eeba 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessorTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessorTest.java
@@ -51,7 +51,7 @@ import org.apache.iotdb.tsfile.read.TimeValuePair;
import org.apache.iotdb.tsfile.read.reader.IPointReader;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Assert;
@@ -127,7 +127,7 @@ public class StorageGroupProcessorTest {
new MeasurementPath(
deviceId,
measurementId,
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
measurementId,
TSDataType.INT32,
TSEncoding.RLE,
@@ -218,10 +218,10 @@ public class StorageGroupProcessorTest {
IMeasurementMNode[] measurementMNodes = new IMeasurementMNode[2];
measurementMNodes[0] =
MeasurementMNode.getMeasurementMNode(
- null, "s0", new UnaryMeasurementSchema("s0", TSDataType.INT32, TSEncoding.PLAIN), null);
+ null, "s0", new MeasurementSchema("s0", TSDataType.INT32, TSEncoding.PLAIN), null);
measurementMNodes[1] =
MeasurementMNode.getMeasurementMNode(
- null, "s1", new UnaryMeasurementSchema("s1", TSDataType.INT64, TSEncoding.PLAIN), null);
+ null, "s1", new MeasurementSchema("s1", TSDataType.INT64, TSEncoding.PLAIN), null);
InsertTabletPlan insertTabletPlan1 =
new InsertTabletPlan(new PartialPath("root.vehicle.d0"), measurements, dataTypes);
@@ -366,10 +366,10 @@ public class StorageGroupProcessorTest {
IMeasurementMNode[] measurementMNodes = new IMeasurementMNode[2];
measurementMNodes[0] =
MeasurementMNode.getMeasurementMNode(
- null, "s0", new UnaryMeasurementSchema("s0", TSDataType.INT32, TSEncoding.PLAIN), null);
+ null, "s0", new MeasurementSchema("s0", TSDataType.INT32, TSEncoding.PLAIN), null);
measurementMNodes[1] =
MeasurementMNode.getMeasurementMNode(
- null, "s1", new UnaryMeasurementSchema("s1", TSDataType.INT64, TSEncoding.PLAIN), null);
+ null, "s1", new MeasurementSchema("s1", TSDataType.INT64, TSEncoding.PLAIN), null);
InsertTabletPlan insertTabletPlan1 =
new InsertTabletPlan(new PartialPath("root.vehicle.d0"), measurements, dataTypes);
@@ -447,10 +447,10 @@ public class StorageGroupProcessorTest {
IMeasurementMNode[] measurementMNodes = new IMeasurementMNode[2];
measurementMNodes[0] =
MeasurementMNode.getMeasurementMNode(
- null, "s0", new UnaryMeasurementSchema("s0", TSDataType.INT32, TSEncoding.PLAIN), null);
+ null, "s0", new MeasurementSchema("s0", TSDataType.INT32, TSEncoding.PLAIN), null);
measurementMNodes[1] =
MeasurementMNode.getMeasurementMNode(
- null, "s1", new UnaryMeasurementSchema("s1", TSDataType.INT64, TSEncoding.PLAIN), null);
+ null, "s1", new MeasurementSchema("s1", TSDataType.INT64, TSEncoding.PLAIN), null);
InsertTabletPlan insertTabletPlan1 =
new InsertTabletPlan(new PartialPath("root.vehicle.d0"), measurements, dataTypes);
@@ -528,10 +528,10 @@ public class StorageGroupProcessorTest {
IMeasurementMNode[] measurementMNodes = new IMeasurementMNode[2];
measurementMNodes[0] =
MeasurementMNode.getMeasurementMNode(
- null, "s0", new UnaryMeasurementSchema("s0", TSDataType.INT32, TSEncoding.PLAIN), null);
+ null, "s0", new MeasurementSchema("s0", TSDataType.INT32, TSEncoding.PLAIN), null);
measurementMNodes[1] =
MeasurementMNode.getMeasurementMNode(
- null, "s1", new UnaryMeasurementSchema("s1", TSDataType.INT64, TSEncoding.PLAIN), null);
+ null, "s1", new MeasurementSchema("s1", TSDataType.INT64, TSEncoding.PLAIN), null);
InsertTabletPlan insertTabletPlan1 =
new InsertTabletPlan(new PartialPath("root.vehicle.d0"), measurements, dataTypes);
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TTLTest.java b/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TTLTest.java
index bee794a..0c3d9d0 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TTLTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TTLTest.java
@@ -56,7 +56,7 @@ import org.apache.iotdb.tsfile.read.common.BatchData;
import org.apache.iotdb.tsfile.read.common.RowRecord;
import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet;
import org.apache.iotdb.tsfile.read.reader.IBatchReader;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
@@ -154,10 +154,7 @@ public class TTLTest {
plan.setMeasurementMNodes(
new IMeasurementMNode[] {
MeasurementMNode.getMeasurementMNode(
- null,
- "s1",
- new UnaryMeasurementSchema("s1", TSDataType.INT64, TSEncoding.PLAIN),
- null)
+ null, "s1", new MeasurementSchema("s1", TSDataType.INT64, TSEncoding.PLAIN), null)
});
plan.transferType();
@@ -190,10 +187,7 @@ public class TTLTest {
plan.setMeasurementMNodes(
new IMeasurementMNode[] {
MeasurementMNode.getMeasurementMNode(
- null,
- "s1",
- new UnaryMeasurementSchema("s1", TSDataType.INT64, TSEncoding.PLAIN),
- null)
+ null, "s1", new MeasurementSchema("s1", TSDataType.INT64, TSEncoding.PLAIN), null)
});
plan.transferType();
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessorTest.java b/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessorTest.java
index 7009b70..6091d2a 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessorTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessorTest.java
@@ -38,7 +38,7 @@ import org.apache.iotdb.tsfile.read.TimeValuePair;
import org.apache.iotdb.tsfile.read.reader.IPointReader;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.writer.RestorableTsFileIOWriter;
import org.junit.After;
@@ -111,7 +111,7 @@ public class TsFileProcessorTest {
new MeasurementPath(
deviceId,
measurementId,
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
measurementId, dataType, encoding, CompressionType.UNCOMPRESSED, props));
processor.query(fullPath, context, tsfileResourcesForQuery);
assertTrue(tsfileResourcesForQuery.isEmpty());
@@ -168,7 +168,7 @@ public class TsFileProcessorTest {
new MeasurementPath(
deviceId,
measurementId,
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
measurementId, dataType, encoding, CompressionType.UNCOMPRESSED, props));
processor.query(fullPath, context, tsfileResourcesForQuery);
assertTrue(tsfileResourcesForQuery.isEmpty());
@@ -255,7 +255,7 @@ public class TsFileProcessorTest {
new MeasurementPath(
deviceId,
measurementId,
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
measurementId, dataType, encoding, CompressionType.UNCOMPRESSED, props));
processor.query(fullPath, context, tsfileResourcesForQuery);
assertTrue(tsfileResourcesForQuery.isEmpty());
@@ -299,7 +299,7 @@ public class TsFileProcessorTest {
new MeasurementPath(
deviceId,
measurementId,
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
measurementId, dataType, encoding, CompressionType.UNCOMPRESSED, props));
processor.query(fullPath, context, tsfileResourcesForQuery);
assertTrue(tsfileResourcesForQuery.isEmpty());
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 c5c37b2..c5fd962 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
@@ -35,7 +35,7 @@ import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
import org.apache.iotdb.tsfile.write.record.datapoint.LongDataPoint;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.writer.TsFileIOWriter;
import org.junit.After;
@@ -125,7 +125,7 @@ public class IoTDBLoadExternalTsFileWithTimePartitionIT {
for (String measurement : measurements) {
tsFileWriter.registerTimeseries(
new Path(STORAGE_GROUP + DOT + deviceId),
- new UnaryMeasurementSchema(measurement, TSDataType.INT64, TSEncoding.RLE));
+ new MeasurementSchema(measurement, TSDataType.INT64, TSEncoding.RLE));
}
}
} catch (WriteProcessException e) {
diff --git a/server/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java b/server/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java
index d1227cc..a83e464 100644
--- a/server/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/metadata/MManagerBasicTest.java
@@ -45,7 +45,7 @@ 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 org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Assert;
@@ -866,8 +866,8 @@ public class MManagerBasicTest {
IMNode node = manager.getDeviceNode(new PartialPath("root.sg1.d1"));
node = manager.setUsingSchemaTemplate(node);
- UnaryMeasurementSchema s11 =
- new UnaryMeasurementSchema("s11", TSDataType.INT64, TSEncoding.RLE, CompressionType.SNAPPY);
+ MeasurementSchema s11 =
+ new MeasurementSchema("s11", TSDataType.INT64, TSEncoding.RLE, CompressionType.SNAPPY);
assertNotNull(node.getSchemaTemplate());
Set<String> allSchema = new HashSet<>();
diff --git a/server/src/test/java/org/apache/iotdb/db/metadata/TemplateTest.java b/server/src/test/java/org/apache/iotdb/db/metadata/TemplateTest.java
index 8400f6d..781b82e 100644
--- a/server/src/test/java/org/apache/iotdb/db/metadata/TemplateTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/metadata/TemplateTest.java
@@ -34,7 +34,7 @@ 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 org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
@@ -82,8 +82,8 @@ public class TemplateTest {
IMNode node = manager.getDeviceNode(new PartialPath("root.sg1.d1"));
node = manager.setUsingSchemaTemplate(node);
- UnaryMeasurementSchema s11 =
- new UnaryMeasurementSchema("s11", TSDataType.INT64, TSEncoding.RLE, CompressionType.SNAPPY);
+ MeasurementSchema s11 =
+ new MeasurementSchema("s11", TSDataType.INT64, TSEncoding.RLE, CompressionType.SNAPPY);
assertNotNull(node.getSchemaTemplate());
Set<IMeasurementSchema> allSchema =
diff --git a/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesAggregateReaderTest.java b/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesAggregateReaderTest.java
index 287022d..f6f2971 100644
--- a/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesAggregateReaderTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesAggregateReaderTest.java
@@ -33,7 +33,7 @@ import org.apache.iotdb.tsfile.exception.write.WriteProcessException;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics;
import org.apache.iotdb.tsfile.read.common.IBatchDataIterator;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
@@ -53,7 +53,7 @@ public class SeriesAggregateReaderTest {
private static final String SERIES_READER_TEST_SG = "root.seriesReaderTest";
private List<String> deviceIds = new ArrayList<>();
- private List<UnaryMeasurementSchema> measurementSchemas = new ArrayList<>();
+ private List<MeasurementSchema> measurementSchemas = new ArrayList<>();
private List<TsFileResource> seqResources = new ArrayList<>();
private List<TsFileResource> unseqResources = new ArrayList<>();
diff --git a/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderByTimestampTest.java b/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderByTimestampTest.java
index 0aeb568..bd5758c 100644
--- a/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderByTimestampTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderByTimestampTest.java
@@ -27,7 +27,7 @@ import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.db.utils.SchemaTestUtils;
import org.apache.iotdb.tsfile.exception.write.WriteProcessException;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Assert;
@@ -44,7 +44,7 @@ public class SeriesReaderByTimestampTest {
private static final String SERIES_READER_TEST_SG = "root.seriesReaderTest";
private List<String> deviceIds = new ArrayList<>();
- private List<UnaryMeasurementSchema> measurementSchemas = new ArrayList<>();
+ private List<MeasurementSchema> measurementSchemas = new ArrayList<>();
private List<TsFileResource> seqResources = new ArrayList<>();
private List<TsFileResource> unseqResources = new ArrayList<>();
diff --git a/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTest.java b/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTest.java
index 87d2d32..ed507f7 100644
--- a/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTest.java
@@ -30,7 +30,7 @@ import org.apache.iotdb.tsfile.read.TimeValuePair;
import org.apache.iotdb.tsfile.read.common.BatchData;
import org.apache.iotdb.tsfile.read.reader.IBatchReader;
import org.apache.iotdb.tsfile.read.reader.IPointReader;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
@@ -49,7 +49,7 @@ public class SeriesReaderTest {
private static final String SERIES_READER_TEST_SG = "root.seriesReaderTest";
private List<String> deviceIds = new ArrayList<>();
- private List<UnaryMeasurementSchema> measurementSchemas = new ArrayList<>();
+ private List<MeasurementSchema> measurementSchemas = new ArrayList<>();
private List<TsFileResource> seqResources = new ArrayList<>();
private List<TsFileResource> unseqResources = new ArrayList<>();
diff --git a/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTestUtil.java b/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTestUtil.java
index 9b50d67..d3c30b1 100644
--- a/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTestUtil.java
+++ b/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderTestUtil.java
@@ -36,7 +36,7 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.junit.Assert;
@@ -61,7 +61,7 @@ public class SeriesReaderTestUtil {
private static final String SERIES_READER_TEST_SG = "root.seriesReaderTest";
public static void setUp(
- List<UnaryMeasurementSchema> measurementSchemas,
+ List<MeasurementSchema> measurementSchemas,
List<String> deviceIds,
List<TsFileResource> seqResources,
List<TsFileResource> unseqResources)
@@ -86,7 +86,7 @@ public class SeriesReaderTestUtil {
private static void prepareFiles(
List<TsFileResource> seqResources,
List<TsFileResource> unseqResources,
- List<UnaryMeasurementSchema> measurementSchemas,
+ List<MeasurementSchema> measurementSchemas,
List<String> deviceIds)
throws IOException, WriteProcessException {
for (int i = 0; i < seqFileNum; i++) {
@@ -134,7 +134,7 @@ public class SeriesReaderTestUtil {
long timeOffset,
long ptNum,
long valueOffset,
- List<UnaryMeasurementSchema> measurementSchemas,
+ List<MeasurementSchema> measurementSchemas,
List<String> deviceIds)
throws IOException, WriteProcessException {
File file = tsFileResource.getTsFile();
@@ -142,8 +142,8 @@ public class SeriesReaderTestUtil {
Assert.assertTrue(file.getParentFile().mkdirs());
}
TsFileWriter fileWriter = new TsFileWriter(file);
- Map<String, UnaryMeasurementSchema> template = new HashMap<>();
- for (UnaryMeasurementSchema measurementSchema : measurementSchemas) {
+ Map<String, MeasurementSchema> template = new HashMap<>();
+ for (MeasurementSchema measurementSchema : measurementSchemas) {
template.put(measurementSchema.getMeasurementId(), measurementSchema);
}
fileWriter.registerSchemaTemplate("template0", template, false);
@@ -153,7 +153,7 @@ public class SeriesReaderTestUtil {
for (long i = timeOffset; i < timeOffset + ptNum; i++) {
for (String deviceId : deviceIds) {
TSRecord record = new TSRecord(i, deviceId);
- for (UnaryMeasurementSchema measurementSchema : measurementSchemas) {
+ for (MeasurementSchema measurementSchema : measurementSchemas) {
record.addTuple(
DataPoint.getDataPoint(
measurementSchema.getType(),
@@ -172,11 +172,10 @@ public class SeriesReaderTestUtil {
}
private static void prepareSeries(
- List<UnaryMeasurementSchema> measurementSchemas, List<String> deviceIds)
- throws MetadataException {
+ List<MeasurementSchema> measurementSchemas, List<String> deviceIds) throws MetadataException {
for (int i = 0; i < measurementNum; i++) {
measurementSchemas.add(
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"sensor" + i, TSDataType.INT32, encoding, CompressionType.UNCOMPRESSED));
}
for (int i = 0; i < deviceNum; i++) {
@@ -184,7 +183,7 @@ public class SeriesReaderTestUtil {
}
IoTDB.metaManager.setStorageGroup(new PartialPath(SERIES_READER_TEST_SG));
for (String device : deviceIds) {
- for (UnaryMeasurementSchema measurementSchema : measurementSchemas) {
+ for (MeasurementSchema measurementSchema : measurementSchemas) {
IoTDB.metaManager.createTimeseries(
new PartialPath(device + PATH_SEPARATOR + measurementSchema.getMeasurementId()),
measurementSchema.getType(),
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 4c04342..007f0d3 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
@@ -41,7 +41,7 @@ import org.apache.iotdb.tsfile.read.common.Path;
import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
@@ -67,7 +67,7 @@ public class ResourceManagerTest {
TSEncoding encoding = TSEncoding.PLAIN;
String[] deviceIds;
- UnaryMeasurementSchema[] measurementSchemas;
+ MeasurementSchema[] measurementSchemas;
List<TsFileResource> seqResources = new ArrayList<>();
List<TsFileResource> unseqResources = new ArrayList<>();
@@ -104,10 +104,10 @@ public class ResourceManagerTest {
}
void prepareSeries() throws MetadataException {
- measurementSchemas = new UnaryMeasurementSchema[measurementNum];
+ measurementSchemas = new MeasurementSchema[measurementNum];
for (int i = 0; i < measurementNum; i++) {
measurementSchemas[i] =
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"sensor" + i, TSDataType.DOUBLE, encoding, CompressionType.UNCOMPRESSED);
}
deviceIds = new String[deviceNum];
@@ -116,7 +116,7 @@ public class ResourceManagerTest {
}
IoTDB.metaManager.setStorageGroup(new PartialPath(RESOURCE_MANAGER_TEST_SG));
for (String device : deviceIds) {
- for (UnaryMeasurementSchema measurementSchema : measurementSchemas) {
+ for (MeasurementSchema measurementSchema : measurementSchemas) {
PartialPath devicePath = new PartialPath(device);
IoTDB.metaManager.createTimeseries(
devicePath.concatNode(measurementSchema.getMeasurementId()),
@@ -156,7 +156,7 @@ public class ResourceManagerTest {
throws IOException, WriteProcessException {
TsFileWriter fileWriter = new TsFileWriter(tsFileResource.getTsFile());
for (String deviceId : deviceIds) {
- for (UnaryMeasurementSchema measurementSchema : measurementSchemas) {
+ for (MeasurementSchema measurementSchema : measurementSchemas) {
fileWriter.registerTimeseries(new Path(deviceId), measurementSchema);
}
}
diff --git a/server/src/test/java/org/apache/iotdb/db/tools/TsFileAndModSettleToolTest.java b/server/src/test/java/org/apache/iotdb/db/tools/TsFileAndModSettleToolTest.java
index 1afb858..2f63520 100644
--- a/server/src/test/java/org/apache/iotdb/db/tools/TsFileAndModSettleToolTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/tools/TsFileAndModSettleToolTest.java
@@ -39,7 +39,7 @@ import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
import org.apache.iotdb.tsfile.write.record.datapoint.LongDataPoint;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.commons.io.FileUtils;
import org.junit.After;
@@ -210,8 +210,7 @@ public class TsFileAndModSettleToolTest {
String device = entry.getKey();
for (String sensor : entry.getValue()) {
tsFileWriter.registerTimeseries(
- new Path(device),
- new UnaryMeasurementSchema(sensor, TSDataType.INT64, TSEncoding.RLE));
+ new Path(device), new MeasurementSchema(sensor, TSDataType.INT64, TSEncoding.RLE));
}
}
} catch (WriteProcessException e) {
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 fc6c1f4..d4dd125 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
@@ -26,8 +26,8 @@ import org.apache.iotdb.tsfile.read.common.Path;
import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.Tablet;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.Schema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import org.apache.commons.io.FileUtils;
import org.junit.After;
@@ -78,13 +78,11 @@ public class TsFileSketchToolTest {
// add measurements into file schema (all with INT64 data type)
for (int i = 0; i < sensorNum; i++) {
IMeasurementSchema measurementSchema =
- new UnaryMeasurementSchema(
- sensorPrefix + (i + 1), TSDataType.INT64, TSEncoding.TS_2DIFF);
+ new MeasurementSchema(sensorPrefix + (i + 1), TSDataType.INT64, TSEncoding.TS_2DIFF);
measurementSchemas.add(measurementSchema);
schema.registerTimeseries(
new Path(device),
- new UnaryMeasurementSchema(
- sensorPrefix + (i + 1), TSDataType.INT64, TSEncoding.TS_2DIFF));
+ new MeasurementSchema(sensorPrefix + (i + 1), TSDataType.INT64, TSEncoding.TS_2DIFF));
}
// add measurements into TSFileWriter
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 864b4c0..69cb63d 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
@@ -48,7 +48,7 @@ import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
import org.apache.iotdb.tsfile.write.record.datapoint.LongDataPoint;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.commons.io.FileUtils;
import org.junit.After;
@@ -263,8 +263,7 @@ public class TsFileRewriteToolTest {
String device = entry.getKey();
for (String sensor : entry.getValue()) {
tsFileWriter.registerTimeseries(
- new Path(device),
- new UnaryMeasurementSchema(sensor, TSDataType.INT64, TSEncoding.RLE));
+ new Path(device), new MeasurementSchema(sensor, TSDataType.INT64, TSEncoding.RLE));
}
}
} catch (WriteProcessException e) {
@@ -304,8 +303,7 @@ public class TsFileRewriteToolTest {
String device = entry.getKey();
for (String sensor : entry.getValue()) {
tsFileWriter.registerTimeseries(
- new Path(device),
- new UnaryMeasurementSchema(sensor, TSDataType.INT64, TSEncoding.RLE));
+ new Path(device), new MeasurementSchema(sensor, TSDataType.INT64, TSEncoding.RLE));
}
}
} catch (WriteProcessException e) {
@@ -378,7 +376,7 @@ public class TsFileRewriteToolTest {
// add measurements into file schema
try {
tsFileWriter.registerTimeseries(
- new Path(device), new UnaryMeasurementSchema(sensor, TSDataType.INT64, TSEncoding.RLE));
+ new Path(device), new MeasurementSchema(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 a72a769..8d209de 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
@@ -37,8 +37,8 @@ import org.apache.iotdb.tsfile.read.common.Path;
import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.Schema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import org.apache.commons.io.FileUtils;
import org.junit.After;
@@ -70,7 +70,7 @@ public class DeviceStringTest {
schema = new Schema();
schema.registerTimeseries(
new Path("root.sg.device99"),
- new UnaryMeasurementSchema("sensor4", TSDataType.INT64, TSEncoding.PLAIN));
+ new MeasurementSchema("sensor4", TSDataType.INT64, TSEncoding.PLAIN));
mManager.createTimeseries(
new PartialPath("root.sg.device99.sensor4"),
TSDataType.INT64,
@@ -79,7 +79,7 @@ public class DeviceStringTest {
Collections.emptyMap());
schema.registerTimeseries(
new Path("root.sg.device99"),
- new UnaryMeasurementSchema("sensor2", TSDataType.INT64, TSEncoding.PLAIN));
+ new MeasurementSchema("sensor2", TSDataType.INT64, TSEncoding.PLAIN));
mManager.createTimeseries(
new PartialPath("root.sg.device99.sensor2"),
TSDataType.INT64,
@@ -88,7 +88,7 @@ public class DeviceStringTest {
Collections.emptyMap());
schema.registerTimeseries(
new Path(("root.sg.device99")),
- new UnaryMeasurementSchema("sensor1", TSDataType.INT64, TSEncoding.PLAIN));
+ new MeasurementSchema("sensor1", TSDataType.INT64, TSEncoding.PLAIN));
mManager.createTimeseries(
new PartialPath("root.sg.device99.sensor1"),
TSDataType.INT64,
diff --git a/server/src/test/java/org/apache/iotdb/db/writelog/recover/LogReplayerTest.java b/server/src/test/java/org/apache/iotdb/db/writelog/recover/LogReplayerTest.java
index 112e5bf..a7e4188 100644
--- a/server/src/test/java/org/apache/iotdb/db/writelog/recover/LogReplayerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/writelog/recover/LogReplayerTest.java
@@ -51,7 +51,7 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
import org.apache.iotdb.tsfile.read.TimeValuePair;
import org.apache.iotdb.tsfile.read.reader.IPointReader;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
@@ -168,7 +168,7 @@ public class LogReplayerTest {
new MeasurementPath(
"root.sg.device" + i,
"sensor" + i,
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"sensor" + i,
TSDataType.INT64,
TSEncoding.RLE,
@@ -204,7 +204,7 @@ public class LogReplayerTest {
new MeasurementPath(
"root.sg.device5",
"sensor" + i,
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"sensor" + i,
TSDataType.INT64,
TSEncoding.PLAIN,
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 1225cd8..b20ccaa 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
@@ -45,8 +45,8 @@ import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.Schema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import org.apache.commons.io.FileUtils;
import org.junit.After;
@@ -96,8 +96,8 @@ public class RecoverResourceFromReaderTest {
for (int j = 0; j < 10; j++) {
PartialPath path =
new PartialPath("root.sg.device" + i + IoTDBConstant.PATH_SEPARATOR + "sensor" + j);
- UnaryMeasurementSchema measurementSchema =
- new UnaryMeasurementSchema("sensor" + j, TSDataType.INT64, TSEncoding.PLAIN);
+ MeasurementSchema measurementSchema =
+ new MeasurementSchema("sensor" + j, TSDataType.INT64, TSEncoding.PLAIN);
schema.registerTimeseries(new Path(path.toTSFilePath().getDevice()), measurementSchema);
IoTDB.metaManager.createTimeseries(
path,
@@ -109,7 +109,7 @@ public class RecoverResourceFromReaderTest {
}
schema.registerTimeseries(
new Path(("root.sg.device99")),
- new UnaryMeasurementSchema("sensor4", TSDataType.INT64, TSEncoding.PLAIN));
+ new MeasurementSchema("sensor4", TSDataType.INT64, TSEncoding.PLAIN));
IoTDB.metaManager.createTimeseries(
new PartialPath("root.sg.device99.sensor4"),
TSDataType.INT64,
@@ -118,7 +118,7 @@ public class RecoverResourceFromReaderTest {
Collections.emptyMap());
schema.registerTimeseries(
new Path("root.sg.device99"),
- new UnaryMeasurementSchema("sensor2", TSDataType.INT64, TSEncoding.PLAIN));
+ new MeasurementSchema("sensor2", TSDataType.INT64, TSEncoding.PLAIN));
IoTDB.metaManager.createTimeseries(
new PartialPath("root.sg.device99.sensor2"),
TSDataType.INT64,
@@ -127,7 +127,7 @@ public class RecoverResourceFromReaderTest {
Collections.emptyMap());
schema.registerTimeseries(
new Path(("root.sg.device99")),
- new UnaryMeasurementSchema("sensor1", TSDataType.INT64, TSEncoding.PLAIN));
+ new MeasurementSchema("sensor1", TSDataType.INT64, TSEncoding.PLAIN));
IoTDB.metaManager.createTimeseries(
new PartialPath("root.sg.device99.sensor1"),
TSDataType.INT64,
diff --git a/server/src/test/java/org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java b/server/src/test/java/org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java
index 411764b..494dfb5 100644
--- a/server/src/test/java/org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java
@@ -52,8 +52,8 @@ import org.apache.iotdb.tsfile.utils.MeasurementGroup;
import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.Schema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import org.apache.iotdb.tsfile.write.writer.RestorableTsFileIOWriter;
import org.apache.commons.io.FileUtils;
@@ -135,11 +135,10 @@ public class SeqTsFileRecoverTest {
}
Schema schema = new Schema();
- Map<String, UnaryMeasurementSchema> template = new HashMap<>();
+ Map<String, MeasurementSchema> template = new HashMap<>();
for (int i = 0; i < 10; i++) {
template.put(
- "sensor" + i,
- new UnaryMeasurementSchema("sensor" + i, TSDataType.INT64, TSEncoding.PLAIN));
+ "sensor" + i, new MeasurementSchema("sensor" + i, TSDataType.INT64, TSEncoding.PLAIN));
}
MeasurementGroup group = new MeasurementGroup(false, template);
schema.registerSchemaTemplate("template1", group);
@@ -218,9 +217,8 @@ public class SeqTsFileRecoverTest {
}
Schema schema = new Schema();
- Map<String, UnaryMeasurementSchema> template = new HashMap<>();
- template.put(
- "sensor1", new UnaryMeasurementSchema("sensor1", TSDataType.INT64, TSEncoding.PLAIN));
+ Map<String, MeasurementSchema> template = new HashMap<>();
+ template.put("sensor1", new MeasurementSchema("sensor1", TSDataType.INT64, TSEncoding.PLAIN));
MeasurementGroup group = new MeasurementGroup(false, template);
schema.registerSchemaTemplate("template1", group);
for (int i = 0; i < 4; i++) {
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 3c80de0..196e201 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
@@ -55,8 +55,8 @@ import org.apache.iotdb.tsfile.read.reader.chunk.ChunkReader;
import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.Schema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import org.apache.commons.io.FileUtils;
import org.junit.After;
@@ -105,8 +105,8 @@ public class UnseqTsFileRecoverTest {
for (int j = 0; j < 10; j++) {
PartialPath path =
new PartialPath("root.sg.device" + i + IoTDBConstant.PATH_SEPARATOR + "sensor" + j);
- UnaryMeasurementSchema measurementSchema =
- new UnaryMeasurementSchema("sensor" + j, TSDataType.INT64, TSEncoding.PLAIN);
+ MeasurementSchema measurementSchema =
+ new MeasurementSchema("sensor" + j, TSDataType.INT64, TSEncoding.PLAIN);
schema.registerTimeseries(new Path(path.toTSFilePath().getDevice()), measurementSchema);
IoTDB.metaManager.createTimeseries(
path,
@@ -118,7 +118,7 @@ public class UnseqTsFileRecoverTest {
}
schema.registerTimeseries(
new Path(("root.sg.device99")),
- new UnaryMeasurementSchema("sensor4", TSDataType.INT64, TSEncoding.PLAIN));
+ new MeasurementSchema("sensor4", TSDataType.INT64, TSEncoding.PLAIN));
IoTDB.metaManager.createTimeseries(
new PartialPath("root.sg.device99.sensor4"),
TSDataType.INT64,
@@ -127,7 +127,7 @@ public class UnseqTsFileRecoverTest {
Collections.emptyMap());
schema.registerTimeseries(
new Path(("root.sg.device99")),
- new UnaryMeasurementSchema("sensor2", TSDataType.INT64, TSEncoding.PLAIN));
+ new MeasurementSchema("sensor2", TSDataType.INT64, TSEncoding.PLAIN));
IoTDB.metaManager.createTimeseries(
new PartialPath("root.sg.device99.sensor2"),
TSDataType.INT64,
@@ -136,7 +136,7 @@ public class UnseqTsFileRecoverTest {
Collections.emptyMap());
schema.registerTimeseries(
new Path(("root.sg.device99")),
- new UnaryMeasurementSchema("sensor1", TSDataType.INT64, TSEncoding.PLAIN));
+ new MeasurementSchema("sensor1", TSDataType.INT64, TSEncoding.PLAIN));
IoTDB.metaManager.createTimeseries(
new PartialPath("root.sg.device99.sensor1"),
TSDataType.INT64,
diff --git a/session/src/main/java/org/apache/iotdb/session/Session.java b/session/src/main/java/org/apache/iotdb/session/Session.java
index afe7f0d..644987a 100644
--- a/session/src/main/java/org/apache/iotdb/session/Session.java
+++ b/session/src/main/java/org/apache/iotdb/session/Session.java
@@ -56,7 +56,7 @@ import org.apache.iotdb.tsfile.utils.BitMap;
import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
import org.apache.iotdb.tsfile.write.record.Tablet;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -1885,7 +1885,7 @@ public class Session {
int columnIndex = 0;
for (int i = 0; i < tablet.getSchemas().size(); i++) {
IMeasurementSchema schema = tablet.getSchemas().get(i);
- if (schema instanceof UnaryMeasurementSchema) {
+ if (schema instanceof MeasurementSchema) {
tablet.values[columnIndex] = sortList(tablet.values[columnIndex], schema.getType(), index);
if (tablet.bitMaps != null && tablet.bitMaps[columnIndex] != null) {
tablet.bitMaps[columnIndex] = sortBitMap(tablet.bitMaps[columnIndex], index);
diff --git a/session/src/main/java/org/apache/iotdb/session/util/SessionUtils.java b/session/src/main/java/org/apache/iotdb/session/util/SessionUtils.java
index 4f27d06..ab593cd 100644
--- a/session/src/main/java/org/apache/iotdb/session/util/SessionUtils.java
+++ b/session/src/main/java/org/apache/iotdb/session/util/SessionUtils.java
@@ -26,7 +26,7 @@ import org.apache.iotdb.tsfile.utils.BitMap;
import org.apache.iotdb.tsfile.utils.BytesUtils;
import org.apache.iotdb.tsfile.write.record.Tablet;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -54,7 +54,7 @@ public class SessionUtils {
int indexOfValues = 0;
for (int i = 0; i < tablet.getSchemas().size(); i++) {
IMeasurementSchema schema = tablet.getSchemas().get(i);
- if (schema instanceof UnaryMeasurementSchema) {
+ if (schema instanceof MeasurementSchema) {
getValueBufferOfDataType(schema.getType(), tablet, indexOfValues, valueBuffer);
indexOfValues++;
} else {
diff --git a/session/src/test/java/org/apache/iotdb/session/IoTDBSessionComplexIT.java b/session/src/test/java/org/apache/iotdb/session/IoTDBSessionComplexIT.java
index c707282..b4294eb 100644
--- a/session/src/test/java/org/apache/iotdb/session/IoTDBSessionComplexIT.java
+++ b/session/src/test/java/org/apache/iotdb/session/IoTDBSessionComplexIT.java
@@ -34,7 +34,7 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
import org.apache.iotdb.tsfile.read.common.Field;
import org.apache.iotdb.tsfile.write.record.Tablet;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Assert;
@@ -218,9 +218,9 @@ public class IoTDBSessionComplexIT {
createTimeseries();
List<IMeasurementSchema> schemaList = new ArrayList<>();
- schemaList.add(new UnaryMeasurementSchema("s1", TSDataType.INT64, TSEncoding.RLE));
- schemaList.add(new UnaryMeasurementSchema("s2", TSDataType.INT64, TSEncoding.RLE));
- schemaList.add(new UnaryMeasurementSchema("s3", TSDataType.INT64, TSEncoding.RLE));
+ schemaList.add(new MeasurementSchema("s1", TSDataType.INT64, TSEncoding.RLE));
+ schemaList.add(new MeasurementSchema("s2", TSDataType.INT64, TSEncoding.RLE));
+ schemaList.add(new MeasurementSchema("s3", TSDataType.INT64, TSEncoding.RLE));
Tablet tablet = new Tablet("root.sg1.d1", schemaList, 100);
@@ -491,9 +491,9 @@ public class IoTDBSessionComplexIT {
}
List<IMeasurementSchema> schemaList = new ArrayList<>();
- schemaList.add(new UnaryMeasurementSchema("s1", TSDataType.INT64, TSEncoding.RLE));
- schemaList.add(new UnaryMeasurementSchema("s2", TSDataType.INT64, TSEncoding.RLE));
- schemaList.add(new UnaryMeasurementSchema("s3", TSDataType.INT64, TSEncoding.RLE));
+ schemaList.add(new MeasurementSchema("s1", TSDataType.INT64, TSEncoding.RLE));
+ schemaList.add(new MeasurementSchema("s2", TSDataType.INT64, TSEncoding.RLE));
+ schemaList.add(new MeasurementSchema("s3", TSDataType.INT64, TSEncoding.RLE));
Tablet tablet = new Tablet(deviceId, schemaList, 200);
long[] timestamps = tablet.timestamps;
@@ -631,9 +631,9 @@ public class IoTDBSessionComplexIT {
throws IoTDBConnectionException, StatementExecutionException {
List<IMeasurementSchema> schemaList = new ArrayList<>();
- schemaList.add(new UnaryMeasurementSchema("s1", TSDataType.INT64, TSEncoding.RLE));
- schemaList.add(new UnaryMeasurementSchema("s2", TSDataType.INT64, TSEncoding.RLE));
- schemaList.add(new UnaryMeasurementSchema("s3", TSDataType.INT64, TSEncoding.RLE));
+ schemaList.add(new MeasurementSchema("s1", TSDataType.INT64, TSEncoding.RLE));
+ schemaList.add(new MeasurementSchema("s2", TSDataType.INT64, TSEncoding.RLE));
+ schemaList.add(new MeasurementSchema("s3", TSDataType.INT64, TSEncoding.RLE));
Tablet tablet = new Tablet(deviceId, schemaList, 100);
diff --git a/session/src/test/java/org/apache/iotdb/session/IoTDBSessionDisableMemControlIT.java b/session/src/test/java/org/apache/iotdb/session/IoTDBSessionDisableMemControlIT.java
index a2bff7f..363225e 100644
--- a/session/src/test/java/org/apache/iotdb/session/IoTDBSessionDisableMemControlIT.java
+++ b/session/src/test/java/org/apache/iotdb/session/IoTDBSessionDisableMemControlIT.java
@@ -31,7 +31,7 @@ import org.apache.iotdb.tsfile.read.common.RowRecord;
import org.apache.iotdb.tsfile.utils.Binary;
import org.apache.iotdb.tsfile.write.record.Tablet;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Assert;
@@ -83,9 +83,9 @@ public class IoTDBSessionDisableMemControlIT {
"root.sg.d.s3", TSDataType.INT64, TSEncoding.RLE, CompressionType.SNAPPY);
}
List<IMeasurementSchema> schemaList = new ArrayList<>();
- schemaList.add(new UnaryMeasurementSchema("s1", TSDataType.INT64));
- schemaList.add(new UnaryMeasurementSchema("s2", TSDataType.DOUBLE));
- schemaList.add(new UnaryMeasurementSchema("s3", TSDataType.TEXT));
+ schemaList.add(new MeasurementSchema("s1", TSDataType.INT64));
+ schemaList.add(new MeasurementSchema("s2", TSDataType.DOUBLE));
+ schemaList.add(new MeasurementSchema("s3", TSDataType.TEXT));
Tablet tablet = new Tablet("root.sg.d", schemaList, 10);
@@ -155,9 +155,9 @@ public class IoTDBSessionDisableMemControlIT {
session.createAlignedTimeseries(
"root.sg.d", multiMeasurementComponents, dataTypes, encodings, compressors, null);
List<IMeasurementSchema> schemaList = new ArrayList<>();
- schemaList.add(new UnaryMeasurementSchema("s1", TSDataType.INT64));
- schemaList.add(new UnaryMeasurementSchema("s2", TSDataType.DOUBLE));
- schemaList.add(new UnaryMeasurementSchema("s3", TSDataType.TEXT));
+ schemaList.add(new MeasurementSchema("s1", TSDataType.INT64));
+ schemaList.add(new MeasurementSchema("s2", TSDataType.DOUBLE));
+ schemaList.add(new MeasurementSchema("s3", TSDataType.TEXT));
Tablet tablet = new Tablet("root.sg.d", schemaList, 10);
diff --git a/session/src/test/java/org/apache/iotdb/session/IoTDBSessionSimpleIT.java b/session/src/test/java/org/apache/iotdb/session/IoTDBSessionSimpleIT.java
index 961eadf..1569f38 100644
--- a/session/src/test/java/org/apache/iotdb/session/IoTDBSessionSimpleIT.java
+++ b/session/src/test/java/org/apache/iotdb/session/IoTDBSessionSimpleIT.java
@@ -44,7 +44,7 @@ import org.apache.iotdb.tsfile.utils.Binary;
import org.apache.iotdb.tsfile.utils.BitMap;
import org.apache.iotdb.tsfile.write.record.Tablet;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.commons.lang3.StringUtils;
import org.junit.After;
@@ -124,9 +124,9 @@ public class IoTDBSessionSimpleIT {
session.open();
List<IMeasurementSchema> schemaList = new ArrayList<>();
- schemaList.add(new UnaryMeasurementSchema("s1", TSDataType.INT64));
- schemaList.add(new UnaryMeasurementSchema("s2", TSDataType.DOUBLE));
- schemaList.add(new UnaryMeasurementSchema("s3", TSDataType.TEXT));
+ schemaList.add(new MeasurementSchema("s1", TSDataType.INT64));
+ schemaList.add(new MeasurementSchema("s2", TSDataType.DOUBLE));
+ schemaList.add(new MeasurementSchema("s3", TSDataType.TEXT));
Tablet tablet = new Tablet("root.sg.d", schemaList, 10);
@@ -389,9 +389,9 @@ public class IoTDBSessionSimpleIT {
session = new Session("127.0.0.1", 6667, "root", "root");
session.open();
List<IMeasurementSchema> schemaList = new ArrayList<>();
- schemaList.add(new UnaryMeasurementSchema("s1", TSDataType.INT64));
- schemaList.add(new UnaryMeasurementSchema("s2", TSDataType.INT32));
- schemaList.add(new UnaryMeasurementSchema("s3", TSDataType.TEXT));
+ schemaList.add(new MeasurementSchema("s1", TSDataType.INT64));
+ schemaList.add(new MeasurementSchema("s2", TSDataType.INT32));
+ schemaList.add(new MeasurementSchema("s3", TSDataType.TEXT));
Tablet tablet = new Tablet("root.sg1.d1", schemaList);
tablet.setAligned(true);
@@ -428,12 +428,12 @@ public class IoTDBSessionSimpleIT {
session = new Session("127.0.0.1", 6667, "root", "root");
session.open();
List<IMeasurementSchema> schemaList = new ArrayList<>();
- schemaList.add(new UnaryMeasurementSchema("s0", TSDataType.DOUBLE, TSEncoding.RLE));
- schemaList.add(new UnaryMeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
- schemaList.add(new UnaryMeasurementSchema("s2", TSDataType.INT64, TSEncoding.RLE));
- schemaList.add(new UnaryMeasurementSchema("s3", TSDataType.INT32, TSEncoding.RLE));
- schemaList.add(new UnaryMeasurementSchema("s4", TSDataType.BOOLEAN, TSEncoding.RLE));
- schemaList.add(new UnaryMeasurementSchema("s5", TSDataType.TEXT, TSEncoding.RLE));
+ schemaList.add(new MeasurementSchema("s0", TSDataType.DOUBLE, TSEncoding.RLE));
+ schemaList.add(new MeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
+ schemaList.add(new MeasurementSchema("s2", TSDataType.INT64, TSEncoding.RLE));
+ schemaList.add(new MeasurementSchema("s3", TSDataType.INT32, TSEncoding.RLE));
+ schemaList.add(new MeasurementSchema("s4", TSDataType.BOOLEAN, TSEncoding.RLE));
+ schemaList.add(new MeasurementSchema("s5", TSDataType.TEXT, TSEncoding.RLE));
Tablet tablet = new Tablet("root.sg1.d1", schemaList);
for (long time = 0; time < 10; time++) {
@@ -888,8 +888,8 @@ public class IoTDBSessionSimpleIT {
new Tablet(
deviceId,
Arrays.asList(
- new UnaryMeasurementSchema("s1", TSDataType.INT32),
- new UnaryMeasurementSchema("s2", TSDataType.FLOAT)),
+ new MeasurementSchema("s1", TSDataType.INT32),
+ new MeasurementSchema("s2", TSDataType.FLOAT)),
5);
long ts = 7L;
for (long row = 0; row < 8; row++) {
@@ -917,15 +917,15 @@ public class IoTDBSessionSimpleIT {
new Tablet(
deviceId,
Arrays.asList(
- new UnaryMeasurementSchema("s1", TSDataType.INT32),
- new UnaryMeasurementSchema("s2", TSDataType.FLOAT)),
+ new MeasurementSchema("s1", TSDataType.INT32),
+ new MeasurementSchema("s2", TSDataType.FLOAT)),
5);
Tablet tablet2 =
new Tablet(
"root.sg.d2",
Arrays.asList(
- new UnaryMeasurementSchema("s1", TSDataType.INT32),
- new UnaryMeasurementSchema("s2", TSDataType.FLOAT)),
+ new MeasurementSchema("s1", TSDataType.INT32),
+ new MeasurementSchema("s2", TSDataType.FLOAT)),
5);
HashMap<String, Tablet> tablets = new HashMap<>();
tablets.put(deviceId, tablet1);
@@ -1191,8 +1191,8 @@ public class IoTDBSessionSimpleIT {
// insert tablets
List<IMeasurementSchema> schemaList = new ArrayList<>();
- schemaList.add(new UnaryMeasurementSchema("x", TSDataType.FLOAT));
- schemaList.add(new UnaryMeasurementSchema("y", TSDataType.FLOAT));
+ schemaList.add(new MeasurementSchema("x", TSDataType.FLOAT));
+ schemaList.add(new MeasurementSchema("y", TSDataType.FLOAT));
Tablet tablet = new Tablet("root.sg.loc1.sector", schemaList);
tablet.setAligned(true);
@@ -1319,9 +1319,9 @@ public class IoTDBSessionSimpleIT {
"root.sg.d.s3", TSDataType.INT64, TSEncoding.RLE, CompressionType.SNAPPY);
}
List<IMeasurementSchema> schemaList = new ArrayList<>();
- schemaList.add(new UnaryMeasurementSchema("s1", TSDataType.INT64));
- schemaList.add(new UnaryMeasurementSchema("s2", TSDataType.DOUBLE));
- schemaList.add(new UnaryMeasurementSchema("s3", TSDataType.TEXT));
+ schemaList.add(new MeasurementSchema("s1", TSDataType.INT64));
+ schemaList.add(new MeasurementSchema("s2", TSDataType.DOUBLE));
+ schemaList.add(new MeasurementSchema("s3", TSDataType.TEXT));
Tablet tablet = new Tablet("root.sg.d", schemaList, 10);
diff --git a/session/src/test/java/org/apache/iotdb/session/IoTDBSessionVectorAggregationIT.java b/session/src/test/java/org/apache/iotdb/session/IoTDBSessionVectorAggregationIT.java
index 3bbd7d9..2ffc62f 100644
--- a/session/src/test/java/org/apache/iotdb/session/IoTDBSessionVectorAggregationIT.java
+++ b/session/src/test/java/org/apache/iotdb/session/IoTDBSessionVectorAggregationIT.java
@@ -28,7 +28,7 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.read.common.RowRecord;
import org.apache.iotdb.tsfile.write.record.Tablet;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -217,8 +217,8 @@ public class IoTDBSessionVectorAggregationIT {
// The schema of measurements of one device
// only measurementId and data type in MeasurementSchema take effects in Tablet
List<IMeasurementSchema> schemaList = new ArrayList<>();
- schemaList.add(new UnaryMeasurementSchema("s1", TSDataType.INT64));
- schemaList.add(new UnaryMeasurementSchema("s2", TSDataType.INT32));
+ schemaList.add(new MeasurementSchema("s1", TSDataType.INT64));
+ schemaList.add(new MeasurementSchema("s2", TSDataType.INT32));
Tablet tablet = new Tablet(ROOT_SG1_D1_VECTOR1, schemaList);
tablet.setAligned(true);
diff --git a/session/src/test/java/org/apache/iotdb/session/IoTDBSessionVectorInsertIT.java b/session/src/test/java/org/apache/iotdb/session/IoTDBSessionVectorInsertIT.java
index 808a79b..44f7aa7 100644
--- a/session/src/test/java/org/apache/iotdb/session/IoTDBSessionVectorInsertIT.java
+++ b/session/src/test/java/org/apache/iotdb/session/IoTDBSessionVectorInsertIT.java
@@ -31,7 +31,7 @@ import org.apache.iotdb.tsfile.read.common.RowRecord;
import org.apache.iotdb.tsfile.utils.Binary;
import org.apache.iotdb.tsfile.write.record.Tablet;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Assert;
@@ -269,8 +269,8 @@ public class IoTDBSessionVectorInsertIT {
// The schema of measurements of one device
// only measurementId and data type in MeasurementSchema take effects in Tablet
List<IMeasurementSchema> schemaList = new ArrayList<>();
- schemaList.add(new UnaryMeasurementSchema("s1", TSDataType.INT64));
- schemaList.add(new UnaryMeasurementSchema("s2", TSDataType.INT32));
+ schemaList.add(new MeasurementSchema("s1", TSDataType.INT64));
+ schemaList.add(new MeasurementSchema("s2", TSDataType.INT32));
Tablet tablet = new Tablet(ROOT_SG1_D1_VECTOR1, schemaList);
tablet.setAligned(true);
@@ -470,9 +470,9 @@ public class IoTDBSessionVectorInsertIT {
session.createAlignedTimeseries(
"root.sg.d", multiMeasurementComponents, dataTypes, encodings, compressors, null);
List<IMeasurementSchema> schemaList = new ArrayList<>();
- schemaList.add(new UnaryMeasurementSchema("s1", TSDataType.INT64));
- schemaList.add(new UnaryMeasurementSchema("s2", TSDataType.DOUBLE));
- schemaList.add(new UnaryMeasurementSchema("s3", TSDataType.TEXT));
+ schemaList.add(new MeasurementSchema("s1", TSDataType.INT64));
+ schemaList.add(new MeasurementSchema("s2", TSDataType.DOUBLE));
+ schemaList.add(new MeasurementSchema("s3", TSDataType.TEXT));
Tablet tablet = new Tablet("root.sg.d", schemaList, 10);
diff --git a/session/src/test/java/org/apache/iotdb/session/SessionCacheLeaderUT.java b/session/src/test/java/org/apache/iotdb/session/SessionCacheLeaderUT.java
index 963ee5d..8f8dc03 100644
--- a/session/src/test/java/org/apache/iotdb/session/SessionCacheLeaderUT.java
+++ b/session/src/test/java/org/apache/iotdb/session/SessionCacheLeaderUT.java
@@ -33,7 +33,7 @@ import org.apache.iotdb.service.rpc.thrift.TSInsertTabletsReq;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.write.record.Tablet;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.junit.Assert;
import org.junit.Test;
@@ -537,9 +537,9 @@ public class SessionCacheLeaderUT {
String deviceId = "root.sg2.d2";
List<IMeasurementSchema> schemaList = new ArrayList<>();
- schemaList.add(new UnaryMeasurementSchema("s1", TSDataType.INT64));
- schemaList.add(new UnaryMeasurementSchema("s2", TSDataType.INT64));
- schemaList.add(new UnaryMeasurementSchema("s3", TSDataType.INT64));
+ schemaList.add(new MeasurementSchema("s1", TSDataType.INT64));
+ schemaList.add(new MeasurementSchema("s2", TSDataType.INT64));
+ schemaList.add(new MeasurementSchema("s3", TSDataType.INT64));
Tablet tablet = new Tablet(deviceId, schemaList, 100);
long timestamp = System.currentTimeMillis();
for (long row = 0; row < 100; row++) {
@@ -619,9 +619,9 @@ public class SessionCacheLeaderUT {
}
};
List<IMeasurementSchema> schemaList = new ArrayList<>();
- schemaList.add(new UnaryMeasurementSchema("s1", TSDataType.INT64));
- schemaList.add(new UnaryMeasurementSchema("s2", TSDataType.INT64));
- schemaList.add(new UnaryMeasurementSchema("s3", TSDataType.INT64));
+ schemaList.add(new MeasurementSchema("s1", TSDataType.INT64));
+ schemaList.add(new MeasurementSchema("s2", TSDataType.INT64));
+ schemaList.add(new MeasurementSchema("s3", TSDataType.INT64));
Tablet tablet1 = new Tablet(allDeviceIds.get(1), schemaList, 100);
Tablet tablet2 = new Tablet(allDeviceIds.get(2), schemaList, 100);
@@ -886,9 +886,9 @@ public class SessionCacheLeaderUT {
}
};
List<IMeasurementSchema> schemaList = new ArrayList<>();
- schemaList.add(new UnaryMeasurementSchema("s1", TSDataType.INT64));
- schemaList.add(new UnaryMeasurementSchema("s2", TSDataType.INT64));
- schemaList.add(new UnaryMeasurementSchema("s3", TSDataType.INT64));
+ schemaList.add(new MeasurementSchema("s1", TSDataType.INT64));
+ schemaList.add(new MeasurementSchema("s2", TSDataType.INT64));
+ schemaList.add(new MeasurementSchema("s3", TSDataType.INT64));
Tablet tablet1 = new Tablet(allDeviceIds.get(1), schemaList, 100);
Tablet tablet2 = new Tablet(allDeviceIds.get(2), schemaList, 100);
diff --git a/session/src/test/java/org/apache/iotdb/session/SessionTest.java b/session/src/test/java/org/apache/iotdb/session/SessionTest.java
index 08ab917..da22d11 100644
--- a/session/src/test/java/org/apache/iotdb/session/SessionTest.java
+++ b/session/src/test/java/org/apache/iotdb/session/SessionTest.java
@@ -33,7 +33,7 @@ import org.apache.iotdb.tsfile.read.common.RowRecord;
import org.apache.iotdb.tsfile.utils.Binary;
import org.apache.iotdb.tsfile.write.record.Tablet;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Assert;
@@ -79,7 +79,7 @@ public class SessionTest {
*/
session = new Session("127.0.0.1", 6667, "root", "root", null);
List<IMeasurementSchema> schemaList = new ArrayList<>();
- schemaList.add(new UnaryMeasurementSchema("s1", TSDataType.INT64, TSEncoding.RLE));
+ schemaList.add(new MeasurementSchema("s1", TSDataType.INT64, TSEncoding.RLE));
// insert three rows data
Tablet tablet = new Tablet("root.sg1.d1", schemaList, 3);
long[] timestamps = tablet.timestamps;
@@ -145,10 +145,10 @@ public class SessionTest {
deviceId + ".s4", TSDataType.DOUBLE, TSEncoding.RLE, CompressionType.UNCOMPRESSED);
List<IMeasurementSchema> schemaList = new ArrayList<>();
- schemaList.add(new UnaryMeasurementSchema("s1", TSDataType.INT64, TSEncoding.RLE));
- schemaList.add(new UnaryMeasurementSchema("s2", TSDataType.DOUBLE, TSEncoding.RLE));
- schemaList.add(new UnaryMeasurementSchema("s3", TSDataType.TEXT, TSEncoding.PLAIN));
- schemaList.add(new UnaryMeasurementSchema("s4", TSDataType.INT64, TSEncoding.PLAIN));
+ schemaList.add(new MeasurementSchema("s1", TSDataType.INT64, TSEncoding.RLE));
+ schemaList.add(new MeasurementSchema("s2", TSDataType.DOUBLE, TSEncoding.RLE));
+ schemaList.add(new MeasurementSchema("s3", TSDataType.TEXT, TSEncoding.PLAIN));
+ schemaList.add(new MeasurementSchema("s4", TSDataType.INT64, TSEncoding.PLAIN));
Tablet tablet = new Tablet("root.sg1.d1", schemaList, 10);
diff --git a/spark-tsfile/src/main/scala/org/apache/iotdb/spark/tsfile/NarrowConverter.scala b/spark-tsfile/src/main/scala/org/apache/iotdb/spark/tsfile/NarrowConverter.scala
index bec0e21..2af440b 100644
--- a/spark-tsfile/src/main/scala/org/apache/iotdb/spark/tsfile/NarrowConverter.scala
+++ b/spark-tsfile/src/main/scala/org/apache/iotdb/spark/tsfile/NarrowConverter.scala
@@ -36,7 +36,7 @@ import org.apache.iotdb.tsfile.read.expression.{IExpression, QueryExpression}
import org.apache.iotdb.tsfile.read.filter.{TimeFilter, ValueFilter}
import org.apache.iotdb.tsfile.write.record.TSRecord
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint
-import org.apache.iotdb.tsfile.write.schema.{IMeasurementSchema, UnaryMeasurementSchema, Schema}
+import org.apache.iotdb.tsfile.write.schema.{IMeasurementSchema, MeasurementSchema, Schema}
import org.apache.spark.sql.catalyst.InternalRow
import org.apache.spark.sql.sources._
import org.apache.spark.sql.types._
@@ -527,7 +527,7 @@ object NarrowConverter extends Converter {
* @param options encoding options
* @return MeasurementSchema
*/
- def getSeriesSchema(field: StructField, options: Map[String, String]): UnaryMeasurementSchema = {
+ def getSeriesSchema(field: StructField, options: Map[String, String]): MeasurementSchema = {
val dataType = getTsDataType(field.dataType)
val encodingStr = dataType match {
case TSDataType.BOOLEAN => options.getOrElse(QueryConstant.BOOLEAN, TSEncoding.PLAIN.toString)
@@ -539,7 +539,7 @@ object NarrowConverter extends Converter {
case other => throw new UnsupportedOperationException(s"Unsupported type $other")
}
val encoding = TSEncoding.valueOf(encodingStr)
- new UnaryMeasurementSchema(field.name, dataType, encoding)
+ new MeasurementSchema(field.name, dataType, encoding)
}
/**
diff --git a/spark-tsfile/src/main/scala/org/apache/iotdb/spark/tsfile/WideConverter.scala b/spark-tsfile/src/main/scala/org/apache/iotdb/spark/tsfile/WideConverter.scala
index 697e880..945ff17 100755
--- a/spark-tsfile/src/main/scala/org/apache/iotdb/spark/tsfile/WideConverter.scala
+++ b/spark-tsfile/src/main/scala/org/apache/iotdb/spark/tsfile/WideConverter.scala
@@ -35,7 +35,7 @@ import org.apache.iotdb.tsfile.read.filter.{TimeFilter, ValueFilter}
import org.apache.iotdb.tsfile.utils.Binary
import org.apache.iotdb.tsfile.write.record.TSRecord
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint
-import org.apache.iotdb.tsfile.write.schema.{IMeasurementSchema, UnaryMeasurementSchema, Schema}
+import org.apache.iotdb.tsfile.write.schema.{IMeasurementSchema, MeasurementSchema, Schema}
import org.apache.spark.sql.catalyst.InternalRow
import org.apache.spark.sql.sources._
import org.apache.spark.sql.types._
@@ -422,7 +422,7 @@ object WideConverter extends Converter {
* @param options encoding options
* @return MeasurementSchema
*/
- def getSeriesSchema(field: StructField, options: Map[String, String]): UnaryMeasurementSchema = {
+ def getSeriesSchema(field: StructField, options: Map[String, String]): MeasurementSchema = {
val dataType = getTsDataType(field.dataType)
val encodingStr = dataType match {
case TSDataType.BOOLEAN => options.getOrElse(QueryConstant.BOOLEAN, TSEncoding.PLAIN.toString)
@@ -436,7 +436,7 @@ object WideConverter extends Converter {
val encoding = TSEncoding.valueOf(encodingStr)
val fullPath = new Path(field.name, true)
val measurement = fullPath.getMeasurement
- new UnaryMeasurementSchema(measurement, dataType, encoding)
+ new MeasurementSchema(measurement, dataType, encoding)
}
/**
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 7b8154d..dd7088d 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
@@ -30,7 +30,7 @@ import org.apache.iotdb.tsfile.write.record.datapoint.BooleanDataPoint;
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.StringDataPoint;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
/** Write an example TsFile as shown in README. */
public class TsFileExample {
@@ -45,16 +45,16 @@ public class TsFileExample {
// add measurements into file schema
tsFileWriter.registerTimeseries(
new Path("root.ln.wf01.wt01"),
- new UnaryMeasurementSchema("status", TSDataType.BOOLEAN, TSEncoding.PLAIN));
+ new MeasurementSchema("status", TSDataType.BOOLEAN, TSEncoding.PLAIN));
tsFileWriter.registerTimeseries(
new Path("root.ln.wf01.wt01"),
- new UnaryMeasurementSchema("temperature", TSDataType.FLOAT, TSEncoding.RLE));
+ new MeasurementSchema("temperature", TSDataType.FLOAT, TSEncoding.RLE));
tsFileWriter.registerTimeseries(
new Path("root.ln.wf02.wt02"),
- new UnaryMeasurementSchema("temperature", TSDataType.FLOAT, TSEncoding.RLE));
+ new MeasurementSchema("temperature", TSDataType.FLOAT, TSEncoding.RLE));
tsFileWriter.registerTimeseries(
new Path("root.ln.wf02.wt02"),
- new UnaryMeasurementSchema("hardware", TSDataType.TEXT, TSEncoding.PLAIN));
+ new MeasurementSchema("hardware", TSDataType.TEXT, TSEncoding.PLAIN));
// construct TSRecord
TSRecord tsRecord = new TSRecord(1, "root.ln.wf01.wt01");
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 a521818..fa30e4d 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
@@ -32,7 +32,7 @@ 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.Schema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
/** An example of writing data to TsFile */
public class TsFileWriteTool {
@@ -48,13 +48,13 @@ public class TsFileWriteTool {
Schema schema = new Schema();
schema.extendTemplate(
- DEFAULT_TEMPLATE, new UnaryMeasurementSchema("sensor_1", TSDataType.FLOAT, TSEncoding.RLE));
+ DEFAULT_TEMPLATE, new MeasurementSchema("sensor_1", TSDataType.FLOAT, TSEncoding.RLE));
schema.extendTemplate(
DEFAULT_TEMPLATE,
- new UnaryMeasurementSchema("sensor_2", TSDataType.INT32, TSEncoding.TS_2DIFF));
+ new MeasurementSchema("sensor_2", TSDataType.INT32, TSEncoding.TS_2DIFF));
schema.extendTemplate(
DEFAULT_TEMPLATE,
- new UnaryMeasurementSchema("sensor_3", TSDataType.INT32, TSEncoding.TS_2DIFF));
+ new MeasurementSchema("sensor_3", TSDataType.INT32, TSEncoding.TS_2DIFF));
TsFileWriter tsFileWriter = new TsFileWriter(f, schema);
@@ -151,7 +151,7 @@ public class TsFileWriteTool {
// add measurements into file schema
tsFileWriter.registerTimeseries(
new Path("device_1"),
- new UnaryMeasurementSchema("sensor_1", TSDataType.FLOAT, TSEncoding.RLE));
+ new MeasurementSchema("sensor_1", TSDataType.FLOAT, TSEncoding.RLE));
for (long i = 0; i < largeNum; i++) {
// construct TSRecord
TSRecord tsRecord = new TSRecord(i, "device_1");
@@ -176,10 +176,10 @@ public class TsFileWriteTool {
// create2 function, despite their names are the same.
tsFileWriter.registerTimeseries(
new Path("device_1"),
- new UnaryMeasurementSchema("sensor_1", TSDataType.BOOLEAN, TSEncoding.RLE));
+ new MeasurementSchema("sensor_1", TSDataType.BOOLEAN, TSEncoding.RLE));
tsFileWriter.registerTimeseries(
new Path("device_1"),
- new UnaryMeasurementSchema("sensor_2", TSDataType.TEXT, TSEncoding.PLAIN));
+ new MeasurementSchema("sensor_2", TSDataType.TEXT, TSEncoding.PLAIN));
// construct TSRecord
TSRecord tsRecord = new TSRecord(1, "device_1");
@@ -246,16 +246,16 @@ public class TsFileWriteTool {
tsFileWriter.registerTimeseries(
new Path("device_1"),
- new UnaryMeasurementSchema("sensor_1", TSDataType.INT32, TSEncoding.RLE));
+ new MeasurementSchema("sensor_1", TSDataType.INT32, TSEncoding.RLE));
tsFileWriter.registerTimeseries(
new Path("device_2"),
- new UnaryMeasurementSchema("sensor_1", TSDataType.INT32, TSEncoding.RLE));
+ new MeasurementSchema("sensor_1", TSDataType.INT32, TSEncoding.RLE));
tsFileWriter.registerTimeseries(
new Path("device_2"),
- new UnaryMeasurementSchema("sensor_2", TSDataType.FLOAT, TSEncoding.RLE));
+ new MeasurementSchema("sensor_2", TSDataType.FLOAT, TSEncoding.RLE));
tsFileWriter.registerTimeseries(
new Path("device_2"),
- new UnaryMeasurementSchema("sensor_3", TSDataType.BOOLEAN, TSEncoding.RLE));
+ new MeasurementSchema("sensor_3", TSDataType.BOOLEAN, TSEncoding.RLE));
int j = 0;
for (int i = 0; i < 400000; i++) {
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReader.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReader.java
index 6f5e088..5876d7c 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReader.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReader.java
@@ -44,7 +44,7 @@ import org.apache.iotdb.tsfile.utils.BloomFilter;
import org.apache.iotdb.tsfile.utils.Pair;
import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -1109,7 +1109,7 @@ public class TsFileSequenceReader implements AutoCloseable {
ChunkHeader chunkHeader = this.readChunkHeader(marker);
measurementID = chunkHeader.getMeasurementID();
IMeasurementSchema measurementSchema =
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
measurementID,
chunkHeader.getDataType(),
chunkHeader.getEncodingType(),
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/MeasurementGroup.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/MeasurementGroup.java
index d0d5dd2..e4306b7 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/MeasurementGroup.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/MeasurementGroup.java
@@ -18,7 +18,7 @@
*/
package org.apache.iotdb.tsfile.utils;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import java.util.HashMap;
import java.util.List;
@@ -26,23 +26,22 @@ import java.util.Map;
public class MeasurementGroup {
private boolean isAligned;
- private Map<String, UnaryMeasurementSchema> measurementSchemaMap;
+ private Map<String, MeasurementSchema> measurementSchemaMap;
public MeasurementGroup(boolean isAligned) {
this.isAligned = isAligned;
measurementSchemaMap = new HashMap<>();
}
- public MeasurementGroup(boolean isAligned, List<UnaryMeasurementSchema> measurementSchemas) {
+ public MeasurementGroup(boolean isAligned, List<MeasurementSchema> measurementSchemas) {
this.isAligned = isAligned;
measurementSchemaMap = new HashMap<>();
- for (UnaryMeasurementSchema schema : measurementSchemas) {
+ for (MeasurementSchema schema : measurementSchemas) {
measurementSchemaMap.put(schema.getMeasurementId(), schema);
}
}
- public MeasurementGroup(
- boolean isAligned, Map<String, UnaryMeasurementSchema> measurementSchemaMap) {
+ public MeasurementGroup(boolean isAligned, Map<String, MeasurementSchema> measurementSchemaMap) {
this.isAligned = isAligned;
this.measurementSchemaMap = measurementSchemaMap;
}
@@ -55,11 +54,11 @@ public class MeasurementGroup {
isAligned = aligned;
}
- public Map<String, UnaryMeasurementSchema> getMeasurementSchemaMap() {
+ public Map<String, MeasurementSchema> getMeasurementSchemaMap() {
return measurementSchemaMap;
}
- public void setMeasurementSchemaMap(Map<String, UnaryMeasurementSchema> measurementSchemaMap) {
+ public void setMeasurementSchemaMap(Map<String, MeasurementSchema> measurementSchemaMap) {
this.measurementSchemaMap = measurementSchemaMap;
}
}
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/TsFileWriter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/TsFileWriter.java
index d39c28c..05226e4 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/TsFileWriter.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/TsFileWriter.java
@@ -31,8 +31,8 @@ import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.Tablet;
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.Schema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.VectorMeasurementSchema;
import org.apache.iotdb.tsfile.write.writer.RestorableTsFileIOWriter;
import org.apache.iotdb.tsfile.write.writer.TsFileIOWriter;
@@ -170,7 +170,7 @@ public class TsFileWriter implements AutoCloseable {
.getMeasurementSchemaMap()
.put(
measurementList.get(i),
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
measurementList.get(i),
measurementSchema.getSubMeasurementsTSDataTypeList().get(i),
measurementSchema.getSubMeasurementsTSEncodingList().get(i)));
@@ -182,8 +182,7 @@ public class TsFileWriter implements AutoCloseable {
new Path(entry.getKey().getDevice()), new MeasurementGroup(false));
group
.getMeasurementSchemaMap()
- .put(
- measurementSchema.getMeasurementId(), (UnaryMeasurementSchema) measurementSchema);
+ .put(measurementSchema.getMeasurementId(), (MeasurementSchema) measurementSchema);
measurementGroupMap.put(new Path(entry.getKey().getDevice()), group);
}
}
@@ -204,7 +203,7 @@ public class TsFileWriter implements AutoCloseable {
}
public void registerSchemaTemplate(
- String templateName, Map<String, UnaryMeasurementSchema> template, boolean isAligned) {
+ String templateName, Map<String, MeasurementSchema> template, boolean isAligned) {
schema.registerSchemaTemplate(templateName, new MeasurementGroup(isAligned, template));
}
@@ -236,7 +235,7 @@ public class TsFileWriter implements AutoCloseable {
* @param measurementSchema
* @throws WriteProcessException
*/
- public void registerTimeseries(Path devicePath, UnaryMeasurementSchema measurementSchema)
+ public void registerTimeseries(Path devicePath, MeasurementSchema measurementSchema)
throws WriteProcessException {
MeasurementGroup measurementGroup;
if (schema.containsDevice(devicePath)) {
@@ -267,8 +266,8 @@ public class TsFileWriter implements AutoCloseable {
* @param devicePath
* @param measurementSchemas
*/
- public void registerTimeseries(Path devicePath, List<UnaryMeasurementSchema> measurementSchemas) {
- for (UnaryMeasurementSchema schema : measurementSchemas) {
+ public void registerTimeseries(Path devicePath, List<MeasurementSchema> measurementSchemas) {
+ for (MeasurementSchema schema : measurementSchemas) {
try {
registerTimeseries(devicePath, schema);
} catch (WriteProcessException e) {
@@ -285,8 +284,7 @@ public class TsFileWriter implements AutoCloseable {
* @param measurementSchemas
* @throws WriteProcessException
*/
- public void registerAlignedTimeseries(
- Path devicePath, List<UnaryMeasurementSchema> measurementSchemas)
+ public void registerAlignedTimeseries(Path devicePath, List<MeasurementSchema> measurementSchemas)
throws WriteProcessException {
if (schema.containsDevice(devicePath)) {
if (schema.getSeriesSchema(devicePath).isAligned()) {
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/UnaryMeasurementSchema.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/MeasurementSchema.java
similarity index 91%
rename from tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/UnaryMeasurementSchema.java
rename to tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/MeasurementSchema.java
index 18f5348..e4a442c 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/UnaryMeasurementSchema.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/MeasurementSchema.java
@@ -43,8 +43,8 @@ import java.util.Objects;
* MeasurementSchema maintains respective TSEncodingBuilder; For TSDataType, only ENUM has
* TSDataTypeConverter up to now.
*/
-public class UnaryMeasurementSchema
- implements IMeasurementSchema, Comparable<UnaryMeasurementSchema>, Serializable {
+public class MeasurementSchema
+ implements IMeasurementSchema, Comparable<MeasurementSchema>, Serializable {
private String measurementId;
private byte type;
@@ -53,9 +53,9 @@ public class UnaryMeasurementSchema
private byte compressor;
private Map<String, String> props = null;
- public UnaryMeasurementSchema() {}
+ public MeasurementSchema() {}
- public UnaryMeasurementSchema(String measurementId, TSDataType tsDataType) {
+ public MeasurementSchema(String measurementId, TSDataType tsDataType) {
this(
measurementId,
tsDataType,
@@ -65,7 +65,7 @@ public class UnaryMeasurementSchema
}
/** set properties as an empty Map. */
- public UnaryMeasurementSchema(String measurementId, TSDataType type, TSEncoding encoding) {
+ public MeasurementSchema(String measurementId, TSDataType type, TSEncoding encoding) {
this(
measurementId,
type,
@@ -74,7 +74,7 @@ public class UnaryMeasurementSchema
null);
}
- public UnaryMeasurementSchema(
+ public MeasurementSchema(
String measurementId, TSDataType type, TSEncoding encoding, CompressionType compressionType) {
this(measurementId, type, encoding, compressionType, null);
}
@@ -85,7 +85,7 @@ public class UnaryMeasurementSchema
* <p>props - information in encoding method. For RLE, Encoder.MAX_POINT_NUMBER For PLAIN,
* Encoder.maxStringLength
*/
- public UnaryMeasurementSchema(
+ public MeasurementSchema(
String measurementId,
TSDataType type,
TSEncoding encoding,
@@ -98,7 +98,7 @@ public class UnaryMeasurementSchema
this.compressor = compressionType.serialize();
}
- public UnaryMeasurementSchema(
+ public MeasurementSchema(
String measurementId,
byte type,
byte encoding,
@@ -112,8 +112,8 @@ public class UnaryMeasurementSchema
}
/** function for deserializing data from input stream. */
- public static UnaryMeasurementSchema deserializeFrom(InputStream inputStream) throws IOException {
- UnaryMeasurementSchema measurementSchema = new UnaryMeasurementSchema();
+ public static MeasurementSchema deserializeFrom(InputStream inputStream) throws IOException {
+ MeasurementSchema measurementSchema = new MeasurementSchema();
measurementSchema.measurementId = ReadWriteIOUtils.readString(inputStream);
@@ -139,8 +139,8 @@ public class UnaryMeasurementSchema
}
/** function for deserializing data from byte buffer. */
- public static UnaryMeasurementSchema deserializeFrom(ByteBuffer buffer) {
- UnaryMeasurementSchema measurementSchema = new UnaryMeasurementSchema();
+ public static MeasurementSchema deserializeFrom(ByteBuffer buffer) {
+ MeasurementSchema measurementSchema = new MeasurementSchema();
measurementSchema.measurementId = ReadWriteIOUtils.readString(buffer);
@@ -165,8 +165,8 @@ public class UnaryMeasurementSchema
return measurementSchema;
}
- public static UnaryMeasurementSchema partialDeserializeFrom(ByteBuffer buffer) {
- UnaryMeasurementSchema measurementSchema = new UnaryMeasurementSchema();
+ public static MeasurementSchema partialDeserializeFrom(ByteBuffer buffer) {
+ MeasurementSchema measurementSchema = new MeasurementSchema();
measurementSchema.measurementId = ReadWriteIOUtils.readString(buffer);
@@ -352,7 +352,7 @@ public class UnaryMeasurementSchema
if (o == null || getClass() != o.getClass()) {
return false;
}
- UnaryMeasurementSchema that = (UnaryMeasurementSchema) o;
+ MeasurementSchema that = (MeasurementSchema) o;
return type == that.type
&& encoding == that.encoding
&& Objects.equals(measurementId, that.measurementId)
@@ -366,7 +366,7 @@ public class UnaryMeasurementSchema
/** compare by measurementID. */
@Override
- public int compareTo(UnaryMeasurementSchema o) {
+ public int compareTo(MeasurementSchema o) {
if (equals(o)) {
return 0;
} else {
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/Schema.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/Schema.java
index 44cdf85..d75fa40 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/Schema.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/schema/Schema.java
@@ -50,7 +50,7 @@ public class Schema implements Serializable {
}
// This method can only register nonAligned timeseries.
- public void registerTimeseries(Path devicePath, UnaryMeasurementSchema measurementSchema) {
+ public void registerTimeseries(Path devicePath, MeasurementSchema measurementSchema) {
MeasurementGroup group =
registeredTimeseries.getOrDefault(devicePath, new MeasurementGroup(false));
group.getMeasurementSchemaMap().put(measurementSchema.getMeasurementId(), measurementSchema);
@@ -69,7 +69,7 @@ public class Schema implements Serializable {
}
/** If template does not exist, an nonAligned timeseries is created by default */
- public void extendTemplate(String templateName, UnaryMeasurementSchema descriptor) {
+ public void extendTemplate(String templateName, MeasurementSchema descriptor) {
if (schemaTemplates == null) {
schemaTemplates = new HashMap<>();
}
@@ -84,7 +84,7 @@ public class Schema implements Serializable {
if (!schemaTemplates.containsKey(templateName)) {
return;
}
- Map<String, UnaryMeasurementSchema> template =
+ Map<String, MeasurementSchema> template =
schemaTemplates.get(templateName).getMeasurementSchemaMap();
boolean isAligned = schemaTemplates.get(templateName).isAligned();
registerMeasurementGroup(new Path(deviceId), new MeasurementGroup(isAligned, template));
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/utils/TestHelper.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/utils/TestHelper.java
index 8363855..657d73b 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/utils/TestHelper.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/file/metadata/utils/TestHelper.java
@@ -29,7 +29,7 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics;
import org.apache.iotdb.tsfile.utils.PublicBAOS;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import java.io.Serializable;
@@ -49,8 +49,8 @@ public class TestHelper {
return metaDataIndex;
}
- public static UnaryMeasurementSchema createSimpleMeasurementSchema(String measurementuid) {
- return new UnaryMeasurementSchema(measurementuid, TSDataType.INT64, TSEncoding.RLE);
+ public static MeasurementSchema createSimpleMeasurementSchema(String measurementuid) {
+ return new MeasurementSchema(measurementuid, TSDataType.INT64, TSEncoding.RLE);
}
public static TimeseriesMetadata createSimpleTimseriesMetaData(String measurementuid) {
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/TsFileReaderTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/TsFileReaderTest.java
index cfeb1a7..7a0f932 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/TsFileReaderTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/TsFileReaderTest.java
@@ -41,8 +41,8 @@ import org.apache.iotdb.tsfile.utils.TsFileGeneratorForTest;
import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.IntDataPoint;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.Schema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import org.junit.Assert;
import org.junit.Test;
@@ -75,7 +75,7 @@ public class TsFileReaderTest {
Path path = new Path("t", "id");
tsFileWriter.registerTimeseries(
new Path(path.getDevice()),
- new UnaryMeasurementSchema("id", TSDataType.INT32, TSEncoding.PLAIN, CompressionType.LZ4));
+ new MeasurementSchema("id", TSDataType.INT32, TSEncoding.PLAIN, CompressionType.LZ4));
for (int i = 0; i < 11000000; i++) {
TSRecord t = new TSRecord(i, "t");
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/ReadWriteTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/ReadWriteTest.java
index 7a97096..b82ab6e 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/ReadWriteTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/ReadWriteTest.java
@@ -40,8 +40,8 @@ import org.apache.iotdb.tsfile.write.record.TSRecord;
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.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.Schema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import org.junit.After;
import org.junit.Assert;
@@ -111,11 +111,11 @@ public class ReadWriteTest {
}
Schema schema = new Schema();
schema.extendTemplate(
- TEMPLATE_NAME, new UnaryMeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
+ TEMPLATE_NAME, new MeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
schema.extendTemplate(
- TEMPLATE_NAME, new UnaryMeasurementSchema("s2", TSDataType.INT32, TSEncoding.TS_2DIFF));
+ TEMPLATE_NAME, new MeasurementSchema("s2", TSDataType.INT32, TSEncoding.TS_2DIFF));
schema.extendTemplate(
- TEMPLATE_NAME, new UnaryMeasurementSchema("s3", TSDataType.INT32, TSEncoding.TS_2DIFF));
+ TEMPLATE_NAME, new MeasurementSchema("s3", TSDataType.INT32, TSEncoding.TS_2DIFF));
TsFileWriter tsFileWriter = new TsFileWriter(f, schema);
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGeneratorReadEmptyTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGeneratorReadEmptyTest.java
index 6bad564..1d1ed67 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGeneratorReadEmptyTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGeneratorReadEmptyTest.java
@@ -41,8 +41,8 @@ import org.apache.iotdb.tsfile.write.record.TSRecord;
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.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.Schema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import org.junit.After;
import org.junit.Assert;
@@ -113,9 +113,9 @@ public class TimeGeneratorReadEmptyTest {
Schema schema = new Schema();
schema.extendTemplate(
- TEMPLATE_NAME, new UnaryMeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
+ TEMPLATE_NAME, new MeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
schema.extendTemplate(
- TEMPLATE_NAME, new UnaryMeasurementSchema("s2", TSDataType.INT32, TSEncoding.TS_2DIFF));
+ TEMPLATE_NAME, new MeasurementSchema("s2", TSDataType.INT32, TSEncoding.TS_2DIFF));
TsFileWriter tsFileWriter = new TsFileWriter(new File(tsfilePath), schema);
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGeneratorReadWriteTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGeneratorReadWriteTest.java
index a2a25d3..fe2981b 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGeneratorReadWriteTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/query/timegenerator/TimeGeneratorReadWriteTest.java
@@ -41,8 +41,8 @@ import org.apache.iotdb.tsfile.write.record.TSRecord;
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.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.Schema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import org.junit.After;
import org.junit.Assert;
@@ -113,9 +113,9 @@ public class TimeGeneratorReadWriteTest {
Schema schema = new Schema();
schema.extendTemplate(
- TEMPLATE_NAME, new UnaryMeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
+ TEMPLATE_NAME, new MeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
schema.extendTemplate(
- TEMPLATE_NAME, new UnaryMeasurementSchema("s2", TSDataType.INT32, TSEncoding.TS_2DIFF));
+ TEMPLATE_NAME, new MeasurementSchema("s2", TSDataType.INT32, TSEncoding.TS_2DIFF));
TsFileWriter tsFileWriter = new TsFileWriter(new File(tsfilePath), schema);
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 a4e40ed..230cf0f 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
@@ -31,8 +31,8 @@ import org.apache.iotdb.tsfile.utils.RecordUtils;
import org.apache.iotdb.tsfile.utils.TsFileGeneratorForTest;
import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.TSRecord;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.Schema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import org.junit.Assert;
import org.junit.Ignore;
@@ -195,50 +195,48 @@ public class TsFileGeneratorForSeriesReaderByTimestamp {
schema = new Schema();
schema.registerTimeseries(
new Path("d1"),
- new UnaryMeasurementSchema(
- "s1", TSDataType.INT32, TSEncoding.valueOf(conf.getValueEncoder())));
+ new MeasurementSchema("s1", TSDataType.INT32, TSEncoding.valueOf(conf.getValueEncoder())));
schema.registerTimeseries(
new Path("d1"),
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"s2",
TSDataType.INT64,
TSEncoding.valueOf(conf.getValueEncoder()),
CompressionType.UNCOMPRESSED));
schema.registerTimeseries(
new Path("d1"),
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"s3",
TSDataType.INT64,
TSEncoding.valueOf(conf.getValueEncoder()),
CompressionType.SNAPPY));
schema.registerTimeseries(
- new Path("d1"), new UnaryMeasurementSchema("s4", TSDataType.TEXT, TSEncoding.PLAIN));
+ new Path("d1"), new MeasurementSchema("s4", TSDataType.TEXT, TSEncoding.PLAIN));
schema.registerTimeseries(
- new Path("d1"), new UnaryMeasurementSchema("s5", TSDataType.BOOLEAN, TSEncoding.PLAIN));
+ new Path("d1"), new MeasurementSchema("s5", TSDataType.BOOLEAN, TSEncoding.PLAIN));
schema.registerTimeseries(
- new Path("d1"), new UnaryMeasurementSchema("s6", TSDataType.FLOAT, TSEncoding.RLE));
+ new Path("d1"), new MeasurementSchema("s6", TSDataType.FLOAT, TSEncoding.RLE));
schema.registerTimeseries(
- new Path("d1"), new UnaryMeasurementSchema("s7", TSDataType.DOUBLE, TSEncoding.RLE));
+ new Path("d1"), new MeasurementSchema("s7", TSDataType.DOUBLE, TSEncoding.RLE));
schema.registerTimeseries(
new Path("d2"),
- new UnaryMeasurementSchema(
- "s1", TSDataType.INT32, TSEncoding.valueOf(conf.getValueEncoder())));
+ new MeasurementSchema("s1", TSDataType.INT32, TSEncoding.valueOf(conf.getValueEncoder())));
schema.registerTimeseries(
new Path("d2"),
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"s2",
TSDataType.INT64,
TSEncoding.valueOf(conf.getValueEncoder()),
CompressionType.UNCOMPRESSED));
schema.registerTimeseries(
new Path("d2"),
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"s3",
TSDataType.INT64,
TSEncoding.valueOf(conf.getValueEncoder()),
CompressionType.SNAPPY));
schema.registerTimeseries(
- new Path("d2"), new UnaryMeasurementSchema("s4", TSDataType.TEXT, TSEncoding.PLAIN));
+ new Path("d2"), new MeasurementSchema("s4", TSDataType.TEXT, TSEncoding.PLAIN));
}
public static void writeToFile(Schema schema) throws IOException, WriteProcessException {
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/FileGenerator.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/FileGenerator.java
index 517f252..82ca3d1 100755
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/FileGenerator.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/FileGenerator.java
@@ -26,8 +26,8 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
import org.apache.iotdb.tsfile.read.common.Path;
import org.apache.iotdb.tsfile.write.TsFileWriter;
import org.apache.iotdb.tsfile.write.record.TSRecord;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.Schema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import org.junit.Assert;
import org.slf4j.Logger;
@@ -257,34 +257,34 @@ public class FileGenerator {
private static void generateTestSchema() {
schema = new Schema();
- List<UnaryMeasurementSchema> schemaList = new ArrayList<>();
+ List<MeasurementSchema> schemaList = new ArrayList<>();
schemaList.add(
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"s1", TSDataType.INT32, TSEncoding.valueOf(config.getValueEncoder())));
schemaList.add(
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"s2", TSDataType.INT64, TSEncoding.valueOf(config.getValueEncoder())));
schemaList.add(
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"s3", TSDataType.INT64, TSEncoding.valueOf(config.getValueEncoder())));
- schemaList.add(new UnaryMeasurementSchema("s4", TSDataType.TEXT, TSEncoding.PLAIN));
- schemaList.add(new UnaryMeasurementSchema("s5", TSDataType.BOOLEAN, TSEncoding.PLAIN));
- schemaList.add(new UnaryMeasurementSchema("s6", TSDataType.FLOAT, TSEncoding.RLE));
- schemaList.add(new UnaryMeasurementSchema("s7", TSDataType.DOUBLE, TSEncoding.RLE));
+ schemaList.add(new MeasurementSchema("s4", TSDataType.TEXT, TSEncoding.PLAIN));
+ schemaList.add(new MeasurementSchema("s5", TSDataType.BOOLEAN, TSEncoding.PLAIN));
+ schemaList.add(new MeasurementSchema("s6", TSDataType.FLOAT, TSEncoding.RLE));
+ schemaList.add(new MeasurementSchema("s7", TSDataType.DOUBLE, TSEncoding.RLE));
MeasurementGroup measurementGroup = new MeasurementGroup(false, schemaList);
schema.registerMeasurementGroup(new Path("d1"), measurementGroup);
schemaList.clear();
schemaList.add(
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"s1", TSDataType.INT32, TSEncoding.valueOf(config.getValueEncoder())));
schemaList.add(
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"s2", TSDataType.INT64, TSEncoding.valueOf(config.getValueEncoder())));
schemaList.add(
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"s3", TSDataType.INT64, TSEncoding.valueOf(config.getValueEncoder())));
- schemaList.add(new UnaryMeasurementSchema("s4", TSDataType.TEXT, TSEncoding.PLAIN));
+ schemaList.add(new MeasurementSchema("s4", TSDataType.TEXT, TSEncoding.PLAIN));
measurementGroup = new MeasurementGroup(false, schemaList);
schema.registerMeasurementGroup(new Path("d2"), measurementGroup);
}
@@ -295,7 +295,7 @@ public class FileGenerator {
for (int j = 0; j < measurementNum; j++) {
schema.registerTimeseries(
new Path("d" + i),
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"s" + j, TSDataType.INT32, TSEncoding.valueOf(config.getValueEncoder())));
}
}
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/RecordUtilsTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/RecordUtilsTest.java
index 02931ad..6818cf3 100755
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/RecordUtilsTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/RecordUtilsTest.java
@@ -25,8 +25,8 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
import org.apache.iotdb.tsfile.read.common.Path;
import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.Schema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import org.junit.Before;
import org.junit.Test;
@@ -44,24 +44,20 @@ public class RecordUtilsTest {
TSFileConfig conf = TSFileDescriptor.getInstance().getConfig();
schema.registerTimeseries(
new Path("d1"),
- new UnaryMeasurementSchema(
- "s1", TSDataType.INT32, TSEncoding.valueOf(conf.getValueEncoder())));
+ new MeasurementSchema("s1", TSDataType.INT32, TSEncoding.valueOf(conf.getValueEncoder())));
schema.registerTimeseries(
new Path("d1"),
- new UnaryMeasurementSchema(
- "s2", TSDataType.INT64, TSEncoding.valueOf(conf.getValueEncoder())));
+ new MeasurementSchema("s2", TSDataType.INT64, TSEncoding.valueOf(conf.getValueEncoder())));
schema.registerTimeseries(
new Path("d1"),
- new UnaryMeasurementSchema(
- "s3", TSDataType.FLOAT, TSEncoding.valueOf(conf.getValueEncoder())));
+ new MeasurementSchema("s3", TSDataType.FLOAT, TSEncoding.valueOf(conf.getValueEncoder())));
schema.registerTimeseries(
new Path("d1"),
- new UnaryMeasurementSchema(
- "s4", TSDataType.DOUBLE, TSEncoding.valueOf(conf.getValueEncoder())));
+ new MeasurementSchema("s4", TSDataType.DOUBLE, TSEncoding.valueOf(conf.getValueEncoder())));
schema.registerTimeseries(
- new Path("d1"), new UnaryMeasurementSchema("s5", TSDataType.BOOLEAN, TSEncoding.PLAIN));
+ new Path("d1"), new MeasurementSchema("s5", TSDataType.BOOLEAN, TSEncoding.PLAIN));
schema.registerTimeseries(
- new Path("d1"), new UnaryMeasurementSchema("s6", TSDataType.TEXT, TSEncoding.PLAIN));
+ new Path("d1"), new MeasurementSchema("s6", TSDataType.TEXT, TSEncoding.PLAIN));
return schema;
}
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/TsFileGeneratorForTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/TsFileGeneratorForTest.java
index 65dea4f..8cf6535 100755
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/TsFileGeneratorForTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/TsFileGeneratorForTest.java
@@ -35,8 +35,8 @@ import org.apache.iotdb.tsfile.write.record.Tablet;
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
import org.apache.iotdb.tsfile.write.record.datapoint.LongDataPoint;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.Schema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import org.junit.Assert;
import org.junit.Ignore;
@@ -204,41 +204,41 @@ public class TsFileGeneratorForTest {
private static Schema generateTestSchema() {
Schema schema = new Schema();
schema.registerTimeseries(
- new Path("d1"), new UnaryMeasurementSchema("s1", TSDataType.INT32, TSEncoding.RLE));
+ new Path("d1"), new MeasurementSchema("s1", TSDataType.INT32, TSEncoding.RLE));
schema.registerTimeseries(
- new Path("d1"), new UnaryMeasurementSchema("s2", TSDataType.INT64, TSEncoding.PLAIN));
+ new Path("d1"), new MeasurementSchema("s2", TSDataType.INT64, TSEncoding.PLAIN));
schema.registerTimeseries(
- new Path("d1"), new UnaryMeasurementSchema("s3", TSDataType.INT64, TSEncoding.TS_2DIFF));
+ new Path("d1"), new MeasurementSchema("s3", TSDataType.INT64, TSEncoding.TS_2DIFF));
schema.registerTimeseries(
new Path("d1"),
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"s4",
TSDataType.TEXT,
TSEncoding.PLAIN,
CompressionType.UNCOMPRESSED,
Collections.singletonMap(Encoder.MAX_STRING_LENGTH, "20")));
schema.registerTimeseries(
- new Path("d1"), new UnaryMeasurementSchema("s5", TSDataType.BOOLEAN, TSEncoding.RLE));
+ new Path("d1"), new MeasurementSchema("s5", TSDataType.BOOLEAN, TSEncoding.RLE));
schema.registerTimeseries(
new Path("d1"),
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"s6",
TSDataType.FLOAT,
TSEncoding.RLE,
CompressionType.SNAPPY,
Collections.singletonMap(Encoder.MAX_POINT_NUMBER, "5")));
schema.registerTimeseries(
- new Path("d1"), new UnaryMeasurementSchema("s7", TSDataType.DOUBLE, TSEncoding.GORILLA_V1));
+ new Path("d1"), new MeasurementSchema("s7", TSDataType.DOUBLE, TSEncoding.GORILLA_V1));
schema.registerTimeseries(
- new Path("d2"), new UnaryMeasurementSchema("s1", TSDataType.INT32, TSEncoding.RLE));
+ new Path("d2"), new MeasurementSchema("s1", TSDataType.INT32, TSEncoding.RLE));
schema.registerTimeseries(
- new Path("d2"), new UnaryMeasurementSchema("s2", TSDataType.INT64, TSEncoding.PLAIN));
+ new Path("d2"), new MeasurementSchema("s2", TSDataType.INT64, TSEncoding.PLAIN));
schema.registerTimeseries(
- new Path("d2"), new UnaryMeasurementSchema("s3", TSDataType.INT64, TSEncoding.TS_2DIFF));
+ new Path("d2"), new MeasurementSchema("s3", TSDataType.INT64, TSEncoding.TS_2DIFF));
schema.registerTimeseries(
new Path("d2"),
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"s4",
TSDataType.TEXT,
TSEncoding.PLAIN,
@@ -298,22 +298,21 @@ public class TsFileGeneratorForTest {
TSFileDescriptor.getInstance().getConfig().setMaxNumberOfPointsInPage(pageSize);
try (TsFileWriter tsFileWriter = new TsFileWriter(file)) {
// register align timeseries
- List<UnaryMeasurementSchema> alignedMeasurementSchemas = new ArrayList<>();
+ List<MeasurementSchema> alignedMeasurementSchemas = new ArrayList<>();
alignedMeasurementSchemas.add(
- new UnaryMeasurementSchema("s1", TSDataType.INT64, TSEncoding.PLAIN));
+ new MeasurementSchema("s1", TSDataType.INT64, TSEncoding.PLAIN));
alignedMeasurementSchemas.add(
- new UnaryMeasurementSchema("s2", TSDataType.INT64, TSEncoding.PLAIN));
+ new MeasurementSchema("s2", TSDataType.INT64, TSEncoding.PLAIN));
alignedMeasurementSchemas.add(
- new UnaryMeasurementSchema("s3", TSDataType.INT64, TSEncoding.PLAIN));
- alignedMeasurementSchemas.add(
- new UnaryMeasurementSchema("s4", TSDataType.INT64, TSEncoding.RLE));
+ new MeasurementSchema("s3", TSDataType.INT64, TSEncoding.PLAIN));
+ alignedMeasurementSchemas.add(new MeasurementSchema("s4", TSDataType.INT64, TSEncoding.RLE));
tsFileWriter.registerAlignedTimeseries(new Path("d1"), alignedMeasurementSchemas);
// register nonAlign timeseries
- List<UnaryMeasurementSchema> measurementSchemas = new ArrayList<>();
- measurementSchemas.add(new UnaryMeasurementSchema("s1", TSDataType.INT64, TSEncoding.PLAIN));
- measurementSchemas.add(new UnaryMeasurementSchema("s2", TSDataType.INT64, TSEncoding.PLAIN));
- measurementSchemas.add(new UnaryMeasurementSchema("s3", TSDataType.INT64, TSEncoding.PLAIN));
+ List<MeasurementSchema> measurementSchemas = new ArrayList<>();
+ measurementSchemas.add(new MeasurementSchema("s1", TSDataType.INT64, TSEncoding.PLAIN));
+ measurementSchemas.add(new MeasurementSchema("s2", TSDataType.INT64, TSEncoding.PLAIN));
+ measurementSchemas.add(new MeasurementSchema("s3", TSDataType.INT64, TSEncoding.PLAIN));
tsFileWriter.registerTimeseries(new Path("d2"), measurementSchemas);
writeWithTsRecord(tsFileWriter, "d1", alignedMeasurementSchemas, rowCount, 0, 0, true);
@@ -334,7 +333,7 @@ public class TsFileGeneratorForTest {
public static void writeWithTsRecord(
TsFileWriter tsFileWriter,
String deviceId,
- List<UnaryMeasurementSchema> schemas,
+ List<MeasurementSchema> schemas,
long rowSize,
long startTime,
long startValue,
@@ -359,7 +358,7 @@ public class TsFileGeneratorForTest {
public static void writeWithTablet(
TsFileWriter tsFileWriter,
String deviceId,
- List<UnaryMeasurementSchema> schemas,
+ List<MeasurementSchema> schemas,
long rowNum,
long startTime,
long startValue,
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/DefaultSchemaTemplateTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/DefaultSchemaTemplateTest.java
index aececd9..13a2a9c 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/DefaultSchemaTemplateTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/DefaultSchemaTemplateTest.java
@@ -29,7 +29,7 @@ import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet;
import org.apache.iotdb.tsfile.utils.TsFileGeneratorForTest;
import org.apache.iotdb.tsfile.write.record.Tablet;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.junit.Assert;
import org.junit.Test;
@@ -51,16 +51,14 @@ public class DefaultSchemaTemplateTest {
Assert.assertTrue(file.getParentFile().mkdirs());
}
try (TsFileWriter writer = new TsFileWriter(file)) {
- UnaryMeasurementSchema s1 =
- new UnaryMeasurementSchema("s1", TSDataType.INT64, TSEncoding.PLAIN);
- UnaryMeasurementSchema s2 =
- new UnaryMeasurementSchema("s2", TSDataType.INT64, TSEncoding.PLAIN);
+ MeasurementSchema s1 = new MeasurementSchema("s1", TSDataType.INT64, TSEncoding.PLAIN);
+ MeasurementSchema s2 = new MeasurementSchema("s2", TSDataType.INT64, TSEncoding.PLAIN);
List<IMeasurementSchema> schemaList = new ArrayList<>();
schemaList.add(s1);
schemaList.add(s2);
- Map<String, UnaryMeasurementSchema> schema = new HashMap<>();
+ Map<String, MeasurementSchema> schema = new HashMap<>();
schema.put("s1", s1);
schema.put("s2", s2);
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/MetadataIndexConstructorTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/MetadataIndexConstructorTest.java
index ee73f8f..acb0446 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/MetadataIndexConstructorTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/MetadataIndexConstructorTest.java
@@ -38,8 +38,8 @@ import org.apache.iotdb.tsfile.write.record.Tablet;
import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint;
import org.apache.iotdb.tsfile.write.record.datapoint.LongDataPoint;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.Schema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import org.junit.After;
import org.junit.Before;
@@ -379,7 +379,7 @@ public class MetadataIndexConstructorTest {
for (String measurement : singleMeasurement[i]) {
tsFileWriter.registerTimeseries(
new Path(device),
- new UnaryMeasurementSchema(measurement, TSDataType.INT64, TSEncoding.RLE));
+ new MeasurementSchema(measurement, TSDataType.INT64, TSEncoding.RLE));
}
// the number of record rows
int rowNum = 10;
@@ -407,15 +407,15 @@ public class MetadataIndexConstructorTest {
vectorPrefix + generateIndexString(vectorIndex, vectorMeasurement.length);
logger.info("generating vector {}...", vectorName);
int measurementNum = vectorMeasurement[i][vectorIndex];
- List<UnaryMeasurementSchema> schemas = new ArrayList<>();
+ List<MeasurementSchema> schemas = new ArrayList<>();
List<IMeasurementSchema> tabletSchema = new ArrayList<>();
for (int measurementIndex = 0; measurementIndex < measurementNum; measurementIndex++) {
String measurementName =
measurementPrefix + generateIndexString(measurementIndex, measurementNum);
logger.info("generating vector measurement {}...", measurementName);
// add measurements into file schema (all with INT64 data type)
- UnaryMeasurementSchema schema1 =
- new UnaryMeasurementSchema(measurementName, TSDataType.INT64, TSEncoding.RLE);
+ MeasurementSchema schema1 =
+ new MeasurementSchema(measurementName, TSDataType.INT64, TSEncoding.RLE);
schemas.add(schema1);
tabletSchema.add(schema1);
}
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/PerfTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/PerfTest.java
index 8a46d95..65fa8d6 100755
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/PerfTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/PerfTest.java
@@ -28,8 +28,8 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
import org.apache.iotdb.tsfile.read.common.Path;
import org.apache.iotdb.tsfile.utils.RecordUtils;
import org.apache.iotdb.tsfile.write.record.TSRecord;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.Schema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.LoggerContext;
@@ -165,32 +165,26 @@ public class PerfTest {
TSFileConfig conf = TSFileDescriptor.getInstance().getConfig();
schema.registerTimeseries(
new Path("d1"),
- new UnaryMeasurementSchema(
- "s1", TSDataType.INT64, TSEncoding.valueOf(conf.getValueEncoder())));
+ new MeasurementSchema("s1", TSDataType.INT64, TSEncoding.valueOf(conf.getValueEncoder())));
schema.registerTimeseries(
new Path("d1"),
- new UnaryMeasurementSchema(
- "s2", TSDataType.INT64, TSEncoding.valueOf(conf.getValueEncoder())));
+ new MeasurementSchema("s2", TSDataType.INT64, TSEncoding.valueOf(conf.getValueEncoder())));
schema.registerTimeseries(
new Path("d1"),
- new UnaryMeasurementSchema(
- "s3", TSDataType.INT64, TSEncoding.valueOf(conf.getValueEncoder())));
+ new MeasurementSchema("s3", TSDataType.INT64, TSEncoding.valueOf(conf.getValueEncoder())));
schema.registerTimeseries(
- new Path("d1"), new UnaryMeasurementSchema("s4", TSDataType.TEXT, TSEncoding.PLAIN));
+ new Path("d1"), new MeasurementSchema("s4", TSDataType.TEXT, TSEncoding.PLAIN));
schema.registerTimeseries(
new Path("d2"),
- new UnaryMeasurementSchema(
- "s1", TSDataType.INT64, TSEncoding.valueOf(conf.getValueEncoder())));
+ new MeasurementSchema("s1", TSDataType.INT64, TSEncoding.valueOf(conf.getValueEncoder())));
schema.registerTimeseries(
new Path("d2"),
- new UnaryMeasurementSchema(
- "s2", TSDataType.INT64, TSEncoding.valueOf(conf.getValueEncoder())));
+ new MeasurementSchema("s2", TSDataType.INT64, TSEncoding.valueOf(conf.getValueEncoder())));
schema.registerTimeseries(
new Path("d2"),
- new UnaryMeasurementSchema(
- "s3", TSDataType.INT64, TSEncoding.valueOf(conf.getValueEncoder())));
+ new MeasurementSchema("s3", TSDataType.INT64, TSEncoding.valueOf(conf.getValueEncoder())));
schema.registerTimeseries(
- new Path("d2"), new UnaryMeasurementSchema("s4", TSDataType.TEXT, TSEncoding.PLAIN));
+ new Path("d2"), new MeasurementSchema("s4", TSDataType.TEXT, TSEncoding.PLAIN));
JsonObject s4 = new JsonObject();
s4.addProperty(JsonFormatConstant.MEASUREMENT_UID, "s4");
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/ReadPageInMemTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/ReadPageInMemTest.java
index 42c93fd..15b7227 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/ReadPageInMemTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/ReadPageInMemTest.java
@@ -27,8 +27,8 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
import org.apache.iotdb.tsfile.read.common.Path;
import org.apache.iotdb.tsfile.utils.RecordUtils;
import org.apache.iotdb.tsfile.write.record.TSRecord;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.Schema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import org.junit.After;
import org.junit.Before;
@@ -57,36 +57,28 @@ public class ReadPageInMemTest {
TSFileConfig conf = TSFileDescriptor.getInstance().getConfig();
schema.registerTimeseries(
new Path("root.car.d1"),
- new UnaryMeasurementSchema(
- "s1", TSDataType.INT32, TSEncoding.valueOf(conf.getValueEncoder())));
+ new MeasurementSchema("s1", TSDataType.INT32, TSEncoding.valueOf(conf.getValueEncoder())));
schema.registerTimeseries(
new Path("root.car.d1"),
- new UnaryMeasurementSchema(
- "s2", TSDataType.INT64, TSEncoding.valueOf(conf.getValueEncoder())));
+ new MeasurementSchema("s2", TSDataType.INT64, TSEncoding.valueOf(conf.getValueEncoder())));
schema.registerTimeseries(
new Path("root.car.d1"),
- new UnaryMeasurementSchema(
- "s3", TSDataType.FLOAT, TSEncoding.valueOf(conf.getValueEncoder())));
+ new MeasurementSchema("s3", TSDataType.FLOAT, TSEncoding.valueOf(conf.getValueEncoder())));
schema.registerTimeseries(
new Path("root.car.d1"),
- new UnaryMeasurementSchema(
- "s4", TSDataType.DOUBLE, TSEncoding.valueOf(conf.getValueEncoder())));
+ new MeasurementSchema("s4", TSDataType.DOUBLE, TSEncoding.valueOf(conf.getValueEncoder())));
schema.registerTimeseries(
new Path("root.car.d2"),
- new UnaryMeasurementSchema(
- "s1", TSDataType.INT32, TSEncoding.valueOf(conf.getValueEncoder())));
+ new MeasurementSchema("s1", TSDataType.INT32, TSEncoding.valueOf(conf.getValueEncoder())));
schema.registerTimeseries(
new Path("root.car.d2"),
- new UnaryMeasurementSchema(
- "s2", TSDataType.INT64, TSEncoding.valueOf(conf.getValueEncoder())));
+ new MeasurementSchema("s2", TSDataType.INT64, TSEncoding.valueOf(conf.getValueEncoder())));
schema.registerTimeseries(
new Path("root.car.d2"),
- new UnaryMeasurementSchema(
- "s3", TSDataType.FLOAT, TSEncoding.valueOf(conf.getValueEncoder())));
+ new MeasurementSchema("s3", TSDataType.FLOAT, TSEncoding.valueOf(conf.getValueEncoder())));
schema.registerTimeseries(
new Path("root.car.d2"),
- new UnaryMeasurementSchema(
- "s4", TSDataType.DOUBLE, TSEncoding.valueOf(conf.getValueEncoder())));
+ new MeasurementSchema("s4", TSDataType.DOUBLE, TSEncoding.valueOf(conf.getValueEncoder())));
return schema;
}
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/SameMeasurementsWithDifferentDataTypesTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/SameMeasurementsWithDifferentDataTypesTest.java
index b0142dc..04bb4d9 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/SameMeasurementsWithDifferentDataTypesTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/SameMeasurementsWithDifferentDataTypesTest.java
@@ -33,8 +33,8 @@ 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.LongDataPoint;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.Schema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import org.junit.After;
import org.junit.Assert;
@@ -107,16 +107,16 @@ public class SameMeasurementsWithDifferentDataTypesTest {
Schema schema = new Schema();
schema.extendTemplate(
- TEMPLATE_1, new UnaryMeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
+ TEMPLATE_1, new MeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
schema.extendTemplate(
- TEMPLATE_1, new UnaryMeasurementSchema("s2", TSDataType.INT32, TSEncoding.TS_2DIFF));
+ TEMPLATE_1, new MeasurementSchema("s2", TSDataType.INT32, TSEncoding.TS_2DIFF));
schema.extendTemplate(
- TEMPLATE_1, new UnaryMeasurementSchema("s3", TSDataType.INT32, TSEncoding.TS_2DIFF));
+ TEMPLATE_1, new MeasurementSchema("s3", TSDataType.INT32, TSEncoding.TS_2DIFF));
schema.extendTemplate(
- TEMPLATE_2, new UnaryMeasurementSchema("s1", TSDataType.INT64, TSEncoding.TS_2DIFF));
+ TEMPLATE_2, new MeasurementSchema("s1", TSDataType.INT64, TSEncoding.TS_2DIFF));
schema.extendTemplate(
- TEMPLATE_2, new UnaryMeasurementSchema("s2", TSDataType.INT64, TSEncoding.RLE));
+ TEMPLATE_2, new MeasurementSchema("s2", TSDataType.INT64, TSEncoding.RLE));
schema.registerDevice("d1", TEMPLATE_1);
schema.registerDevice("d2", TEMPLATE_2);
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileIOWriterTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileIOWriterTest.java
index cc60902..84e7a1d 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileIOWriterTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileIOWriterTest.java
@@ -33,8 +33,8 @@ import org.apache.iotdb.tsfile.file.metadata.utils.TestHelper;
import org.apache.iotdb.tsfile.read.TsFileSequenceReader;
import org.apache.iotdb.tsfile.read.common.Path;
import org.apache.iotdb.tsfile.utils.MeasurementGroup;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.Schema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.VectorMeasurementSchema;
import org.apache.iotdb.tsfile.write.writer.TsFileIOWriter;
@@ -66,13 +66,13 @@ public class TsFileIOWriterTest {
TsFileIOWriter writer = new TsFileIOWriter(new File(FILE_PATH));
// file schema
- UnaryMeasurementSchema measurementSchema = TestHelper.createSimpleMeasurementSchema(SENSOR_1);
+ MeasurementSchema measurementSchema = TestHelper.createSimpleMeasurementSchema(SENSOR_1);
VectorMeasurementSchema vectorMeasurementSchema =
new VectorMeasurementSchema(
"", new String[] {"s1", "s2"}, new TSDataType[] {TSDataType.INT64, TSDataType.INT64});
- List<UnaryMeasurementSchema> schemas = new ArrayList<>();
- schemas.add(new UnaryMeasurementSchema("s1", TSDataType.INT64, TSEncoding.RLE));
- schemas.add(new UnaryMeasurementSchema("s2", TSDataType.INT64, TSEncoding.RLE));
+ List<MeasurementSchema> schemas = new ArrayList<>();
+ schemas.add(new MeasurementSchema("s1", TSDataType.INT64, TSEncoding.RLE));
+ schemas.add(new MeasurementSchema("s2", TSDataType.INT64, TSEncoding.RLE));
MeasurementGroup group = new MeasurementGroup(true, schemas);
Schema schema = new Schema();
@@ -169,7 +169,7 @@ public class TsFileIOWriterTest {
Assert.assertEquals(2, metaData.getMetadataIndex().getChildren().size());
}
- private void writeChunkGroup(TsFileIOWriter writer, UnaryMeasurementSchema measurementSchema)
+ private void writeChunkGroup(TsFileIOWriter writer, MeasurementSchema measurementSchema)
throws IOException {
for (int i = 0; i < CHUNK_GROUP_NUM; i++) {
// chunk group
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileReadWriteTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileReadWriteTest.java
index 2610efd..f31285d 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileReadWriteTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileReadWriteTest.java
@@ -36,7 +36,7 @@ import org.apache.iotdb.tsfile.write.record.datapoint.DoubleDataPoint;
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.LongDataPoint;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
@@ -163,10 +163,10 @@ public class TsFileReadWriteTest {
// add measurements into file schema
tsFileWriter.registerTimeseries(
new Path("device_1"),
- new UnaryMeasurementSchema("sensor_1", TSDataType.FLOAT, TSEncoding.RLE));
+ new MeasurementSchema("sensor_1", TSDataType.FLOAT, TSEncoding.RLE));
tsFileWriter.registerTimeseries(
new Path("device_1"),
- new UnaryMeasurementSchema("sensor_2", TSDataType.INT32, TSEncoding.TS_2DIFF));
+ new MeasurementSchema("sensor_2", TSDataType.INT32, TSEncoding.TS_2DIFF));
// construct TSRecord
TSRecord tsRecord = new TSRecord(1, "device_1");
DataPoint dPoint1 = new FloatDataPoint("sensor_1", 1.2f);
@@ -208,7 +208,7 @@ public class TsFileReadWriteTest {
// add measurements into file schema
try (TsFileWriter tsFileWriter = new TsFileWriter(f)) {
tsFileWriter.registerTimeseries(
- new Path("device_1"), new UnaryMeasurementSchema("sensor_1", dataType, encodingType));
+ new Path("device_1"), new MeasurementSchema("sensor_1", dataType, encodingType));
for (long i = 1; i < floatCount; i++) {
// construct TSRecord
TSRecord tsRecord = new TSRecord(i, "device_1");
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileWriteApiTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileWriteApiTest.java
index 61cb9eb..b423299 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileWriteApiTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileWriteApiTest.java
@@ -25,7 +25,7 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
import org.apache.iotdb.tsfile.fileSystem.FSFactoryProducer;
import org.apache.iotdb.tsfile.read.common.Path;
import org.apache.iotdb.tsfile.utils.TsFileGeneratorForTest;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Assert;
@@ -40,8 +40,8 @@ import java.util.List;
public class TsFileWriteApiTest {
private final File f = FSFactoryProducer.getFSFactory().getFile("TsFileWriteTest.tsfile");
private final String deviceId = "root.sg.d1";
- private final List<UnaryMeasurementSchema> alignedMeasurementSchemas = new ArrayList<>();
- private final List<UnaryMeasurementSchema> measurementSchemas = new ArrayList<>();
+ private final List<MeasurementSchema> alignedMeasurementSchemas = new ArrayList<>();
+ private final List<MeasurementSchema> measurementSchemas = new ArrayList<>();
@Before
public void setUp() {
@@ -61,23 +61,19 @@ public class TsFileWriteApiTest {
}
public void registerAlignedTimeseries(TsFileWriter tsFileWriter) throws WriteProcessException {
- alignedMeasurementSchemas.add(
- new UnaryMeasurementSchema("s1", TSDataType.INT64, TSEncoding.PLAIN));
- alignedMeasurementSchemas.add(
- new UnaryMeasurementSchema("s2", TSDataType.INT64, TSEncoding.PLAIN));
- alignedMeasurementSchemas.add(
- new UnaryMeasurementSchema("s3", TSDataType.INT64, TSEncoding.PLAIN));
- alignedMeasurementSchemas.add(
- new UnaryMeasurementSchema("s4", TSDataType.INT64, TSEncoding.RLE));
+ alignedMeasurementSchemas.add(new MeasurementSchema("s1", TSDataType.INT64, TSEncoding.PLAIN));
+ alignedMeasurementSchemas.add(new MeasurementSchema("s2", TSDataType.INT64, TSEncoding.PLAIN));
+ alignedMeasurementSchemas.add(new MeasurementSchema("s3", TSDataType.INT64, TSEncoding.PLAIN));
+ alignedMeasurementSchemas.add(new MeasurementSchema("s4", TSDataType.INT64, TSEncoding.RLE));
// register align timeseries
tsFileWriter.registerAlignedTimeseries(new Path(deviceId), alignedMeasurementSchemas);
}
public void registerTimeseries(TsFileWriter tsFileWriter) {
- measurementSchemas.add(new UnaryMeasurementSchema("s1", TSDataType.INT64, TSEncoding.PLAIN));
- measurementSchemas.add(new UnaryMeasurementSchema("s2", TSDataType.INT64, TSEncoding.PLAIN));
- measurementSchemas.add(new UnaryMeasurementSchema("s3", TSDataType.INT64, TSEncoding.PLAIN));
+ measurementSchemas.add(new MeasurementSchema("s1", TSDataType.INT64, TSEncoding.PLAIN));
+ measurementSchemas.add(new MeasurementSchema("s2", TSDataType.INT64, TSEncoding.PLAIN));
+ measurementSchemas.add(new MeasurementSchema("s3", TSDataType.INT64, TSEncoding.PLAIN));
// register nonAlign timeseries
tsFileWriter.registerTimeseries(new Path(deviceId), measurementSchemas);
@@ -89,7 +85,7 @@ public class TsFileWriteApiTest {
try (TsFileWriter tsFileWriter = new TsFileWriter(f)) {
registerTimeseries(tsFileWriter);
- List<UnaryMeasurementSchema> writeMeasurementScheams = new ArrayList<>();
+ List<MeasurementSchema> writeMeasurementScheams = new ArrayList<>();
// example 1
writeMeasurementScheams.add(measurementSchemas.get(0));
writeMeasurementScheams.add(measurementSchemas.get(1));
@@ -117,7 +113,7 @@ public class TsFileWriteApiTest {
try (TsFileWriter tsFileWriter = new TsFileWriter(f)) {
registerAlignedTimeseries(tsFileWriter);
- List<UnaryMeasurementSchema> writeMeasurementScheams = new ArrayList<>();
+ List<MeasurementSchema> writeMeasurementScheams = new ArrayList<>();
// example1
writeMeasurementScheams.add(alignedMeasurementSchemas.get(0));
writeMeasurementScheams.add(alignedMeasurementSchemas.get(1));
@@ -145,7 +141,7 @@ public class TsFileWriteApiTest {
try (TsFileWriter tsFileWriter = new TsFileWriter(f)) {
registerTimeseries(tsFileWriter);
- List<UnaryMeasurementSchema> writeMeasurementScheams = new ArrayList<>();
+ List<MeasurementSchema> writeMeasurementScheams = new ArrayList<>();
// example 1
writeMeasurementScheams.add(measurementSchemas.get(0));
writeMeasurementScheams.add(measurementSchemas.get(1));
@@ -173,7 +169,7 @@ public class TsFileWriteApiTest {
try (TsFileWriter tsFileWriter = new TsFileWriter(f)) {
registerAlignedTimeseries(tsFileWriter);
- List<UnaryMeasurementSchema> writeMeasurementScheams = new ArrayList<>();
+ List<MeasurementSchema> writeMeasurementScheams = new ArrayList<>();
// example 1
writeMeasurementScheams.add(alignedMeasurementSchemas.get(0));
TsFileGeneratorForTest.writeWithTablet(
@@ -200,7 +196,7 @@ public class TsFileWriteApiTest {
try (TsFileWriter tsFileWriter = new TsFileWriter(f)) {
registerAlignedTimeseries(tsFileWriter);
- List<UnaryMeasurementSchema> writeMeasurementScheams = new ArrayList<>();
+ List<MeasurementSchema> writeMeasurementScheams = new ArrayList<>();
// example 1
writeMeasurementScheams.add(alignedMeasurementSchemas.get(0));
writeMeasurementScheams.add(alignedMeasurementSchemas.get(1));
@@ -227,7 +223,7 @@ public class TsFileWriteApiTest {
try (TsFileWriter tsFileWriter = new TsFileWriter(f)) {
registerAlignedTimeseries(tsFileWriter);
- List<UnaryMeasurementSchema> writeMeasurementScheams = new ArrayList<>();
+ List<MeasurementSchema> writeMeasurementScheams = new ArrayList<>();
// example 1
writeMeasurementScheams.add(alignedMeasurementSchemas.get(0));
writeMeasurementScheams.add(alignedMeasurementSchemas.get(1));
@@ -253,7 +249,7 @@ public class TsFileWriteApiTest {
try (TsFileWriter tsFileWriter = new TsFileWriter(f)) {
registerAlignedTimeseries(tsFileWriter);
- List<UnaryMeasurementSchema> writeMeasurementScheams = new ArrayList<>();
+ List<MeasurementSchema> writeMeasurementScheams = new ArrayList<>();
// example 1
writeMeasurementScheams.add(alignedMeasurementSchemas.get(0));
writeMeasurementScheams.add(alignedMeasurementSchemas.get(1));
@@ -294,7 +290,7 @@ public class TsFileWriteApiTest {
try (TsFileWriter tsFileWriter = new TsFileWriter(f)) {
registerTimeseries(tsFileWriter);
- List<UnaryMeasurementSchema> writeMeasurementScheams = new ArrayList<>();
+ List<MeasurementSchema> writeMeasurementScheams = new ArrayList<>();
// example 1
writeMeasurementScheams.add(measurementSchemas.get(0));
writeMeasurementScheams.add(measurementSchemas.get(1));
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileWriterTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileWriterTest.java
index edb5f08..15dddac 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileWriterTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileWriterTest.java
@@ -36,7 +36,7 @@ import org.apache.iotdb.tsfile.write.record.TSRecord;
import org.apache.iotdb.tsfile.write.record.Tablet;
import org.apache.iotdb.tsfile.write.record.datapoint.FloatDataPoint;
import org.apache.iotdb.tsfile.write.record.datapoint.IntDataPoint;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Assert;
@@ -93,8 +93,7 @@ public class TsFileWriterTest {
try {
writer.registerTimeseries(
new Path("d1"),
- new UnaryMeasurementSchema(
- "s1", TSDataType.FLOAT, TSEncoding.RLE, CompressionType.SNAPPY));
+ new MeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE, CompressionType.SNAPPY));
} catch (WriteProcessException e) {
e.printStackTrace();
fail(e.getMessage());
@@ -102,42 +101,40 @@ public class TsFileWriterTest {
try {
writer.registerTimeseries(
new Path("d1"),
- new UnaryMeasurementSchema(
- "s1", TSDataType.FLOAT, TSEncoding.RLE, CompressionType.SNAPPY));
+ new MeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE, CompressionType.SNAPPY));
} catch (WriteProcessException e) {
Assert.assertEquals("given nonAligned timeseries d1.s1 has been registered.", e.getMessage());
}
try {
- List<UnaryMeasurementSchema> schemas = new ArrayList<>();
+ List<MeasurementSchema> schemas = new ArrayList<>();
schemas.add(
- new UnaryMeasurementSchema(
- "s1", TSDataType.FLOAT, TSEncoding.RLE, CompressionType.SNAPPY));
+ new MeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE, CompressionType.SNAPPY));
writer.registerAlignedTimeseries(new Path("d1"), schemas);
} catch (WriteProcessException e) {
Assert.assertEquals(
"given device d1 has been registered for nonAligned timeseries.", e.getMessage());
}
- List<UnaryMeasurementSchema> schemas = new ArrayList<>();
+ List<MeasurementSchema> schemas = new ArrayList<>();
schemas.add(
- new UnaryMeasurementSchema("s2", TSDataType.INT32, TSEncoding.RLE, CompressionType.SNAPPY));
+ new MeasurementSchema("s2", TSDataType.INT32, TSEncoding.RLE, CompressionType.SNAPPY));
schemas.add(
- new UnaryMeasurementSchema("s3", TSDataType.INT32, TSEncoding.RLE, CompressionType.SNAPPY));
+ new MeasurementSchema("s3", TSDataType.INT32, TSEncoding.RLE, CompressionType.SNAPPY));
writer.registerTimeseries(new Path("d1"), schemas);
// Register aligned timeseries "d2.s1" , "d2.s2", "d2.s3"
try {
- List<UnaryMeasurementSchema> measurementSchemas = new ArrayList<>();
- measurementSchemas.add(new UnaryMeasurementSchema("s1", TSDataType.TEXT, TSEncoding.PLAIN));
- measurementSchemas.add(new UnaryMeasurementSchema("s2", TSDataType.TEXT, TSEncoding.PLAIN));
- measurementSchemas.add(new UnaryMeasurementSchema("s3", TSDataType.TEXT, TSEncoding.PLAIN));
+ List<MeasurementSchema> measurementSchemas = new ArrayList<>();
+ measurementSchemas.add(new MeasurementSchema("s1", TSDataType.TEXT, TSEncoding.PLAIN));
+ measurementSchemas.add(new MeasurementSchema("s2", TSDataType.TEXT, TSEncoding.PLAIN));
+ measurementSchemas.add(new MeasurementSchema("s3", TSDataType.TEXT, TSEncoding.PLAIN));
writer.registerAlignedTimeseries(new Path("d2"), measurementSchemas);
} catch (WriteProcessException e) {
e.printStackTrace();
fail(e.getMessage());
}
try {
- List<UnaryMeasurementSchema> measurementSchemas = new ArrayList<>();
- measurementSchemas.add(new UnaryMeasurementSchema("s4", TSDataType.TEXT, TSEncoding.PLAIN));
+ List<MeasurementSchema> measurementSchemas = new ArrayList<>();
+ measurementSchemas.add(new MeasurementSchema("s4", TSDataType.TEXT, TSEncoding.PLAIN));
writer.registerAlignedTimeseries(new Path("d2"), measurementSchemas);
} catch (WriteProcessException e) {
Assert.assertEquals(
@@ -147,8 +144,7 @@ public class TsFileWriterTest {
try {
writer.registerTimeseries(
new Path("d2"),
- new UnaryMeasurementSchema(
- "s5", TSDataType.INT32, TSEncoding.RLE, CompressionType.SNAPPY));
+ new MeasurementSchema("s5", TSDataType.INT32, TSEncoding.RLE, CompressionType.SNAPPY));
} catch (WriteProcessException e) {
Assert.assertEquals(
"given device d2 has been registered for aligned timeseries.", e.getMessage());
@@ -257,9 +253,9 @@ public class TsFileWriterTest {
new Tablet(
"d1",
Arrays.asList(
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"s1", TSDataType.FLOAT, TSEncoding.RLE, CompressionType.SNAPPY),
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"s2", TSDataType.INT32, TSEncoding.RLE, CompressionType.SNAPPY)));
tablet.timestamps[0] = 10000;
((float[]) tablet.values[0])[0] = 5.0f;
@@ -276,9 +272,9 @@ public class TsFileWriterTest {
new Tablet(
"d1",
Arrays.asList(
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"s1", TSDataType.FLOAT, TSEncoding.RLE, CompressionType.SNAPPY),
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"s2", TSDataType.INT32, TSEncoding.RLE, CompressionType.SNAPPY)));
tablet.timestamps[0] = 10000;
((float[]) tablet.values[0])[0] = 5.0f;
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 b96abad..04bb44c 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
@@ -31,8 +31,8 @@ import org.apache.iotdb.tsfile.read.common.Path;
import org.apache.iotdb.tsfile.utils.RecordUtils;
import org.apache.iotdb.tsfile.utils.StringContainer;
import org.apache.iotdb.tsfile.write.record.TSRecord;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.Schema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import org.junit.After;
import org.junit.Before;
@@ -60,7 +60,7 @@ public class WriteTest {
private String outputDataFile;
private String errorOutputDataFile;
private Random rm = new Random();
- private ArrayList<UnaryMeasurementSchema> measurementArray;
+ private ArrayList<MeasurementSchema> measurementArray;
private ArrayList<Path> pathArray;
private Schema schema;
private int stageSize = 4;
@@ -99,12 +99,12 @@ public class WriteTest {
errorFile.delete();
}
measurementArray = new ArrayList<>();
- measurementArray.add(new UnaryMeasurementSchema("s0", TSDataType.INT32, TSEncoding.RLE));
- measurementArray.add(new UnaryMeasurementSchema("s1", TSDataType.INT64, TSEncoding.TS_2DIFF));
+ measurementArray.add(new MeasurementSchema("s0", TSDataType.INT32, TSEncoding.RLE));
+ measurementArray.add(new MeasurementSchema("s1", TSDataType.INT64, TSEncoding.TS_2DIFF));
HashMap<String, String> props = new HashMap<>();
props.put("max_point_number", "2");
measurementArray.add(
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"s2",
TSDataType.FLOAT,
TSEncoding.RLE,
@@ -113,13 +113,13 @@ public class WriteTest {
props = new HashMap<>();
props.put("max_point_number", "3");
measurementArray.add(
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"s3",
TSDataType.DOUBLE,
TSEncoding.TS_2DIFF,
TSFileDescriptor.getInstance().getConfig().getCompressor(),
props));
- measurementArray.add(new UnaryMeasurementSchema("s4", TSDataType.BOOLEAN, TSEncoding.PLAIN));
+ measurementArray.add(new MeasurementSchema("s4", TSDataType.BOOLEAN, TSEncoding.PLAIN));
pathArray = new ArrayList<>();
for (int i = 0; i < 5; i++) {
pathArray.add(new Path("d1", "s" + i));
@@ -250,7 +250,7 @@ public class WriteTest {
}
// test duplicate measurement adding
Path path = pathArray.get(measurementArray.size() - 1);
- UnaryMeasurementSchema dupTimeseries = measurementArray.get(measurementArray.size() - 1);
+ MeasurementSchema dupTimeseries = measurementArray.get(measurementArray.size() - 1);
try {
tsFileWriter.registerTimeseries(new Path(path.getDevice()), dupTimeseries);
} catch (WriteProcessException e) {
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 a285c87..28d283e 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
@@ -25,8 +25,8 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
import org.apache.iotdb.tsfile.read.common.Path;
import org.apache.iotdb.tsfile.utils.MeasurementGroup;
import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.apache.iotdb.tsfile.write.schema.Schema;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
import org.junit.Test;
@@ -47,11 +47,11 @@ public class SchemaBuilderTest {
Schema schema = new Schema();
schema.registerTimeseries(
new Path("d1"),
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"s4", TSDataType.DOUBLE, TSEncoding.RLE, CompressionType.SNAPPY, props));
schema.registerTimeseries(
new Path("d1"),
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"s5", TSDataType.INT32, TSEncoding.TS_2DIFF, CompressionType.UNCOMPRESSED, null));
List<IMeasurementSchema> timeseries = new ArrayList<>();
@@ -77,14 +77,14 @@ public class SchemaBuilderTest {
Map<String, String> props = new HashMap<>();
props.put(JsonFormatConstant.MAX_POINT_NUMBER, "3");
Schema schema = new Schema();
- Map<String, UnaryMeasurementSchema> template = new HashMap<>();
+ Map<String, MeasurementSchema> template = new HashMap<>();
template.put(
"s4",
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"s4", TSDataType.DOUBLE, TSEncoding.RLE, CompressionType.SNAPPY, props));
template.put(
"s5",
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"s5", TSDataType.INT32, TSEncoding.TS_2DIFF, CompressionType.UNCOMPRESSED, null));
MeasurementGroup measurementGroup = new MeasurementGroup(false, template);
schema.registerSchemaTemplate("template1", measurementGroup);
@@ -113,21 +113,21 @@ public class SchemaBuilderTest {
Map<String, String> props = new HashMap<>();
props.put(JsonFormatConstant.MAX_POINT_NUMBER, "3");
Schema schema = new Schema();
- Map<String, UnaryMeasurementSchema> template = new HashMap<>();
+ Map<String, MeasurementSchema> template = new HashMap<>();
template.put(
"s4",
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"s4", TSDataType.DOUBLE, TSEncoding.RLE, CompressionType.SNAPPY, props));
template.put(
"s5",
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"s5", TSDataType.INT32, TSEncoding.TS_2DIFF, CompressionType.UNCOMPRESSED, null));
MeasurementGroup measurementGroup = new MeasurementGroup(false, template);
schema.registerSchemaTemplate("template1", measurementGroup);
schema.extendTemplate(
"template1",
- new UnaryMeasurementSchema(
+ new MeasurementSchema(
"s6", TSDataType.INT64, TSEncoding.RLE, CompressionType.SNAPPY, props));
schema.registerDevice("d1", "template1");
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/ForceAppendTsFileWriterTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/ForceAppendTsFileWriterTest.java
index 8299bd3..fd3e7aa 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/ForceAppendTsFileWriterTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/ForceAppendTsFileWriterTest.java
@@ -32,7 +32,7 @@ import org.apache.iotdb.tsfile.utils.TsFileGeneratorForTest;
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.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.junit.Assert;
import org.junit.Test;
@@ -67,9 +67,9 @@ public class ForceAppendTsFileWriterTest {
TsFileWriter writer = new TsFileWriter(file);
writer.registerTimeseries(
- new Path("d1"), new UnaryMeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
+ new Path("d1"), new MeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
writer.registerTimeseries(
- new Path("d1"), new UnaryMeasurementSchema("s2", TSDataType.FLOAT, TSEncoding.RLE));
+ new Path("d1"), new MeasurementSchema("s2", TSDataType.FLOAT, TSEncoding.RLE));
writer.write(
new TSRecord(1, "d1")
.addTuple(new FloatDataPoint("s1", 5))
@@ -89,9 +89,9 @@ public class ForceAppendTsFileWriterTest {
// write more data into this TsFile
writer = new TsFileWriter(fwriter);
writer.registerTimeseries(
- new Path("d1"), new UnaryMeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
+ new Path("d1"), new MeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
writer.registerTimeseries(
- new Path("d1"), new UnaryMeasurementSchema("s2", TSDataType.FLOAT, TSEncoding.RLE));
+ new Path("d1"), new MeasurementSchema("s2", TSDataType.FLOAT, TSEncoding.RLE));
writer.write(
new TSRecord(3, "d1")
.addTuple(new FloatDataPoint("s1", 5))
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/MeasurementSchemaSerializeTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/MeasurementSchemaSerializeTest.java
index b3113c7..61b99e1 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/MeasurementSchemaSerializeTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/MeasurementSchemaSerializeTest.java
@@ -20,7 +20,7 @@ package org.apache.iotdb.tsfile.write.writer;
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.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.junit.Test;
@@ -35,23 +35,23 @@ public class MeasurementSchemaSerializeTest {
@Test
public void deserializeFromByteBufferTest() throws IOException {
- UnaryMeasurementSchema standard =
- new UnaryMeasurementSchema("sensor_1", TSDataType.FLOAT, TSEncoding.RLE);
+ MeasurementSchema standard =
+ new MeasurementSchema("sensor_1", TSDataType.FLOAT, TSEncoding.RLE);
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
standard.serializeTo(outputStream);
ByteBuffer byteBuffer = ByteBuffer.wrap(outputStream.toByteArray());
- UnaryMeasurementSchema measurementSchema = UnaryMeasurementSchema.deserializeFrom(byteBuffer);
+ MeasurementSchema measurementSchema = MeasurementSchema.deserializeFrom(byteBuffer);
assertEquals(standard, measurementSchema);
}
@Test
public void deserializeFromInputStreamTest() throws IOException {
- UnaryMeasurementSchema standard =
- new UnaryMeasurementSchema("sensor_1", TSDataType.FLOAT, TSEncoding.RLE);
+ MeasurementSchema standard =
+ new MeasurementSchema("sensor_1", TSDataType.FLOAT, TSEncoding.RLE);
ByteBuffer byteBuffer = ByteBuffer.allocate(1024);
standard.serializeTo(byteBuffer);
ByteArrayInputStream inputStream = new ByteArrayInputStream(byteBuffer.array());
- UnaryMeasurementSchema measurementSchema = UnaryMeasurementSchema.deserializeFrom(inputStream);
+ MeasurementSchema measurementSchema = MeasurementSchema.deserializeFrom(inputStream);
assertEquals(standard, measurementSchema);
}
}
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/PageWriterTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/PageWriterTest.java
index efe11b8..8d8b385 100755
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/PageWriterTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/PageWriterTest.java
@@ -26,7 +26,7 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
import org.apache.iotdb.tsfile.utils.Binary;
import org.apache.iotdb.tsfile.utils.ReadWriteForEncodingUtils;
import org.apache.iotdb.tsfile.write.page.PageWriter;
-import org.apache.iotdb.tsfile.write.schema.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.junit.Test;
@@ -51,7 +51,7 @@ public class PageWriterTest {
assertEquals(9, writer.estimateMaxMemSize());
ByteBuffer buffer1 = writer.getUncompressedBytes();
ByteBuffer buffer = ByteBuffer.wrap(buffer1.array());
- writer.reset(new UnaryMeasurementSchema("s0", TSDataType.INT32, TSEncoding.RLE));
+ writer.reset(new MeasurementSchema("s0", TSDataType.INT32, TSEncoding.RLE));
assertEquals(0, writer.estimateMaxMemSize());
int timeSize = ReadWriteForEncodingUtils.readUnsignedVarInt(buffer);
byte[] timeBytes = new byte[timeSize];
@@ -81,7 +81,7 @@ public class PageWriterTest {
assertEquals(16, writer.estimateMaxMemSize());
ByteBuffer buffer1 = writer.getUncompressedBytes();
ByteBuffer buffer = ByteBuffer.wrap(buffer1.array());
- writer.reset(new UnaryMeasurementSchema("s0", TSDataType.INT64, TSEncoding.RLE));
+ writer.reset(new MeasurementSchema("s0", TSDataType.INT64, TSEncoding.RLE));
assertEquals(0, writer.estimateMaxMemSize());
int timeSize = ReadWriteForEncodingUtils.readUnsignedVarInt(buffer);
byte[] timeBytes = new byte[timeSize];
@@ -111,7 +111,7 @@ public class PageWriterTest {
assertEquals(12, writer.estimateMaxMemSize());
ByteBuffer buffer1 = writer.getUncompressedBytes();
ByteBuffer buffer = ByteBuffer.wrap(buffer1.array());
- writer.reset(new UnaryMeasurementSchema("s0", TSDataType.INT64, TSEncoding.RLE));
+ writer.reset(new MeasurementSchema("s0", TSDataType.INT64, TSEncoding.RLE));
assertEquals(0, writer.estimateMaxMemSize());
int timeSize = ReadWriteForEncodingUtils.readUnsignedVarInt(buffer);
byte[] timeBytes = new byte[timeSize];
@@ -141,7 +141,7 @@ public class PageWriterTest {
assertEquals(9, writer.estimateMaxMemSize());
ByteBuffer buffer1 = writer.getUncompressedBytes();
ByteBuffer buffer = ByteBuffer.wrap(buffer1.array());
- writer.reset(new UnaryMeasurementSchema("s0", TSDataType.INT64, TSEncoding.RLE));
+ writer.reset(new MeasurementSchema("s0", TSDataType.INT64, TSEncoding.RLE));
assertEquals(0, writer.estimateMaxMemSize());
int timeSize = ReadWriteForEncodingUtils.readUnsignedVarInt(buffer);
byte[] timeBytes = new byte[timeSize];
@@ -170,7 +170,7 @@ public class PageWriterTest {
assertEquals(23, writer.estimateMaxMemSize());
ByteBuffer buffer1 = writer.getUncompressedBytes();
ByteBuffer buffer = ByteBuffer.wrap(buffer1.array());
- writer.reset(new UnaryMeasurementSchema("s0", TSDataType.INT64, TSEncoding.RLE));
+ writer.reset(new MeasurementSchema("s0", TSDataType.INT64, TSEncoding.RLE));
assertEquals(0, writer.estimateMaxMemSize());
int timeSize = ReadWriteForEncodingUtils.readUnsignedVarInt(buffer);
byte[] timeBytes = new byte[timeSize];
@@ -200,7 +200,7 @@ public class PageWriterTest {
assertEquals(16, writer.estimateMaxMemSize());
ByteBuffer buffer1 = writer.getUncompressedBytes();
ByteBuffer buffer = ByteBuffer.wrap(buffer1.array());
- writer.reset(new UnaryMeasurementSchema("s0", TSDataType.INT64, TSEncoding.RLE));
+ writer.reset(new MeasurementSchema("s0", TSDataType.INT64, TSEncoding.RLE));
assertEquals(0, writer.estimateMaxMemSize());
int timeSize = ReadWriteForEncodingUtils.readUnsignedVarInt(buffer);
byte[] timeBytes = new byte[timeSize];
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 e24b4d5..1cc15ba 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
@@ -40,7 +40,7 @@ import org.apache.iotdb.tsfile.utils.TsFileGeneratorForTest;
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.UnaryMeasurementSchema;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Assert;
@@ -132,7 +132,7 @@ public class RestorableTsFileIOWriterTest {
writer
.getIOWriter()
.startFlushChunk(
- new UnaryMeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.PLAIN).getMeasurementId(),
+ new MeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.PLAIN).getMeasurementId(),
CompressionType.SNAPPY,
TSDataType.FLOAT,
TSEncoding.PLAIN,
@@ -153,9 +153,9 @@ public class RestorableTsFileIOWriterTest {
public void testOnlyOneChunkHeaderAndSomePage() throws Exception {
TsFileWriter writer = new TsFileWriter(file);
writer.registerTimeseries(
- new Path("d1"), new UnaryMeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
+ new Path("d1"), new MeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
writer.registerTimeseries(
- new Path("d1"), new UnaryMeasurementSchema("s2", TSDataType.FLOAT, TSEncoding.RLE));
+ new Path("d1"), new MeasurementSchema("s2", TSDataType.FLOAT, TSEncoding.RLE));
writer.write(
new TSRecord(1, "d1")
.addTuple(new FloatDataPoint("s1", 5))
@@ -167,9 +167,9 @@ public class RestorableTsFileIOWriterTest {
writer.flushAllChunkGroups();
long pos1 = writer.getIOWriter().getPos();
writer.registerTimeseries(
- new Path("d2"), new UnaryMeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
+ new Path("d2"), new MeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
writer.registerTimeseries(
- new Path("d2"), new UnaryMeasurementSchema("s2", TSDataType.FLOAT, TSEncoding.RLE));
+ new Path("d2"), new MeasurementSchema("s2", TSDataType.FLOAT, TSEncoding.RLE));
writer.write(
new TSRecord(3, "d1")
.addTuple(new FloatDataPoint("s1", 5))
@@ -191,9 +191,9 @@ public class RestorableTsFileIOWriterTest {
public void testOnlyOneChunkGroup() throws Exception {
TsFileWriter writer = new TsFileWriter(file);
writer.registerTimeseries(
- new Path("d1"), new UnaryMeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
+ new Path("d1"), new MeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
writer.registerTimeseries(
- new Path("d1"), new UnaryMeasurementSchema("s2", TSDataType.FLOAT, TSEncoding.RLE));
+ new Path("d1"), new MeasurementSchema("s2", TSDataType.FLOAT, TSEncoding.RLE));
writer.write(
new TSRecord(1, "d1")
.addTuple(new FloatDataPoint("s1", 5))
@@ -232,9 +232,9 @@ public class RestorableTsFileIOWriterTest {
public void testOnlyOneChunkGroupAndOneMarker() throws Exception {
TsFileWriter writer = new TsFileWriter(file);
writer.registerTimeseries(
- new Path("d1"), new UnaryMeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
+ new Path("d1"), new MeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
writer.registerTimeseries(
- new Path("d1"), new UnaryMeasurementSchema("s2", TSDataType.FLOAT, TSEncoding.RLE));
+ new Path("d1"), new MeasurementSchema("s2", TSDataType.FLOAT, TSEncoding.RLE));
writer.write(
new TSRecord(1, "d1")
.addTuple(new FloatDataPoint("s1", 5))
@@ -264,13 +264,13 @@ public class RestorableTsFileIOWriterTest {
public void testTwoChunkGroupAndMore() throws Exception {
TsFileWriter writer = new TsFileWriter(file);
writer.registerTimeseries(
- new Path("d1"), new UnaryMeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
+ new Path("d1"), new MeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
writer.registerTimeseries(
- new Path("d1"), new UnaryMeasurementSchema("s2", TSDataType.FLOAT, TSEncoding.RLE));
+ new Path("d1"), new MeasurementSchema("s2", TSDataType.FLOAT, TSEncoding.RLE));
writer.registerTimeseries(
- new Path("d2"), new UnaryMeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
+ new Path("d2"), new MeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
writer.registerTimeseries(
- new Path("d2"), new UnaryMeasurementSchema("s2", TSDataType.FLOAT, TSEncoding.RLE));
+ new Path("d2"), new MeasurementSchema("s2", TSDataType.FLOAT, TSEncoding.RLE));
writer.write(
new TSRecord(1, "d1")
.addTuple(new FloatDataPoint("s1", 5))
@@ -312,13 +312,13 @@ public class RestorableTsFileIOWriterTest {
public void testNoSeperatorMask() throws Exception {
TsFileWriter writer = new TsFileWriter(file);
writer.registerTimeseries(
- new Path("d1"), new UnaryMeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
+ new Path("d1"), new MeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
writer.registerTimeseries(
- new Path("d1"), new UnaryMeasurementSchema("s2", TSDataType.FLOAT, TSEncoding.RLE));
+ new Path("d1"), new MeasurementSchema("s2", TSDataType.FLOAT, TSEncoding.RLE));
writer.registerTimeseries(
- new Path("d2"), new UnaryMeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
+ new Path("d2"), new MeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
writer.registerTimeseries(
- new Path("d2"), new UnaryMeasurementSchema("s2", TSDataType.FLOAT, TSEncoding.RLE));
+ new Path("d2"), new MeasurementSchema("s2", TSDataType.FLOAT, TSEncoding.RLE));
writer.write(
new TSRecord(1, "d1")
.addTuple(new FloatDataPoint("s1", 5))
@@ -360,13 +360,13 @@ public class RestorableTsFileIOWriterTest {
public void testHavingSomeFileMetadata() throws Exception {
TsFileWriter writer = new TsFileWriter(file);
writer.registerTimeseries(
- new Path("d1"), new UnaryMeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
+ new Path("d1"), new MeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
writer.registerTimeseries(
- new Path("d1"), new UnaryMeasurementSchema("s2", TSDataType.FLOAT, TSEncoding.RLE));
+ new Path("d1"), new MeasurementSchema("s2", TSDataType.FLOAT, TSEncoding.RLE));
writer.registerTimeseries(
- new Path("d2"), new UnaryMeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
+ new Path("d2"), new MeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
writer.registerTimeseries(
- new Path("d2"), new UnaryMeasurementSchema("s2", TSDataType.FLOAT, TSEncoding.RLE));
+ new Path("d2"), new MeasurementSchema("s2", TSDataType.FLOAT, TSEncoding.RLE));
writer.write(
new TSRecord(1, "d1")
.addTuple(new FloatDataPoint("s1", 5))
@@ -409,9 +409,9 @@ public class RestorableTsFileIOWriterTest {
public void testOpenCompleteFile() throws Exception {
TsFileWriter writer = new TsFileWriter(file);
writer.registerTimeseries(
- new Path("d1"), new UnaryMeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
+ new Path("d1"), new MeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
writer.registerTimeseries(
- new Path("d1"), new UnaryMeasurementSchema("s2", TSDataType.FLOAT, TSEncoding.RLE));
+ new Path("d1"), new MeasurementSchema("s2", TSDataType.FLOAT, TSEncoding.RLE));
writer.write(
new TSRecord(1, "d1")
.addTuple(new FloatDataPoint("s1", 5))
@@ -442,9 +442,9 @@ public class RestorableTsFileIOWriterTest {
public void testAppendDataOnCompletedFile() throws Exception {
TsFileWriter writer = new TsFileWriter(file);
writer.registerTimeseries(
- new Path("d1"), new UnaryMeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
+ new Path("d1"), new MeasurementSchema("s1", TSDataType.FLOAT, TSEncoding.RLE));
writer.registerTimeseries(
- new Path("d1"), new UnaryMeasurementSchema("s2", TSDataType.FLOAT, TSEncoding.RLE));
+ new Path("d1"), new MeasurementSchema("s2", TSDataType.FLOAT, TSEncoding.RLE));
writer.write(
new TSRecord(1, "d1")
.addTuple(new FloatDataPoint("s1", 5))