This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch ty/STRING in repository https://gitbox.apache.org/repos/asf/tsfile.git
commit 93d894b095505463ebcd44ddf0c8e32349a75e06 Author: JackieTien97 <[email protected]> AuthorDate: Fri Jun 28 09:21:58 2024 +0800 Change Type Of IDColumn and AttributeColumn from TEXT to STRING --- .../main/java/org/apache/tsfile/file/metadata/LogicalTableSchema.java | 2 +- .../src/main/java/org/apache/tsfile/file/metadata/TableSchema.java | 2 +- java/tsfile/src/main/java/org/apache/tsfile/write/record/Tablet.java | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) 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 0c36fc45..2db59473 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 @@ -55,7 +55,7 @@ public class LogicalTableSchema extends TableSchema { for (int i = 1; i < maxLevel; i++) { generatedIdColumns.add( new MeasurementSchema( - "__level" + i, TSDataType.TEXT, TSEncoding.PLAIN, CompressionType.UNCOMPRESSED)); + "__level" + i, TSDataType.STRING, TSEncoding.PLAIN, CompressionType.UNCOMPRESSED)); } return generatedIdColumns; } 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 55692ad3..474c4a03 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 @@ -103,7 +103,7 @@ public class TableSchema { } else { final IMeasurementSchema originSchema = columnSchemas.get(columnIndex); if (originSchema.getType() != chunkMetadata.getDataType()) { - originSchema.setType(TSDataType.TEXT); + originSchema.setType(TSDataType.STRING); } } } 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 5a80d5e4..569c0e75 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 @@ -1010,6 +1010,7 @@ public class Tablet { } switch (schemas.get(j).getType()) { case TEXT: + case STRING: if (columnTypes.get(j).equals(ColumnType.MEASUREMENT)) { return ((Binary[]) values[j])[i]; } else {
