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 bbb96d68 move ColumnCategory to an outer class (#461)
bbb96d68 is described below
commit bbb96d685ec18eb0f5e8c4f9c70487223252dbfd
Author: Jiang Tian <[email protected]>
AuthorDate: Thu Apr 17 18:33:36 2025 +0800
move ColumnCategory to an outer class (#461)
* move ColumnCategory to an outer class
* add license
* spotless
---
.../org/apache/tsfile/enums/ColumnCategory.java | 37 ++++++++++++++++++++++
.../tsfile/v4/ITsFileReaderAndITsFileWriter.java | 7 ++--
.../tsfile/v4/WriteTabletWithITsFileWriter.java | 7 ++--
.../java/org/apache/tsfile/tools/TsFileTool.java | 12 +++----
.../apache/tsfile/file/metadata/ColumnSchema.java | 5 ++-
.../tsfile/file/metadata/ColumnSchemaBuilder.java | 2 +-
.../tsfile/file/metadata/LogicalTableSchema.java | 2 +-
.../apache/tsfile/file/metadata/TableSchema.java | 2 +-
.../read/query/executor/TableQueryExecutor.java | 2 +-
.../java/org/apache/tsfile/write/TsFileWriter.java | 4 +--
.../write/chunk/AlignedChunkGroupWriterImpl.java | 2 +-
.../chunk/NonAlignedChunkGroupWriterImpl.java | 2 +-
.../org/apache/tsfile/write/record/Tablet.java | 15 +--------
.../tsfile/write/v4/DeviceTableModelWriter.java | 4 +--
.../tsfile/read/TsFileDeviceIteratorTest.java | 14 ++++----
.../tsfile/read/TsFileSequenceReaderTest.java | 3 +-
.../read/TsFileV4ReadWriteInterfacesTest.java | 9 +++---
.../apache/tsfile/read/query/ResultSetTest.java | 25 ++++++++-------
.../read/reader/TsFileReaderEmptyChunkTest.java | 14 ++++----
.../apache/tsfile/tableview/PerformanceTest.java | 2 +-
.../apache/tsfile/tableview/TableSchemaTest.java | 6 ++--
.../org/apache/tsfile/tableview/TableViewTest.java | 2 +-
.../apache/tsfile/write/TsFileWriteApiTest.java | 14 ++++----
23 files changed, 110 insertions(+), 82 deletions(-)
diff --git
a/java/common/src/main/java/org/apache/tsfile/enums/ColumnCategory.java
b/java/common/src/main/java/org/apache/tsfile/enums/ColumnCategory.java
new file mode 100644
index 00000000..83056ff3
--- /dev/null
+++ b/java/common/src/main/java/org/apache/tsfile/enums/ColumnCategory.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tsfile.enums;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public enum ColumnCategory {
+ TAG,
+ FIELD,
+ ATTRIBUTE;
+
+ public static List<ColumnCategory> nCopy(ColumnCategory type, int n) {
+ List<ColumnCategory> result = new ArrayList<>(n);
+ for (int i = 0; i < n; i++) {
+ result.add(type);
+ }
+ return result;
+ }
+}
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 b94944ff..bfec000a 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
@@ -19,6 +19,7 @@
package org.apache.tsfile.v4;
+import org.apache.tsfile.enums.ColumnCategory;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.file.metadata.ColumnSchemaBuilder;
@@ -61,17 +62,17 @@ public class ITsFileReaderAndITsFileWriter {
new ColumnSchemaBuilder()
.name("tag1")
.dataType(TSDataType.STRING)
- .category(Tablet.ColumnCategory.TAG)
+ .category(ColumnCategory.TAG)
.build(),
new ColumnSchemaBuilder()
.name("tag2")
.dataType(TSDataType.STRING)
- .category(Tablet.ColumnCategory.TAG)
+ .category(ColumnCategory.TAG)
.build(),
new ColumnSchemaBuilder()
.name("s1")
.dataType(TSDataType.INT32)
- .category(Tablet.ColumnCategory.FIELD)
+ .category(ColumnCategory.FIELD)
.build(),
new
ColumnSchemaBuilder().name("s2").dataType(TSDataType.BOOLEAN).build()));
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 e82b81fc..7845deab 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
@@ -19,6 +19,7 @@
package org.apache.tsfile.v4;
+import org.apache.tsfile.enums.ColumnCategory;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.file.metadata.ColumnSchemaBuilder;
@@ -56,17 +57,17 @@ public class WriteTabletWithITsFileWriter {
new ColumnSchemaBuilder()
.name("tag1")
.dataType(TSDataType.STRING)
- .category(Tablet.ColumnCategory.TAG)
+ .category(ColumnCategory.TAG)
.build(),
new ColumnSchemaBuilder()
.name("tag2")
.dataType(TSDataType.STRING)
- .category(Tablet.ColumnCategory.TAG)
+ .category(ColumnCategory.TAG)
.build(),
new ColumnSchemaBuilder()
.name("s1")
.dataType(TSDataType.INT32)
- .category(Tablet.ColumnCategory.FIELD)
+ .category(ColumnCategory.FIELD)
.build(),
new
ColumnSchemaBuilder().name("s2").dataType(TSDataType.BOOLEAN).build()));
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 483e664c..5dd2afe5 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
@@ -18,6 +18,7 @@
*/
package org.apache.tsfile.tools;
+import org.apache.tsfile.enums.ColumnCategory;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.file.metadata.TableSchema;
import org.apache.tsfile.file.metadata.enums.CompressionType;
@@ -110,7 +111,7 @@ public class TsFileTool {
String tableName,
Map<String, Object> defaultMap) {
List<IMeasurementSchema> measurementSchemas = new ArrayList<>();
- List<Tablet.ColumnCategory> columnCategories = new ArrayList<>();
+ List<ColumnCategory> columnCategories = new ArrayList<>();
List<String> idSchemaList = new ArrayList<>();
for (SchemaParser.IDColumns idSchema : idColumnList) {
if (idSchema.isDefault) {
@@ -120,7 +121,7 @@ public class TsFileTool {
measurementSchemas.add(
new MeasurementSchema(
idSchema.name, TSDataType.TEXT, TSEncoding.PLAIN,
CompressionType.UNCOMPRESSED));
- columnCategories.add(Tablet.ColumnCategory.TAG);
+ columnCategories.add(ColumnCategory.TAG);
}
List<SchemaParser.Column> newColumnList = new ArrayList<>();
@@ -139,7 +140,7 @@ public class TsFileTool {
TSDataType.valueOf(column.type),
TSEncoding.PLAIN,
CompressionType.UNCOMPRESSED));
- columnCategories.add(Tablet.ColumnCategory.FIELD);
+ columnCategories.add(ColumnCategory.FIELD);
}
return new TableSchema(tableName, measurementSchemas, columnCategories);
}
@@ -259,8 +260,7 @@ public class TsFileTool {
return parsedLines;
}
- public static Object getValue(
- TSDataType dataType, String i, Tablet.ColumnCategory columnCategory) {
+ public static Object getValue(TSDataType dataType, String i, ColumnCategory
columnCategory) {
switch (dataType) {
case INT64:
return Long.valueOf(i);
@@ -269,7 +269,7 @@ public class TsFileTool {
case BOOLEAN:
return Boolean.valueOf(i);
case TEXT:
- if (columnCategory.equals(Tablet.ColumnCategory.FIELD)) {
+ if (columnCategory.equals(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/ColumnSchema.java
b/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/ColumnSchema.java
index db089bce..c526e7ea 100644
---
a/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/ColumnSchema.java
+++
b/java/tsfile/src/main/java/org/apache/tsfile/file/metadata/ColumnSchema.java
@@ -19,9 +19,8 @@
package org.apache.tsfile.file.metadata;
+import org.apache.tsfile.enums.ColumnCategory;
import org.apache.tsfile.enums.TSDataType;
-import org.apache.tsfile.write.record.Tablet;
-import org.apache.tsfile.write.record.Tablet.ColumnCategory;
public class ColumnSchema {
private String columnName;
@@ -42,7 +41,7 @@ public class ColumnSchema {
return dataType;
}
- public Tablet.ColumnCategory getColumnCategory() {
+ public ColumnCategory getColumnCategory() {
return columnCategory;
}
}
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 e9f217a7..8b43c872 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
@@ -20,8 +20,8 @@
package org.apache.tsfile.file.metadata;
import org.apache.tsfile.annotations.TsFileApi;
+import org.apache.tsfile.enums.ColumnCategory;
import org.apache.tsfile.enums.TSDataType;
-import org.apache.tsfile.write.record.Tablet.ColumnCategory;
public class ColumnSchemaBuilder {
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 3c3ef986..a7d8a026 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
@@ -19,10 +19,10 @@
package org.apache.tsfile.file.metadata;
+import org.apache.tsfile.enums.ColumnCategory;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.file.metadata.enums.CompressionType;
import org.apache.tsfile.file.metadata.enums.TSEncoding;
-import org.apache.tsfile.write.record.Tablet.ColumnCategory;
import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
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 f62cd583..c64694d9 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
@@ -21,10 +21,10 @@ package org.apache.tsfile.file.metadata;
import org.apache.tsfile.annotations.TsFileApi;
import org.apache.tsfile.compatibility.DeserializeConfig;
+import org.apache.tsfile.enums.ColumnCategory;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.utils.ReadWriteForEncodingUtils;
import org.apache.tsfile.utils.ReadWriteIOUtils;
-import org.apache.tsfile.write.record.Tablet.ColumnCategory;
import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
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 8d178aa4..a192a360 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
@@ -19,6 +19,7 @@
package org.apache.tsfile.read.query.executor;
+import org.apache.tsfile.enums.ColumnCategory;
import org.apache.tsfile.exception.read.NoColumnException;
import org.apache.tsfile.exception.read.ReadProcessException;
import org.apache.tsfile.exception.read.UnsupportedOrderingException;
@@ -32,7 +33,6 @@ import
org.apache.tsfile.read.query.executor.task.DeviceTaskIterator;
import org.apache.tsfile.read.reader.block.DeviceOrderedTsBlockReader;
import org.apache.tsfile.read.reader.block.TsBlockReader;
import org.apache.tsfile.read.reader.block.TsBlockReader.EmptyTsBlockReader;
-import org.apache.tsfile.write.record.Tablet.ColumnCategory;
import java.util.ArrayList;
import java.util.Collections;
diff --git
a/java/tsfile/src/main/java/org/apache/tsfile/write/TsFileWriter.java
b/java/tsfile/src/main/java/org/apache/tsfile/write/TsFileWriter.java
index 5c71279f..efc0ab55 100644
--- a/java/tsfile/src/main/java/org/apache/tsfile/write/TsFileWriter.java
+++ b/java/tsfile/src/main/java/org/apache/tsfile/write/TsFileWriter.java
@@ -23,6 +23,7 @@ import org.apache.tsfile.common.conf.TSFileConfig;
import org.apache.tsfile.common.conf.TSFileDescriptor;
import org.apache.tsfile.encrypt.EncryptParameter;
import org.apache.tsfile.encrypt.IEncryptor;
+import org.apache.tsfile.enums.ColumnCategory;
import org.apache.tsfile.exception.encrypt.EncryptException;
import org.apache.tsfile.exception.write.ConflictDataTypeException;
import org.apache.tsfile.exception.write.NoDeviceException;
@@ -393,8 +394,7 @@ public class TsFileWriter implements AutoCloseable {
throw new NoTableException(tableName);
}
- List<Tablet.ColumnCategory> columnCategoryListForTablet =
- new ArrayList<>(tablet.getSchemas().size());
+ List<ColumnCategory> columnCategoryListForTablet = new
ArrayList<>(tablet.getSchemas().size());
for (IMeasurementSchema writingColumnSchema : tablet.getSchemas()) {
final int columnIndex =
tableSchema.findColumnIndex(writingColumnSchema.getMeasurementName());
if (columnIndex < 0) {
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 feab6746..a47df975 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
@@ -24,6 +24,7 @@ import org.apache.tsfile.encoding.encoder.Encoder;
import org.apache.tsfile.encoding.encoder.TSEncodingBuilder;
import org.apache.tsfile.encrypt.EncryptParameter;
import org.apache.tsfile.encrypt.EncryptUtils;
+import org.apache.tsfile.enums.ColumnCategory;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.file.metadata.IDeviceID;
@@ -33,7 +34,6 @@ import org.apache.tsfile.utils.Binary;
import org.apache.tsfile.utils.DateUtils;
import org.apache.tsfile.write.UnSupportedDataTypeException;
import org.apache.tsfile.write.record.Tablet;
-import org.apache.tsfile.write.record.Tablet.ColumnCategory;
import org.apache.tsfile.write.record.datapoint.DataPoint;
import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.writer.TsFileIOWriter;
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 261c14fa..58de2ffb 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
@@ -21,6 +21,7 @@ package org.apache.tsfile.write.chunk;
import org.apache.tsfile.common.constant.TsFileConstant;
import org.apache.tsfile.encrypt.EncryptParameter;
import org.apache.tsfile.encrypt.EncryptUtils;
+import org.apache.tsfile.enums.ColumnCategory;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.file.metadata.IDeviceID;
@@ -28,7 +29,6 @@ import org.apache.tsfile.utils.Binary;
import org.apache.tsfile.utils.DateUtils;
import org.apache.tsfile.write.UnSupportedDataTypeException;
import org.apache.tsfile.write.record.Tablet;
-import org.apache.tsfile.write.record.Tablet.ColumnCategory;
import org.apache.tsfile.write.record.datapoint.DataPoint;
import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.writer.TsFileIOWriter;
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 93e3f1e9..f64dc059 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
@@ -23,6 +23,7 @@ import org.apache.tsfile.annotations.TableModel;
import org.apache.tsfile.annotations.TreeModel;
import org.apache.tsfile.annotations.TsFileApi;
import org.apache.tsfile.common.conf.TSFileConfig;
+import org.apache.tsfile.enums.ColumnCategory;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.file.metadata.IDeviceID;
import org.apache.tsfile.file.metadata.StringArrayDeviceID;
@@ -1257,20 +1258,6 @@ public class Tablet {
this.bitMaps = bitMaps;
}
- public enum ColumnCategory {
- TAG,
- FIELD,
- ATTRIBUTE;
-
- public static List<ColumnCategory> nCopy(ColumnCategory type, int n) {
- List<ColumnCategory> result = new ArrayList<>(n);
- for (int i = 0; i < n; i++) {
- result.add(type);
- }
- return result;
- }
- }
-
/**
* A tree-interface.
*
diff --git
a/java/tsfile/src/main/java/org/apache/tsfile/write/v4/DeviceTableModelWriter.java
b/java/tsfile/src/main/java/org/apache/tsfile/write/v4/DeviceTableModelWriter.java
index bae685e1..66fca2cf 100644
---
a/java/tsfile/src/main/java/org/apache/tsfile/write/v4/DeviceTableModelWriter.java
+++
b/java/tsfile/src/main/java/org/apache/tsfile/write/v4/DeviceTableModelWriter.java
@@ -20,6 +20,7 @@
package org.apache.tsfile.write.v4;
import org.apache.tsfile.annotations.TsFileApi;
+import org.apache.tsfile.enums.ColumnCategory;
import org.apache.tsfile.exception.write.ConflictDataTypeException;
import org.apache.tsfile.exception.write.NoMeasurementException;
import org.apache.tsfile.exception.write.NoTableException;
@@ -82,8 +83,7 @@ public class DeviceTableModelWriter extends
AbstractTableModelTsFileWriter {
tablet.setTableName(this.tableName);
final TableSchema tableSchema =
getSchema().getTableSchemaMap().get(tableName);
- List<Tablet.ColumnCategory> columnCategoryListForTablet =
- new ArrayList<>(tablet.getSchemas().size());
+ List<ColumnCategory> columnCategoryListForTablet = new
ArrayList<>(tablet.getSchemas().size());
for (IMeasurementSchema writingColumnSchema : tablet.getSchemas()) {
final int columnIndex =
tableSchema.findColumnIndex(writingColumnSchema.getMeasurementName());
if (columnIndex < 0) {
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 932f9a9c..5dd1a096 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
@@ -20,6 +20,7 @@
package org.apache.tsfile.read;
import org.apache.tsfile.constant.TestConstant;
+import org.apache.tsfile.enums.ColumnCategory;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.file.metadata.IDeviceID;
import org.apache.tsfile.file.metadata.TableSchema;
@@ -28,7 +29,6 @@ import org.apache.tsfile.file.metadata.enums.TSEncoding;
import org.apache.tsfile.read.common.TimeRange;
import org.apache.tsfile.utils.Pair;
import org.apache.tsfile.write.chunk.AlignedChunkWriterImpl;
-import org.apache.tsfile.write.record.Tablet;
import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.apache.tsfile.write.writer.TsFileIOWriter;
@@ -95,13 +95,13 @@ public class TsFileDeviceIteratorTest {
new MeasurementSchema("s2", TSDataType.INT64),
new MeasurementSchema("s3", TSDataType.INT64),
new MeasurementSchema("s4", TSDataType.INT64));
- List<Tablet.ColumnCategory> columnCategories =
+ List<ColumnCategory> columnCategories =
Arrays.asList(
- Tablet.ColumnCategory.TAG,
- Tablet.ColumnCategory.FIELD,
- Tablet.ColumnCategory.FIELD,
- Tablet.ColumnCategory.FIELD,
- Tablet.ColumnCategory.FIELD);
+ ColumnCategory.TAG,
+ ColumnCategory.FIELD,
+ ColumnCategory.FIELD,
+ ColumnCategory.FIELD,
+ 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/TsFileSequenceReaderTest.java
b/java/tsfile/src/test/java/org/apache/tsfile/read/TsFileSequenceReaderTest.java
index 854e80ac..8daa2527 100644
---
a/java/tsfile/src/test/java/org/apache/tsfile/read/TsFileSequenceReaderTest.java
+++
b/java/tsfile/src/test/java/org/apache/tsfile/read/TsFileSequenceReaderTest.java
@@ -22,6 +22,7 @@ package org.apache.tsfile.read;
import org.apache.tsfile.common.conf.TSFileConfig;
import org.apache.tsfile.common.conf.TSFileDescriptor;
import org.apache.tsfile.constant.TestConstant;
+import org.apache.tsfile.enums.ColumnCategory;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.file.MetaMarker;
@@ -244,7 +245,7 @@ public class TsFileSequenceReaderTest {
new TableSchema(
"t1",
Collections.singletonList(new MeasurementSchema("s1",
TSDataType.INT32)),
- Collections.singletonList(Tablet.ColumnCategory.FIELD));
+ Collections.singletonList(ColumnCategory.FIELD));
try (ITsFileWriter writer =
new TsFileWriterBuilder().tableSchema(tableSchema).file(file).build())
{
Tablet tablet =
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 06679781..0f0e9c35 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
@@ -19,6 +19,7 @@
package org.apache.tsfile.read;
+import org.apache.tsfile.enums.ColumnCategory;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.file.metadata.IDeviceID;
import org.apache.tsfile.file.metadata.StringArrayDeviceID;
@@ -75,10 +76,10 @@ public class TsFileV4ReadWriteInterfacesTest {
new MeasurementSchema("id3", TSDataType.STRING),
new MeasurementSchema("s1", TSDataType.INT32)),
Arrays.asList(
- Tablet.ColumnCategory.TAG,
- Tablet.ColumnCategory.TAG,
- Tablet.ColumnCategory.TAG,
- Tablet.ColumnCategory.FIELD));
+ ColumnCategory.TAG,
+ ColumnCategory.TAG,
+ ColumnCategory.TAG,
+ 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 96cb2487..a9f8766b 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
@@ -19,6 +19,7 @@
package org.apache.tsfile.read.query;
+import org.apache.tsfile.enums.ColumnCategory;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.file.metadata.TableSchema;
import org.apache.tsfile.read.query.dataset.ResultSet;
@@ -71,10 +72,10 @@ public class ResultSetTest {
new MeasurementSchema("s1", TSDataType.BOOLEAN),
new MeasurementSchema("s2", TSDataType.BOOLEAN)),
Arrays.asList(
- Tablet.ColumnCategory.TAG,
- Tablet.ColumnCategory.TAG,
- Tablet.ColumnCategory.FIELD,
- Tablet.ColumnCategory.FIELD));
+ ColumnCategory.TAG,
+ ColumnCategory.TAG,
+ ColumnCategory.FIELD,
+ ColumnCategory.FIELD));
Tablet tablet =
new Tablet(
Arrays.asList("id1", "id2", "s1", "s2"),
@@ -149,10 +150,10 @@ public class ResultSetTest {
new MeasurementSchema("s1", TSDataType.BOOLEAN),
new MeasurementSchema("s2", TSDataType.BOOLEAN)),
Arrays.asList(
- Tablet.ColumnCategory.TAG,
- Tablet.ColumnCategory.TAG,
- Tablet.ColumnCategory.FIELD,
- Tablet.ColumnCategory.FIELD));
+ ColumnCategory.TAG,
+ ColumnCategory.TAG,
+ ColumnCategory.FIELD,
+ ColumnCategory.FIELD));
Tablet tablet =
new Tablet(
Arrays.asList("id1", "id2", "s1", "s2"),
@@ -220,10 +221,10 @@ public class ResultSetTest {
new MeasurementSchema("s1", TSDataType.BOOLEAN),
new MeasurementSchema("s2", TSDataType.BOOLEAN)),
Arrays.asList(
- Tablet.ColumnCategory.TAG,
- Tablet.ColumnCategory.TAG,
- Tablet.ColumnCategory.FIELD,
- Tablet.ColumnCategory.FIELD));
+ ColumnCategory.TAG,
+ ColumnCategory.TAG,
+ ColumnCategory.FIELD,
+ 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 9120228c..751ca75e 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
@@ -19,6 +19,7 @@
package org.apache.tsfile.read.reader;
import org.apache.tsfile.constant.TestConstant;
+import org.apache.tsfile.enums.ColumnCategory;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.file.metadata.IDeviceID;
import org.apache.tsfile.file.metadata.TableSchema;
@@ -33,7 +34,6 @@ import
org.apache.tsfile.read.controller.MetadataQuerierByFileImpl;
import org.apache.tsfile.read.query.executor.TableQueryExecutor;
import org.apache.tsfile.read.reader.block.TsBlockReader;
import org.apache.tsfile.write.chunk.AlignedChunkWriterImpl;
-import org.apache.tsfile.write.record.Tablet;
import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
import org.apache.tsfile.write.writer.TsFileIOWriter;
@@ -113,13 +113,13 @@ public class TsFileReaderEmptyChunkTest {
new MeasurementSchema("s2", TSDataType.INT64),
new MeasurementSchema("s3", TSDataType.INT64),
new MeasurementSchema("s4", TSDataType.INT64));
- final List<Tablet.ColumnCategory> columnCategories =
+ final List<ColumnCategory> columnCategories =
Arrays.asList(
- Tablet.ColumnCategory.TAG,
- Tablet.ColumnCategory.FIELD,
- Tablet.ColumnCategory.FIELD,
- Tablet.ColumnCategory.FIELD,
- Tablet.ColumnCategory.FIELD);
+ ColumnCategory.TAG,
+ ColumnCategory.FIELD,
+ ColumnCategory.FIELD,
+ ColumnCategory.FIELD,
+ 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 9f454d4e..fdcf8ca6 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
@@ -19,6 +19,7 @@
package org.apache.tsfile.tableview;
+import org.apache.tsfile.enums.ColumnCategory;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.exception.read.ReadProcessException;
import org.apache.tsfile.exception.write.WriteProcessException;
@@ -43,7 +44,6 @@ import org.apache.tsfile.read.reader.block.TsBlockReader;
import org.apache.tsfile.utils.Pair;
import org.apache.tsfile.write.TsFileWriter;
import org.apache.tsfile.write.record.Tablet;
-import org.apache.tsfile.write.record.Tablet.ColumnCategory;
import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
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 6d2ccaba..fdf3c68d 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
@@ -20,6 +20,7 @@
package org.apache.tsfile.tableview;
import org.apache.tsfile.compatibility.DeserializeConfig;
+import org.apache.tsfile.enums.ColumnCategory;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.file.metadata.ChunkGroupMetadata;
import org.apache.tsfile.file.metadata.ChunkMetadata;
@@ -28,7 +29,6 @@ import org.apache.tsfile.file.metadata.StringArrayDeviceID;
import org.apache.tsfile.file.metadata.TableSchema;
import org.apache.tsfile.file.metadata.enums.CompressionType;
import org.apache.tsfile.file.metadata.enums.TSEncoding;
-import org.apache.tsfile.write.record.Tablet.ColumnCategory;
import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
@@ -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.FIELD;
-import static org.apache.tsfile.write.record.Tablet.ColumnCategory.TAG;
+import static org.apache.tsfile.enums.ColumnCategory.FIELD;
+import static org.apache.tsfile.enums.ColumnCategory.TAG;
import static org.junit.Assert.assertEquals;
public class TableSchemaTest {
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 16454fb2..361cd3f5 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
@@ -19,6 +19,7 @@
package org.apache.tsfile.tableview;
+import org.apache.tsfile.enums.ColumnCategory;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.exception.write.WriteProcessException;
import org.apache.tsfile.file.metadata.IDeviceID;
@@ -44,7 +45,6 @@ import org.apache.tsfile.utils.TsFileSketchTool;
import org.apache.tsfile.write.TsFileWriter;
import org.apache.tsfile.write.record.TSRecord;
import org.apache.tsfile.write.record.Tablet;
-import org.apache.tsfile.write.record.Tablet.ColumnCategory;
import org.apache.tsfile.write.record.datapoint.LongDataPoint;
import org.apache.tsfile.write.schema.IMeasurementSchema;
import org.apache.tsfile.write.schema.MeasurementSchema;
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 c5ecab75..17a0d0f1 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
@@ -19,6 +19,7 @@
package org.apache.tsfile.write;
import org.apache.tsfile.common.conf.TSFileDescriptor;
+import org.apache.tsfile.enums.ColumnCategory;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.exception.read.ReadProcessException;
import org.apache.tsfile.exception.write.WriteProcessException;
@@ -906,7 +907,7 @@ public class TsFileWriteApiTest {
"TABLE1",
Arrays.asList("IdColumn", "MeasurementColumn"),
Arrays.asList(TSDataType.STRING, TSDataType.BOOLEAN),
- Arrays.asList(Tablet.ColumnCategory.TAG,
Tablet.ColumnCategory.FIELD));
+ Arrays.asList(ColumnCategory.TAG, ColumnCategory.FIELD));
tablet.addTimestamp(0, 0);
tablet.addValue("IdColumn", 0, "id_field");
tablet.addValue("MeasurementColumn", 0, true);
@@ -914,9 +915,8 @@ public class TsFileWriteApiTest {
new TableSchema(
"Table1",
Arrays.asList(
- new ColumnSchema("IDCOLUMN", TSDataType.STRING,
Tablet.ColumnCategory.TAG),
- new ColumnSchema(
- "MeasurementColumn", TSDataType.BOOLEAN,
Tablet.ColumnCategory.FIELD)));
+ new ColumnSchema("IDCOLUMN", TSDataType.STRING,
ColumnCategory.TAG),
+ new ColumnSchema("MeasurementColumn", TSDataType.BOOLEAN,
ColumnCategory.FIELD)));
Assert.assertEquals("table1", tableSchema.getTableName());
try (TsFileWriter writer = new TsFileWriter(f)) {
writer.registerTableSchema(tableSchema);
@@ -943,15 +943,15 @@ public class TsFileWriteApiTest {
"table1",
Arrays.asList("tag1", "field1"),
Arrays.asList(TSDataType.STRING, TSDataType.BOOLEAN),
- Arrays.asList(Tablet.ColumnCategory.TAG,
Tablet.ColumnCategory.FIELD));
+ Arrays.asList(ColumnCategory.TAG, ColumnCategory.FIELD));
tablet.addTimestamp(0, 0);
tablet.addTimestamp(1, 1);
TableSchema tableSchema =
new TableSchema(
"Table1",
Arrays.asList(
- new ColumnSchema("tag1", TSDataType.STRING,
Tablet.ColumnCategory.TAG),
- new ColumnSchema("field1", TSDataType.BOOLEAN,
Tablet.ColumnCategory.FIELD)));
+ new ColumnSchema("tag1", TSDataType.STRING,
ColumnCategory.TAG),
+ new ColumnSchema("field1", TSDataType.BOOLEAN,
ColumnCategory.FIELD)));
Assert.assertEquals("table1", tableSchema.getTableName());
try (ITsFileWriter writer =
new TsFileWriterBuilder().file(f).tableSchema(tableSchema).build()) {
