This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/tsfile.git
The following commit(s) were added to refs/heads/develop by this push:
new 33ea4854 Rename table model fields (#344)
33ea4854 is described below
commit 33ea4854f31c08367c2218065f3ee99a5468bde2
Author: shuwenwei <[email protected]>
AuthorDate: Tue Dec 24 18:08:30 2024 +0800
Rename table model fields (#344)
* rename table model fields
* modify example
---
.../tsfile/v4/ITsFileReaderAndITsFileWriter.java | 36 +++++++++++-----------
.../tsfile/v4/WriteTabletWithITsFileWriter.java | 24 +++++++--------
.../java/org/apache/tsfile/tools/TsFileTool.java | 6 ++--
.../tsfile/file/metadata/ColumnSchemaBuilder.java | 2 +-
.../tsfile/file/metadata/LogicalTableSchema.java | 2 +-
.../apache/tsfile/file/metadata/TableSchema.java | 6 ++--
.../read/query/executor/TableQueryExecutor.java | 2 +-
.../write/chunk/AlignedChunkGroupWriterImpl.java | 2 +-
.../chunk/NonAlignedChunkGroupWriterImpl.java | 2 +-
.../org/apache/tsfile/write/record/Tablet.java | 12 ++++----
.../tsfile/read/TsFileDeviceIteratorTest.java | 10 +++---
.../read/TsFileV4ReadWriteInterfacesTest.java | 8 ++---
.../apache/tsfile/read/query/ResultSetTest.java | 24 +++++++--------
.../read/reader/TsFileReaderEmptyChunkTest.java | 10 +++---
.../apache/tsfile/tableview/PerformanceTest.java | 8 ++---
.../apache/tsfile/tableview/TableSchemaTest.java | 10 +++---
.../org/apache/tsfile/tableview/TableViewTest.java | 16 +++++-----
.../apache/tsfile/write/TsFileWriteApiTest.java | 6 ++--
18 files changed, 93 insertions(+), 93 deletions(-)
diff --git
a/java/examples/src/main/java/org/apache/tsfile/v4/ITsFileReaderAndITsFileWriter.java
b/java/examples/src/main/java/org/apache/tsfile/v4/ITsFileReaderAndITsFileWriter.java
index e57b95de..b94944ff 100644
---
a/java/examples/src/main/java/org/apache/tsfile/v4/ITsFileReaderAndITsFileWriter.java
+++
b/java/examples/src/main/java/org/apache/tsfile/v4/ITsFileReaderAndITsFileWriter.java
@@ -59,32 +59,32 @@ public class ITsFileReaderAndITsFileWriter {
tableName,
Arrays.asList(
new ColumnSchemaBuilder()
- .name("id1")
+ .name("tag1")
.dataType(TSDataType.STRING)
- .category(Tablet.ColumnCategory.ID)
+ .category(Tablet.ColumnCategory.TAG)
.build(),
new ColumnSchemaBuilder()
- .name("id2")
+ .name("tag2")
.dataType(TSDataType.STRING)
- .category(Tablet.ColumnCategory.ID)
+ .category(Tablet.ColumnCategory.TAG)
.build(),
new ColumnSchemaBuilder()
.name("s1")
.dataType(TSDataType.INT32)
- .category(Tablet.ColumnCategory.MEASUREMENT)
+ .category(Tablet.ColumnCategory.FIELD)
.build(),
new
ColumnSchemaBuilder().name("s2").dataType(TSDataType.BOOLEAN).build()));
Tablet tablet =
new Tablet(
- Arrays.asList("id1", "id2", "s1", "s2"),
+ Arrays.asList("tag1", "tag2", "s1", "s2"),
Arrays.asList(
TSDataType.STRING, TSDataType.STRING, TSDataType.INT32,
TSDataType.BOOLEAN));
for (int row = 0; row < 5; row++) {
long timestamp = row;
tablet.addTimestamp(row, timestamp);
- tablet.addValue(row, "id1", "id1_filed_1");
- tablet.addValue(row, "id2", "id2_filed_1");
+ tablet.addValue(row, "tag1", "tag1_value_1");
+ tablet.addValue(row, "tag2", "tag2_value_1");
tablet.addValue(row, "s1", row);
// null value
// tablet.addValue(row, "s2", true);
@@ -93,11 +93,11 @@ public class ITsFileReaderAndITsFileWriter {
long timestamp = row;
tablet.addTimestamp(row, timestamp);
- // id1 column
- tablet.addValue(row, 0, "id1_field_2");
+ // tag1 column
+ tablet.addValue(row, 0, "tag1_value_2");
- // id2 column
- tablet.addValue(row, 1, "id1_field_2");
+ // tag2 column
+ tablet.addValue(row, 1, "tag1_value_2");
// s1 column: null value
// tablet.addValue(row, 2, row);
@@ -123,7 +123,7 @@ public class ITsFileReaderAndITsFileWriter {
// file is a required parameter
try (ITsFileReader reader = new TsFileReaderBuilder().file(f).build();
ResultSet resultSet =
- reader.query(tableName, Arrays.asList("id1", "id2", "s1", "s2"),
2, 8)) {
+ reader.query(tableName, Arrays.asList("tag1", "tag2", "s1", "s2"),
2, 8)) {
// first column is Time
ResultSetMetadata metadata = resultSet.getMetadata();
System.out.println(metadata);
@@ -134,17 +134,17 @@ public class ITsFileReaderAndITsFileWriter {
System.out.println(sj.toString());
while (resultSet.next()) {
// columnIndex starts from 1
- // Time id1 id2 s1 s2
+ // Time tag1 tag2 s1 s2
Long timeField = resultSet.getLong("Time");
- String id1Field = resultSet.isNull("id1") ? null :
resultSet.getString("id1");
- String id2Field = resultSet.isNull("id2") ? null :
resultSet.getString("id2");
+ String tag1 = resultSet.isNull("tag1") ? null :
resultSet.getString("tag1");
+ String tag2 = resultSet.isNull("tag2") ? null :
resultSet.getString("tag2");
Integer s1Field = resultSet.isNull("s1") ? null : resultSet.getInt(4);
Boolean s2Field = resultSet.isNull("s2") ? null :
resultSet.getBoolean(5);
sj = new StringJoiner(" ");
System.out.println(
sj.add(timeField + "")
- .add(id1Field)
- .add(id2Field)
+ .add(tag1)
+ .add(tag2)
.add(s1Field + "")
.add(s2Field + "")
.toString());
diff --git
a/java/examples/src/main/java/org/apache/tsfile/v4/WriteTabletWithITsFileWriter.java
b/java/examples/src/main/java/org/apache/tsfile/v4/WriteTabletWithITsFileWriter.java
index 5da781bd..e82b81fc 100644
---
a/java/examples/src/main/java/org/apache/tsfile/v4/WriteTabletWithITsFileWriter.java
+++
b/java/examples/src/main/java/org/apache/tsfile/v4/WriteTabletWithITsFileWriter.java
@@ -54,19 +54,19 @@ public class WriteTabletWithITsFileWriter {
tableName,
Arrays.asList(
new ColumnSchemaBuilder()
- .name("id1")
+ .name("tag1")
.dataType(TSDataType.STRING)
- .category(Tablet.ColumnCategory.ID)
+ .category(Tablet.ColumnCategory.TAG)
.build(),
new ColumnSchemaBuilder()
- .name("id2")
+ .name("tag2")
.dataType(TSDataType.STRING)
- .category(Tablet.ColumnCategory.ID)
+ .category(Tablet.ColumnCategory.TAG)
.build(),
new ColumnSchemaBuilder()
.name("s1")
.dataType(TSDataType.INT32)
- .category(Tablet.ColumnCategory.MEASUREMENT)
+ .category(Tablet.ColumnCategory.FIELD)
.build(),
new
ColumnSchemaBuilder().name("s2").dataType(TSDataType.BOOLEAN).build()));
@@ -81,14 +81,14 @@ public class WriteTabletWithITsFileWriter {
.build()) {
Tablet tablet =
new Tablet(
- Arrays.asList("id1", "id2", "s1", "s2"),
+ Arrays.asList("tag1", "tag2", "s1", "s2"),
Arrays.asList(
TSDataType.STRING, TSDataType.STRING, TSDataType.INT32,
TSDataType.BOOLEAN));
for (int row = 0; row < 5; row++) {
long timestamp = row;
tablet.addTimestamp(row, timestamp);
- tablet.addValue(row, "id1", "id1_filed_1");
- tablet.addValue(row, "id2", "id2_filed_1");
+ tablet.addValue(row, "tag1", "tag1_value_1");
+ tablet.addValue(row, "tag2", "tag2_value_1");
tablet.addValue(row, "s1", row);
tablet.addValue(row, "s2", true);
}
@@ -102,11 +102,11 @@ public class WriteTabletWithITsFileWriter {
// rowSize may be changed after addTimestamp
tablet.addTimestamp(rowIndex, timestamp);
- // id1 column
- tablet.addValue(rowIndex, 0, "id1_field_2");
+ // tag1 column
+ tablet.addValue(rowIndex, 0, "tag1_value_2");
- // id2 column
- tablet.addValue(rowIndex, 1, "id2_field_2");
+ // tag2 column
+ tablet.addValue(rowIndex, 1, "tag2_value_2");
// s1 column
tablet.addValue(rowIndex, 2, 1);
diff --git a/java/tools/src/main/java/org/apache/tsfile/tools/TsFileTool.java
b/java/tools/src/main/java/org/apache/tsfile/tools/TsFileTool.java
index 4366cee9..483e664c 100644
--- a/java/tools/src/main/java/org/apache/tsfile/tools/TsFileTool.java
+++ b/java/tools/src/main/java/org/apache/tsfile/tools/TsFileTool.java
@@ -120,7 +120,7 @@ public class TsFileTool {
measurementSchemas.add(
new MeasurementSchema(
idSchema.name, TSDataType.TEXT, TSEncoding.PLAIN,
CompressionType.UNCOMPRESSED));
- columnCategories.add(Tablet.ColumnCategory.ID);
+ columnCategories.add(Tablet.ColumnCategory.TAG);
}
List<SchemaParser.Column> newColumnList = new ArrayList<>();
@@ -139,7 +139,7 @@ public class TsFileTool {
TSDataType.valueOf(column.type),
TSEncoding.PLAIN,
CompressionType.UNCOMPRESSED));
- columnCategories.add(Tablet.ColumnCategory.MEASUREMENT);
+ columnCategories.add(Tablet.ColumnCategory.FIELD);
}
return new TableSchema(tableName, measurementSchemas, columnCategories);
}
@@ -269,7 +269,7 @@ public class TsFileTool {
case BOOLEAN:
return Boolean.valueOf(i);
case TEXT:
- if (columnCategory.equals(Tablet.ColumnCategory.MEASUREMENT)) {
+ if (columnCategory.equals(Tablet.ColumnCategory.FIELD)) {
return new Binary(String.valueOf(i), StandardCharsets.UTF_8);
} else {
return String.valueOf(i);
diff --git
a/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/ColumnSchemaBuilder.java
b/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/ColumnSchemaBuilder.java
index 7fcb66d7..26ab24a7 100644
---
a/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/ColumnSchemaBuilder.java
+++
b/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/ColumnSchemaBuilder.java
@@ -27,7 +27,7 @@ public class ColumnSchemaBuilder {
private String columnName;
private TSDataType columnDataType;
- private ColumnCategory columnCategory = ColumnCategory.MEASUREMENT;
+ private ColumnCategory columnCategory = ColumnCategory.FIELD;
@TsFileApi
public ColumnSchema build() {
diff --git
a/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/LogicalTableSchema.java
b/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/LogicalTableSchema.java
index 07925aea..3c3ef986 100644
---
a/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/LogicalTableSchema.java
+++
b/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/LogicalTableSchema.java
@@ -67,7 +67,7 @@ public class LogicalTableSchema extends TableSchema {
List<IMeasurementSchema> allColumns = new ArrayList<>(generateIdColumns());
List<ColumnCategory> allColumnCategories =
- ColumnCategory.nCopy(ColumnCategory.ID, allColumns.size());
+ ColumnCategory.nCopy(ColumnCategory.TAG, allColumns.size());
allColumns.addAll(measurementSchemas);
allColumnCategories.addAll(columnCategories);
measurementSchemas = allColumns;
diff --git
a/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/TableSchema.java
b/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/TableSchema.java
index c5792e89..f62cd583 100644
--- a/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/TableSchema.java
+++ b/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/TableSchema.java
@@ -206,9 +206,9 @@ public class TableSchema {
int columnOrder = 0;
for (int i = 0; i < measurementSchemas.size(); i++) {
if
(measurementSchemas.get(i).getMeasurementName().equals(lowerCaseColumnName)
- && columnCategories.get(i) == ColumnCategory.ID) {
+ && columnCategories.get(i) == ColumnCategory.TAG) {
return columnOrder;
- } else if (columnCategories.get(i) == ColumnCategory.ID) {
+ } else if (columnCategories.get(i) == ColumnCategory.TAG) {
columnOrder++;
}
}
@@ -231,7 +231,7 @@ public class TableSchema {
// if the measurement is not found in the column list, add it
if (columnIndex == -1) {
measurementSchemas.add(chunkMetadata.toMeasurementSchema());
- columnCategories.add(ColumnCategory.MEASUREMENT);
+ columnCategories.add(ColumnCategory.FIELD);
getColumnPosIndex().put(chunkMetadata.getMeasurementUid(),
measurementSchemas.size() - 1);
} else {
final IMeasurementSchema originSchema =
measurementSchemas.get(columnIndex);
diff --git
a/java/tsfile/src/main/java/org/apache/tsfile/read/query/executor/TableQueryExecutor.java
b/java/tsfile/src/main/java/org/apache/tsfile/read/query/executor/TableQueryExecutor.java
index 0c68ab37..82c59890 100644
---
a/java/tsfile/src/main/java/org/apache/tsfile/read/query/executor/TableQueryExecutor.java
+++
b/java/tsfile/src/main/java/org/apache/tsfile/read/query/executor/TableQueryExecutor.java
@@ -124,7 +124,7 @@ public class TableQueryExecutor {
final ColumnCategory columnCategory =
schema.getColumnTypes().get(columnIndex);
columnPosMap.computeIfAbsent(columnName, k -> new ArrayList<>()).add(i);
- if (columnCategory.equals(ColumnCategory.ID)) {
+ if (columnCategory.equals(ColumnCategory.TAG)) {
idColumns.add(columnName);
} else {
measurementColumns.add(columnName);
diff --git
a/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/AlignedChunkGroupWriterImpl.java
b/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/AlignedChunkGroupWriterImpl.java
index d6dd6c87..0fbaf94d 100644
---
a/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/AlignedChunkGroupWriterImpl.java
+++
b/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/AlignedChunkGroupWriterImpl.java
@@ -237,7 +237,7 @@ public class AlignedChunkGroupWriterImpl implements
IChunkGroupWriter {
checkIsHistoryData(time);
for (int columnIndex = 0; columnIndex < tablet.getSchemas().size();
columnIndex++) {
if (tablet.getColumnTypes() != null
- && tablet.getColumnTypes().get(columnIndex) !=
ColumnCategory.MEASUREMENT) {
+ && tablet.getColumnTypes().get(columnIndex) !=
ColumnCategory.FIELD) {
continue;
}
diff --git
a/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/NonAlignedChunkGroupWriterImpl.java
b/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/NonAlignedChunkGroupWriterImpl.java
index 75e5a9bc..3f4d8aa0 100644
---
a/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/NonAlignedChunkGroupWriterImpl.java
+++
b/java/tsfile/src/main/java/org/apache/tsfile/write/chunk/NonAlignedChunkGroupWriterImpl.java
@@ -113,7 +113,7 @@ public class NonAlignedChunkGroupWriterImpl implements
IChunkGroupWriter {
List<IMeasurementSchema> timeseries = tablet.getSchemas();
for (int column = 0; column < tablet.getSchemas().size(); column++) {
if (tablet.getColumnTypes() != null
- && tablet.getColumnTypes().get(column) !=
ColumnCategory.MEASUREMENT) {
+ && tablet.getColumnTypes().get(column) != ColumnCategory.FIELD) {
continue;
}
String measurementId = timeseries.get(column).getMeasurementName();
diff --git
a/java/tsfile/src/main/java/org/apache/tsfile/write/record/Tablet.java
b/java/tsfile/src/main/java/org/apache/tsfile/write/record/Tablet.java
index 02fbb72e..d5803edf 100644
--- a/java/tsfile/src/main/java/org/apache/tsfile/write/record/Tablet.java
+++ b/java/tsfile/src/main/java/org/apache/tsfile/write/record/Tablet.java
@@ -116,7 +116,7 @@ public class Tablet {
public Tablet(String deviceId, List<IMeasurementSchema> schemas, int
maxRowNumber) {
this.insertTargetName = deviceId;
this.schemas = new ArrayList<>(schemas);
- setColumnCategories(ColumnCategory.nCopy(ColumnCategory.MEASUREMENT,
schemas.size()));
+ setColumnCategories(ColumnCategory.nCopy(ColumnCategory.FIELD,
schemas.size()));
this.maxRowNumber = maxRowNumber;
measurementIndex = new HashMap<>();
constructMeasurementIndexMap();
@@ -141,7 +141,7 @@ public class Tablet {
deviceID.toString(),
measurementList,
dataTypeList,
- ColumnCategory.nCopy(ColumnCategory.MEASUREMENT,
measurementList.size()),
+ ColumnCategory.nCopy(ColumnCategory.FIELD, measurementList.size()),
maxRowNumber,
true);
}
@@ -231,7 +231,7 @@ public class Tablet {
int maxRowNumber) {
this.insertTargetName = deviceId;
this.schemas = schemas;
- setColumnCategories(ColumnCategory.nCopy(ColumnCategory.MEASUREMENT,
schemas.size()));
+ setColumnCategories(ColumnCategory.nCopy(ColumnCategory.FIELD,
schemas.size()));
this.timestamps = timestamps;
this.values = values;
this.bitMaps = bitMaps;
@@ -1176,7 +1176,7 @@ public class Tablet {
idColumnIndexes.clear();
for (int i = 0; i < columnCategories.size(); i++) {
ColumnCategory columnCategory = columnCategories.get(i);
- if (columnCategory.equals(ColumnCategory.ID)) {
+ if (columnCategory.equals(ColumnCategory.TAG)) {
idColumnIndexes.add(i);
}
}
@@ -1192,8 +1192,8 @@ public class Tablet {
}
public enum ColumnCategory {
- ID,
- MEASUREMENT,
+ TAG,
+ FIELD,
ATTRIBUTE;
public static List<ColumnCategory> nCopy(ColumnCategory type, int n) {
diff --git
a/java/tsfile/src/test/java/org/apache/tsfile/read/TsFileDeviceIteratorTest.java
b/java/tsfile/src/test/java/org/apache/tsfile/read/TsFileDeviceIteratorTest.java
index 4cd810ca..932f9a9c 100644
---
a/java/tsfile/src/test/java/org/apache/tsfile/read/TsFileDeviceIteratorTest.java
+++
b/java/tsfile/src/test/java/org/apache/tsfile/read/TsFileDeviceIteratorTest.java
@@ -97,11 +97,11 @@ public class TsFileDeviceIteratorTest {
new MeasurementSchema("s4", TSDataType.INT64));
List<Tablet.ColumnCategory> columnCategories =
Arrays.asList(
- Tablet.ColumnCategory.ID,
- Tablet.ColumnCategory.MEASUREMENT,
- Tablet.ColumnCategory.MEASUREMENT,
- Tablet.ColumnCategory.MEASUREMENT,
- Tablet.ColumnCategory.MEASUREMENT);
+ Tablet.ColumnCategory.TAG,
+ Tablet.ColumnCategory.FIELD,
+ Tablet.ColumnCategory.FIELD,
+ Tablet.ColumnCategory.FIELD,
+ Tablet.ColumnCategory.FIELD);
TableSchema tableSchema = new TableSchema(tableName, schemas,
columnCategories);
writer.getSchema().registerTableSchema(tableSchema);
}
diff --git
a/java/tsfile/src/test/java/org/apache/tsfile/read/TsFileV4ReadWriteInterfacesTest.java
b/java/tsfile/src/test/java/org/apache/tsfile/read/TsFileV4ReadWriteInterfacesTest.java
index 5f39d4f8..06679781 100644
---
a/java/tsfile/src/test/java/org/apache/tsfile/read/TsFileV4ReadWriteInterfacesTest.java
+++
b/java/tsfile/src/test/java/org/apache/tsfile/read/TsFileV4ReadWriteInterfacesTest.java
@@ -75,10 +75,10 @@ public class TsFileV4ReadWriteInterfacesTest {
new MeasurementSchema("id3", TSDataType.STRING),
new MeasurementSchema("s1", TSDataType.INT32)),
Arrays.asList(
- Tablet.ColumnCategory.ID,
- Tablet.ColumnCategory.ID,
- Tablet.ColumnCategory.ID,
- Tablet.ColumnCategory.MEASUREMENT));
+ Tablet.ColumnCategory.TAG,
+ Tablet.ColumnCategory.TAG,
+ Tablet.ColumnCategory.TAG,
+ Tablet.ColumnCategory.FIELD));
try (ITsFileWriter writer =
new
TsFileWriterBuilder().file(file).tableSchema(tableSchema).build()) {
Tablet tablet =
diff --git
a/java/tsfile/src/test/java/org/apache/tsfile/read/query/ResultSetTest.java
b/java/tsfile/src/test/java/org/apache/tsfile/read/query/ResultSetTest.java
index 8233a701..96cb2487 100644
--- a/java/tsfile/src/test/java/org/apache/tsfile/read/query/ResultSetTest.java
+++ b/java/tsfile/src/test/java/org/apache/tsfile/read/query/ResultSetTest.java
@@ -71,10 +71,10 @@ public class ResultSetTest {
new MeasurementSchema("s1", TSDataType.BOOLEAN),
new MeasurementSchema("s2", TSDataType.BOOLEAN)),
Arrays.asList(
- Tablet.ColumnCategory.ID,
- Tablet.ColumnCategory.ID,
- Tablet.ColumnCategory.MEASUREMENT,
- Tablet.ColumnCategory.MEASUREMENT));
+ Tablet.ColumnCategory.TAG,
+ Tablet.ColumnCategory.TAG,
+ Tablet.ColumnCategory.FIELD,
+ Tablet.ColumnCategory.FIELD));
Tablet tablet =
new Tablet(
Arrays.asList("id1", "id2", "s1", "s2"),
@@ -149,10 +149,10 @@ public class ResultSetTest {
new MeasurementSchema("s1", TSDataType.BOOLEAN),
new MeasurementSchema("s2", TSDataType.BOOLEAN)),
Arrays.asList(
- Tablet.ColumnCategory.ID,
- Tablet.ColumnCategory.ID,
- Tablet.ColumnCategory.MEASUREMENT,
- Tablet.ColumnCategory.MEASUREMENT));
+ Tablet.ColumnCategory.TAG,
+ Tablet.ColumnCategory.TAG,
+ Tablet.ColumnCategory.FIELD,
+ Tablet.ColumnCategory.FIELD));
Tablet tablet =
new Tablet(
Arrays.asList("id1", "id2", "s1", "s2"),
@@ -220,10 +220,10 @@ public class ResultSetTest {
new MeasurementSchema("s1", TSDataType.BOOLEAN),
new MeasurementSchema("s2", TSDataType.BOOLEAN)),
Arrays.asList(
- Tablet.ColumnCategory.ID,
- Tablet.ColumnCategory.ID,
- Tablet.ColumnCategory.MEASUREMENT,
- Tablet.ColumnCategory.MEASUREMENT));
+ Tablet.ColumnCategory.TAG,
+ Tablet.ColumnCategory.TAG,
+ Tablet.ColumnCategory.FIELD,
+ Tablet.ColumnCategory.FIELD));
Tablet tablet =
new Tablet(
Arrays.asList("id1", "id2", "s1", "s2"),
diff --git
a/java/tsfile/src/test/java/org/apache/tsfile/read/reader/TsFileReaderEmptyChunkTest.java
b/java/tsfile/src/test/java/org/apache/tsfile/read/reader/TsFileReaderEmptyChunkTest.java
index 4c175cd8..9120228c 100644
---
a/java/tsfile/src/test/java/org/apache/tsfile/read/reader/TsFileReaderEmptyChunkTest.java
+++
b/java/tsfile/src/test/java/org/apache/tsfile/read/reader/TsFileReaderEmptyChunkTest.java
@@ -115,11 +115,11 @@ public class TsFileReaderEmptyChunkTest {
new MeasurementSchema("s4", TSDataType.INT64));
final List<Tablet.ColumnCategory> columnCategories =
Arrays.asList(
- Tablet.ColumnCategory.ID,
- Tablet.ColumnCategory.MEASUREMENT,
- Tablet.ColumnCategory.MEASUREMENT,
- Tablet.ColumnCategory.MEASUREMENT,
- Tablet.ColumnCategory.MEASUREMENT);
+ Tablet.ColumnCategory.TAG,
+ Tablet.ColumnCategory.FIELD,
+ Tablet.ColumnCategory.FIELD,
+ Tablet.ColumnCategory.FIELD,
+ Tablet.ColumnCategory.FIELD);
final TableSchema tableSchema = new TableSchema(tableName, schemas,
columnCategories);
writer.getSchema().registerTableSchema(tableSchema);
}
diff --git
a/java/tsfile/src/test/java/org/apache/tsfile/tableview/PerformanceTest.java
b/java/tsfile/src/test/java/org/apache/tsfile/tableview/PerformanceTest.java
index 6547172b..1cef0a40 100644
--- a/java/tsfile/src/test/java/org/apache/tsfile/tableview/PerformanceTest.java
+++ b/java/tsfile/src/test/java/org/apache/tsfile/tableview/PerformanceTest.java
@@ -288,9 +288,9 @@ public class PerformanceTest {
private Tablet initTableTablet() {
List<IMeasurementSchema> allSchema = new ArrayList<>(idSchemas);
List<ColumnCategory> columnCategories =
- ColumnCategory.nCopy(ColumnCategory.ID, idSchemas.size());
+ ColumnCategory.nCopy(ColumnCategory.TAG, idSchemas.size());
allSchema.addAll(measurementSchemas);
- columnCategories.addAll(ColumnCategory.nCopy(ColumnCategory.MEASUREMENT,
measurementSchemaCnt));
+ columnCategories.addAll(ColumnCategory.nCopy(ColumnCategory.FIELD,
measurementSchemaCnt));
return new Tablet(
null,
IMeasurementSchema.getMeasurementNameList(measurementSchemas),
@@ -367,11 +367,11 @@ public class PerformanceTest {
for (int i = 0; i < idSchemaCnt; i++) {
measurementSchemas.add(genIdSchema(i));
- columnCategories.add(ColumnCategory.ID);
+ columnCategories.add(ColumnCategory.TAG);
}
for (int i = 0; i < measurementSchemaCnt; i++) {
measurementSchemas.add(genMeasurementSchema(i));
- columnCategories.add(ColumnCategory.MEASUREMENT);
+ columnCategories.add(ColumnCategory.FIELD);
}
return new TableSchema(genTableName(tableNum), measurementSchemas,
columnCategories);
}
diff --git
a/java/tsfile/src/test/java/org/apache/tsfile/tableview/TableSchemaTest.java
b/java/tsfile/src/test/java/org/apache/tsfile/tableview/TableSchemaTest.java
index 76276d5b..6d2ccaba 100644
--- a/java/tsfile/src/test/java/org/apache/tsfile/tableview/TableSchemaTest.java
+++ b/java/tsfile/src/test/java/org/apache/tsfile/tableview/TableSchemaTest.java
@@ -42,8 +42,8 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import static org.apache.tsfile.write.record.Tablet.ColumnCategory.ID;
-import static org.apache.tsfile.write.record.Tablet.ColumnCategory.MEASUREMENT;
+import static org.apache.tsfile.write.record.Tablet.ColumnCategory.FIELD;
+import static org.apache.tsfile.write.record.Tablet.ColumnCategory.TAG;
import static org.junit.Assert.assertEquals;
public class TableSchemaTest {
@@ -78,8 +78,8 @@ public class TableSchemaTest {
public void testTableSchema() throws IOException {
final List<IMeasurementSchema> measurementSchemas =
prepareIdSchemas(idSchemaCnt);
measurementSchemas.addAll(prepareMeasurementSchemas(measurementSchemaCnt));
- final List<ColumnCategory> columnCategories = ColumnCategory.nCopy(ID,
idSchemaCnt);
- columnCategories.addAll(ColumnCategory.nCopy(MEASUREMENT,
measurementSchemaCnt));
+ final List<ColumnCategory> columnCategories = ColumnCategory.nCopy(TAG,
idSchemaCnt);
+ columnCategories.addAll(ColumnCategory.nCopy(FIELD, measurementSchemaCnt));
TableSchema tableSchema = new TableSchema(tableName, measurementSchemas,
columnCategories);
try (ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
@@ -131,7 +131,7 @@ public class TableSchemaTest {
"t1",
Arrays.asList("id1", "ID1", "id2", "s1"),
Arrays.asList(TSDataType.STRING, TSDataType.STRING,
TSDataType.STRING, TSDataType.STRING),
- Arrays.asList(ID, ID, MEASUREMENT, MEASUREMENT));
+ Arrays.asList(TAG, TAG, FIELD, FIELD));
} catch (IllegalArgumentException e) {
return;
}
diff --git
a/java/tsfile/src/test/java/org/apache/tsfile/tableview/TableViewTest.java
b/java/tsfile/src/test/java/org/apache/tsfile/tableview/TableViewTest.java
index c525e310..851a126a 100644
--- a/java/tsfile/src/test/java/org/apache/tsfile/tableview/TableViewTest.java
+++ b/java/tsfile/src/test/java/org/apache/tsfile/tableview/TableViewTest.java
@@ -202,10 +202,10 @@ public class TableViewTest {
new MeasurementSchema("id3", TSDataType.STRING),
new MeasurementSchema("s1", TSDataType.INT32)),
Arrays.asList(
- ColumnCategory.ID,
- ColumnCategory.ID,
- ColumnCategory.ID,
- ColumnCategory.MEASUREMENT));
+ ColumnCategory.TAG,
+ ColumnCategory.TAG,
+ ColumnCategory.TAG,
+ ColumnCategory.FIELD));
writer.registerTableSchema(tableSchema);
Tablet tablet =
new Tablet(
@@ -530,13 +530,13 @@ public class TableViewTest {
measurementSchemas.add(
new MeasurementSchema(
"id" + i, TSDataType.TEXT, TSEncoding.PLAIN,
CompressionType.UNCOMPRESSED));
- columnCategories.add(ColumnCategory.ID);
+ columnCategories.add(ColumnCategory.TAG);
}
for (int i = 0; i < measurementSchemaNum; i++) {
measurementSchemas.add(
new MeasurementSchema(
"s" + i, TSDataType.INT64, TSEncoding.PLAIN,
CompressionType.UNCOMPRESSED));
- columnCategories.add(ColumnCategory.MEASUREMENT);
+ columnCategories.add(ColumnCategory.FIELD);
}
return new TableSchema("testTable" + tableNum, measurementSchemas,
columnCategories);
}
@@ -553,7 +553,7 @@ public class TableViewTest {
measurementSchemas.add(
new MeasurementSchema(
"id" + idIndex, TSDataType.TEXT, TSEncoding.PLAIN,
CompressionType.UNCOMPRESSED));
- columnCategories.add(ColumnCategory.ID);
+ columnCategories.add(ColumnCategory.TAG);
idIndex++;
}
@@ -564,7 +564,7 @@ public class TableViewTest {
TSDataType.INT64,
TSEncoding.PLAIN,
CompressionType.UNCOMPRESSED));
- columnCategories.add(ColumnCategory.MEASUREMENT);
+ columnCategories.add(ColumnCategory.FIELD);
measurementIndex++;
}
}
diff --git
a/java/tsfile/src/test/java/org/apache/tsfile/write/TsFileWriteApiTest.java
b/java/tsfile/src/test/java/org/apache/tsfile/write/TsFileWriteApiTest.java
index f4335939..bd133f15 100644
--- a/java/tsfile/src/test/java/org/apache/tsfile/write/TsFileWriteApiTest.java
+++ b/java/tsfile/src/test/java/org/apache/tsfile/write/TsFileWriteApiTest.java
@@ -893,7 +893,7 @@ public class TsFileWriteApiTest {
"TABLE1",
Arrays.asList("IdColumn", "MeasurementColumn"),
Arrays.asList(TSDataType.STRING, TSDataType.BOOLEAN),
- Arrays.asList(Tablet.ColumnCategory.ID,
Tablet.ColumnCategory.MEASUREMENT));
+ Arrays.asList(Tablet.ColumnCategory.TAG,
Tablet.ColumnCategory.FIELD));
tablet.addTimestamp(0, 0);
tablet.addValue("IdColumn", 0, "id_field");
tablet.addValue("MeasurementColumn", 0, true);
@@ -901,9 +901,9 @@ public class TsFileWriteApiTest {
new TableSchema(
"Table1",
Arrays.asList(
- new ColumnSchema("IDCOLUMN", TSDataType.STRING,
Tablet.ColumnCategory.ID),
+ new ColumnSchema("IDCOLUMN", TSDataType.STRING,
Tablet.ColumnCategory.TAG),
new ColumnSchema(
- "MeasurementColumn", TSDataType.BOOLEAN,
Tablet.ColumnCategory.MEASUREMENT)));
+ "MeasurementColumn", TSDataType.BOOLEAN,
Tablet.ColumnCategory.FIELD)));
Assert.assertEquals("table1", tableSchema.getTableName());
try (TsFileWriter writer = new TsFileWriter(f)) {
writer.registerTableSchema(tableSchema);
