This is an automated email from the ASF dual-hosted git repository. jiangtian pushed a commit to branch preallocate_array_list in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 0d2b603de6ef0be5cb749f6abda8c3a10bb5adc1 Author: Tian Jiang <[email protected]> AuthorDate: Tue Apr 29 11:43:52 2025 +0800 fix import --- .../org/apache/iotdb/TableModelSessionExample.java | 14 +-- .../apache/iotdb/TableModelSessionPoolExample.java | 2 +- .../iotdb/it/utils/TsFileTableGenerator.java | 6 +- .../org/apache/iotdb/db/it/IoTDBLoadTsFileIT.java | 14 +-- .../pipe/it/dual/tablemodel/TableModelUtils.java | 104 ++++++++++----------- .../IoTDBPipeTypeConversionISessionIT.java | 18 ++-- .../manual/IoTDBPipeTypeConversionISessionIT.java | 4 +- .../it/db/it/IoTDBAuthenticationTableIT.java | 2 +- .../relational/it/db/it/IoTDBInsertTableIT.java | 2 +- .../it/query/old/orderBy/IoTDBOrderByTableIT.java | 32 +++---- .../iotdb/relational/it/schema/IoTDBTableIT.java | 8 +- .../it/session/IoTDBSessionRelationalIT.java | 2 +- .../pool/IoTDBInsertTableSessionPoolIT.java | 2 +- .../apache/iotdb/tool/data/AbstractDataTool.java | 6 +- .../apache/iotdb/tool/data/ImportDataTable.java | 9 +- .../payload/SubscriptionSessionDataSet.java | 1 - .../iotdb/session/SessionCacheLeaderTest.java | 2 +- .../connector/protocol/opcua/OpcUaNameSpace.java | 6 +- .../util/builder/PipeTableModelTsFileBuilder.java | 4 +- .../builder/PipeTableModelTsFileBuilderV2.java | 2 +- .../tablet/parser/TabletInsertionEventParser.java | 19 ++-- ...ileInsertionEventTableParserTabletIterator.java | 15 +-- .../pipe/resource/memory/PipeMemoryWeightUtil.java | 3 +- .../v1/handler/StatementConstructionHandler.java | 4 +- .../plan/parser/StatementGenerator.java | 2 +- .../plan/relational/metadata/TableSchema.java | 2 +- .../execute/utils/CompactionTableSchema.java | 2 +- .../compaction/io/CompactionTsFileWriter.java | 2 +- .../pipe/connector/PipeTabletEventSorterTest.java | 21 +++-- .../plan/parser/StatementGeneratorTest.java | 9 +- .../CompactionTableModelTestFileWriter.java | 2 +- .../CompactionTableSchemaCollectorTest.java | 2 +- .../schema/table/column/TsTableColumnCategory.java | 2 +- 33 files changed, 163 insertions(+), 162 deletions(-) diff --git a/example/session/src/main/java/org/apache/iotdb/TableModelSessionExample.java b/example/session/src/main/java/org/apache/iotdb/TableModelSessionExample.java index 0bc12128181..e05a001118b 100644 --- a/example/session/src/main/java/org/apache/iotdb/TableModelSessionExample.java +++ b/example/session/src/main/java/org/apache/iotdb/TableModelSessionExample.java @@ -87,15 +87,15 @@ public class TableModelSessionExample { TSDataType.STRING, TSDataType.FLOAT, TSDataType.DOUBLE); - List<Tablet.ColumnCategory> columnTypeList = + List<ColumnCategory> columnTypeList = new ArrayList<>( Arrays.asList( - Tablet.ColumnCategory.TAG, - Tablet.ColumnCategory.TAG, - Tablet.ColumnCategory.TAG, - Tablet.ColumnCategory.ATTRIBUTE, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD)); + ColumnCategory.TAG, + ColumnCategory.TAG, + ColumnCategory.TAG, + ColumnCategory.ATTRIBUTE, + ColumnCategory.FIELD, + ColumnCategory.FIELD)); Tablet tablet = new Tablet("test1", columnNameList, dataTypeList, columnTypeList, 100); for (long timestamp = 0; timestamp < 100; timestamp++) { int rowIndex = tablet.getRowSize(); diff --git a/example/session/src/main/java/org/apache/iotdb/TableModelSessionPoolExample.java b/example/session/src/main/java/org/apache/iotdb/TableModelSessionPoolExample.java index 7b126670e17..2b0d888cfed 100644 --- a/example/session/src/main/java/org/apache/iotdb/TableModelSessionPoolExample.java +++ b/example/session/src/main/java/org/apache/iotdb/TableModelSessionPoolExample.java @@ -28,7 +28,7 @@ import org.apache.iotdb.session.pool.TableSessionPoolBuilder; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.write.record.Tablet; -import org.apache.tsfile.write.record.Tablet.ColumnCategory; +import org.apache.tsfile.enums.ColumnCategory; import java.util.ArrayList; import java.util.Arrays; diff --git a/integration-test/src/main/java/org/apache/iotdb/it/utils/TsFileTableGenerator.java b/integration-test/src/main/java/org/apache/iotdb/it/utils/TsFileTableGenerator.java index ebcb58093f2..3b08a30d9e9 100644 --- a/integration-test/src/main/java/org/apache/iotdb/it/utils/TsFileTableGenerator.java +++ b/integration-test/src/main/java/org/apache/iotdb/it/utils/TsFileTableGenerator.java @@ -45,7 +45,7 @@ public class TsFileTableGenerator implements AutoCloseable { private final TsFileWriter writer; private final Map<String, TreeSet<Long>> table2TimeSet; private final Map<String, List<IMeasurementSchema>> table2MeasurementSchema; - private final Map<String, List<Tablet.ColumnCategory>> table2ColumnCategory; + private final Map<String, List<ColumnCategory>> table2ColumnCategory; private Random random; public TsFileTableGenerator(final File tsFile) throws IOException { @@ -60,7 +60,7 @@ public class TsFileTableGenerator implements AutoCloseable { public void registerTable( final String tableName, final List<IMeasurementSchema> columnSchemasList, - final List<Tablet.ColumnCategory> columnCategoryList) { + final List<ColumnCategory> columnCategoryList) { if (table2MeasurementSchema.containsKey(tableName)) { LOGGER.warn("Table {} already exists", tableName); return; @@ -79,7 +79,7 @@ public class TsFileTableGenerator implements AutoCloseable { schemas.stream().map(IMeasurementSchema::getMeasurementName).collect(Collectors.toList()); final List<TSDataType> dataTypeList = schemas.stream().map(IMeasurementSchema::getType).collect(Collectors.toList()); - final List<Tablet.ColumnCategory> columnCategoryList = table2ColumnCategory.get(tableName); + final List<ColumnCategory> columnCategoryList = table2ColumnCategory.get(tableName); final TreeSet<Long> timeSet = table2TimeSet.get(tableName); final Tablet tablet = new Tablet(tableName, columnNameList, dataTypeList, columnCategoryList); final Object[] values = tablet.getValues(); diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBLoadTsFileIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBLoadTsFileIT.java index d474d5d5833..ffcc7070782 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBLoadTsFileIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBLoadTsFileIT.java @@ -978,7 +978,7 @@ public class IoTDBLoadTsFileIT { final List<Pair<MeasurementSchema, MeasurementSchema>> measurementSchemas = generateMeasurementSchemasForDataTypeConvertion(); - final List<Tablet.ColumnCategory> columnCategories = + final List<ColumnCategory> columnCategories = generateTabletColumnCategory(0, measurementSchemas.size()); final File file = new File(tmpDir, "1-0-0-0.tsfile"); @@ -1032,7 +1032,7 @@ public class IoTDBLoadTsFileIT { List<Pair<MeasurementSchema, MeasurementSchema>> measurementSchemas = generateMeasurementSchemasForDataTypeConvertion(); - List<Tablet.ColumnCategory> columnCategories = + List<ColumnCategory> columnCategories = generateTabletColumnCategory(0, measurementSchemas.size()); final File file = new File(tmpDir, "1-0-0-0.tsfile"); @@ -1066,13 +1066,13 @@ public class IoTDBLoadTsFileIT { } } - private List<Tablet.ColumnCategory> generateTabletColumnCategory(int tagNum, int filedNum) { - List<Tablet.ColumnCategory> columnTypes = new ArrayList<>(tagNum + filedNum); + private List<ColumnCategory> generateTabletColumnCategory(int tagNum, int filedNum) { + List<ColumnCategory> columnTypes = new ArrayList<>(tagNum + filedNum); for (int i = 0; i < tagNum; i++) { - columnTypes.add(Tablet.ColumnCategory.TAG); + columnTypes.add(ColumnCategory.TAG); } for (int i = 0; i < filedNum; i++) { - columnTypes.add(Tablet.ColumnCategory.FIELD); + columnTypes.add(ColumnCategory.FIELD); } return columnTypes; } @@ -1080,7 +1080,7 @@ public class IoTDBLoadTsFileIT { private String convert2TableSQL( final String tableName, final List<MeasurementSchema> schemaList, - final List<Tablet.ColumnCategory> columnCategoryList) { + final List<ColumnCategory> columnCategoryList) { List<String> columns = new ArrayList<>(); for (int i = 0; i < schemaList.size(); i++) { final MeasurementSchema measurement = schemaList.get(i); diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/TableModelUtils.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/TableModelUtils.java index cc154a9d943..cb9349ae648 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/TableModelUtils.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/TableModelUtils.java @@ -484,20 +484,20 @@ public class TableModelUtils { schemaList.add(new MeasurementSchema("s10", TSDataType.DATE)); schemaList.add(new MeasurementSchema("s11", TSDataType.TEXT)); - final List<Tablet.ColumnCategory> columnTypes = + final List<ColumnCategory> columnTypes = Arrays.asList( - Tablet.ColumnCategory.TAG, - Tablet.ColumnCategory.TAG, - Tablet.ColumnCategory.TAG, - Tablet.ColumnCategory.TAG, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD); + ColumnCategory.TAG, + ColumnCategory.TAG, + ColumnCategory.TAG, + ColumnCategory.TAG, + ColumnCategory.FIELD, + ColumnCategory.FIELD, + ColumnCategory.FIELD, + ColumnCategory.FIELD, + ColumnCategory.FIELD, + ColumnCategory.FIELD, + ColumnCategory.FIELD, + ColumnCategory.FIELD); Tablet tablet = new Tablet( tableName, @@ -566,20 +566,20 @@ public class TableModelUtils { schemaList.add(new MeasurementSchema("s10", TSDataType.DATE)); schemaList.add(new MeasurementSchema("s11", TSDataType.TEXT)); - final List<Tablet.ColumnCategory> columnTypes = + final List<ColumnCategory> columnTypes = Arrays.asList( - Tablet.ColumnCategory.TAG, - Tablet.ColumnCategory.TAG, - Tablet.ColumnCategory.TAG, - Tablet.ColumnCategory.TAG, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD); + ColumnCategory.TAG, + ColumnCategory.TAG, + ColumnCategory.TAG, + ColumnCategory.TAG, + ColumnCategory.FIELD, + ColumnCategory.FIELD, + ColumnCategory.FIELD, + ColumnCategory.FIELD, + ColumnCategory.FIELD, + ColumnCategory.FIELD, + ColumnCategory.FIELD, + ColumnCategory.FIELD); Tablet tablet = new Tablet( tableName, @@ -656,20 +656,20 @@ public class TableModelUtils { schemaList.add(new MeasurementSchema("s10", TSDataType.DATE)); schemaList.add(new MeasurementSchema("s11", TSDataType.TEXT)); - final List<Tablet.ColumnCategory> columnTypes = + final List<ColumnCategory> columnTypes = Arrays.asList( - Tablet.ColumnCategory.TAG, - Tablet.ColumnCategory.TAG, - Tablet.ColumnCategory.TAG, - Tablet.ColumnCategory.TAG, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD); + ColumnCategory.TAG, + ColumnCategory.TAG, + ColumnCategory.TAG, + ColumnCategory.TAG, + ColumnCategory.FIELD, + ColumnCategory.FIELD, + ColumnCategory.FIELD, + ColumnCategory.FIELD, + ColumnCategory.FIELD, + ColumnCategory.FIELD, + ColumnCategory.FIELD, + ColumnCategory.FIELD); Tablet tablet = new Tablet( tableName, @@ -748,20 +748,20 @@ public class TableModelUtils { schemaList.add(new MeasurementSchema("s10", TSDataType.DATE)); schemaList.add(new MeasurementSchema("s11", TSDataType.TEXT)); - final List<Tablet.ColumnCategory> columnTypes = + final List<ColumnCategory> columnTypes = Arrays.asList( - Tablet.ColumnCategory.TAG, - Tablet.ColumnCategory.TAG, - Tablet.ColumnCategory.TAG, - Tablet.ColumnCategory.TAG, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD); + ColumnCategory.TAG, + ColumnCategory.TAG, + ColumnCategory.TAG, + ColumnCategory.TAG, + ColumnCategory.FIELD, + ColumnCategory.FIELD, + ColumnCategory.FIELD, + ColumnCategory.FIELD, + ColumnCategory.FIELD, + ColumnCategory.FIELD, + ColumnCategory.FIELD, + ColumnCategory.FIELD); Tablet tablet = new Tablet( tableName, diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeTypeConversionISessionIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeTypeConversionISessionIT.java index 3f48b10ca17..a0056448323 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeTypeConversionISessionIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeTypeConversionISessionIT.java @@ -39,7 +39,7 @@ import org.apache.tsfile.utils.Binary; import org.apache.tsfile.utils.DateUtils; import org.apache.tsfile.utils.Pair; import org.apache.tsfile.write.record.Tablet; -import org.apache.tsfile.write.record.Tablet.ColumnCategory; +import org.apache.tsfile.enums.ColumnCategory; import org.apache.tsfile.write.schema.IMeasurementSchema; import org.apache.tsfile.write.schema.MeasurementSchema; import org.junit.Before; @@ -167,7 +167,7 @@ public class IoTDBPipeTypeConversionISessionIT extends AbstractPipeTableModelDua private void createDatabaseAndTable( List<Pair<MeasurementSchema, MeasurementSchema>> measurementSchemas, boolean isLeft, - List<Tablet.ColumnCategory> categories, + List<ColumnCategory> categories, BaseEnv env) { StringBuilder builder = new StringBuilder(); for (int i = 0; i < measurementSchemas.size(); i++) { @@ -457,7 +457,7 @@ public class IoTDBPipeTypeConversionISessionIT extends AbstractPipeTableModelDua schemaList.add(pair.left); } - final List<Tablet.ColumnCategory> columnTypes = generateTabletColumnCategory(pairs.size()); + final List<ColumnCategory> columnTypes = generateTabletColumnCategory(pairs.size()); Tablet tablet = new Tablet( tableName, @@ -502,12 +502,12 @@ public class IoTDBPipeTypeConversionISessionIT extends AbstractPipeTableModelDua return tablet; } - private List<Tablet.ColumnCategory> generateTabletColumnCategory(int size) { - List<Tablet.ColumnCategory> columnTypes = new ArrayList<>(size); - columnTypes.add(Tablet.ColumnCategory.TAG); - columnTypes.add(Tablet.ColumnCategory.TAG); - columnTypes.add(Tablet.ColumnCategory.TAG); - columnTypes.add(Tablet.ColumnCategory.TAG); + private List<ColumnCategory> generateTabletColumnCategory(int size) { + List<ColumnCategory> columnTypes = new ArrayList<>(size); + columnTypes.add(ColumnCategory.TAG); + columnTypes.add(ColumnCategory.TAG); + columnTypes.add(ColumnCategory.TAG); + columnTypes.add(ColumnCategory.TAG); for (int i = 0; i < size - 4; i++) { columnTypes.add(ColumnCategory.FIELD); } diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeTypeConversionISessionIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeTypeConversionISessionIT.java index 23168924aed..df14acdecd7 100644 --- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeTypeConversionISessionIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeTypeConversionISessionIT.java @@ -746,11 +746,11 @@ public class IoTDBPipeTypeConversionISessionIT extends AbstractPipeDualTreeModel for (int i = 0; i < bitMaps.length; i++) { bitMaps[i] = new BitMap(generateDataSize); } - List<Tablet.ColumnCategory> columnTypes = new ArrayList<>(pairs.size()); + List<ColumnCategory> columnTypes = new ArrayList<>(pairs.size()); for (int i = 0; i < objects.length; i++) { MeasurementSchema schema = pairs.get(i).left; measurementSchemas.add(schema); - columnTypes.add(Tablet.ColumnCategory.FIELD); + columnTypes.add(ColumnCategory.FIELD); switch (schema.getType()) { case INT64: objects[i] = createTestDataForInt64(); diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBAuthenticationTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBAuthenticationTableIT.java index d0458601ec9..5d499053eea 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBAuthenticationTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBAuthenticationTableIT.java @@ -30,7 +30,7 @@ import org.apache.tsfile.file.metadata.enums.CompressionType; import org.apache.tsfile.file.metadata.enums.TSEncoding; import org.apache.tsfile.read.common.TimeRange; import org.apache.tsfile.write.record.Tablet; -import org.apache.tsfile.write.record.Tablet.ColumnCategory; +import org.apache.tsfile.enums.ColumnCategory; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBInsertTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBInsertTableIT.java index 6dbb5f11633..aefd19e6bd2 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBInsertTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/db/it/IoTDBInsertTableIT.java @@ -34,7 +34,7 @@ import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.RowRecord; import org.apache.tsfile.utils.Binary; import org.apache.tsfile.write.record.Tablet; -import org.apache.tsfile.write.record.Tablet.ColumnCategory; +import org.apache.tsfile.enums.ColumnCategory; import org.apache.tsfile.write.schema.IMeasurementSchema; import org.apache.tsfile.write.schema.MeasurementSchema; import org.junit.AfterClass; diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/orderBy/IoTDBOrderByTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/orderBy/IoTDBOrderByTableIT.java index 52a5f80193c..d9225ad83e3 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/orderBy/IoTDBOrderByTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/old/orderBy/IoTDBOrderByTableIT.java @@ -1475,15 +1475,15 @@ public class IoTDBOrderByTableIT { schemaList.add(new MeasurementSchema("floatNum", TSDataType.DOUBLE)); schemaList.add(new MeasurementSchema("str", TSDataType.TEXT)); schemaList.add(new MeasurementSchema("bool", TSDataType.BOOLEAN)); - final List<Tablet.ColumnCategory> columnTypes = + final List<ColumnCategory> columnTypes = Arrays.asList( - Tablet.ColumnCategory.TAG, - Tablet.ColumnCategory.ATTRIBUTE, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD); + ColumnCategory.TAG, + ColumnCategory.ATTRIBUTE, + ColumnCategory.FIELD, + ColumnCategory.FIELD, + ColumnCategory.FIELD, + ColumnCategory.FIELD, + ColumnCategory.FIELD); List<String> fieldIds = IMeasurementSchema.getMeasurementNameList(schemaList); List<TSDataType> dataTypes = IMeasurementSchema.getDataTypeList(schemaList); @@ -1530,15 +1530,15 @@ public class IoTDBOrderByTableIT { schemaList.add(new MeasurementSchema("floatNum", TSDataType.DOUBLE)); schemaList.add(new MeasurementSchema("str", TSDataType.TEXT)); schemaList.add(new MeasurementSchema("bool", TSDataType.BOOLEAN)); - final List<Tablet.ColumnCategory> columnTypes = + final List<ColumnCategory> columnTypes = Arrays.asList( - Tablet.ColumnCategory.TAG, - Tablet.ColumnCategory.ATTRIBUTE, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD); + ColumnCategory.TAG, + ColumnCategory.ATTRIBUTE, + ColumnCategory.FIELD, + ColumnCategory.FIELD, + ColumnCategory.FIELD, + ColumnCategory.FIELD, + ColumnCategory.FIELD); List<String> fieldIds = IMeasurementSchema.getMeasurementNameList(schemaList); List<TSDataType> dataTypes = IMeasurementSchema.getDataTypeList(schemaList); List<Object[]> values = diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBTableIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBTableIT.java index 88062e59edb..b9eabc2e2c4 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBTableIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBTableIT.java @@ -697,11 +697,11 @@ public class IoTDBTableIT { schemaList.add(new MeasurementSchema("attr1", TSDataType.STRING)); schemaList.add( new MeasurementSchema(String.format("m%s", 100 + i), TSDataType.DOUBLE)); - final List<Tablet.ColumnCategory> columnTypes = + final List<ColumnCategory> columnTypes = Arrays.asList( - Tablet.ColumnCategory.TAG, - Tablet.ColumnCategory.ATTRIBUTE, - Tablet.ColumnCategory.FIELD); + ColumnCategory.TAG, + ColumnCategory.ATTRIBUTE, + ColumnCategory.FIELD); long timestamp = 0; final Tablet tablet = diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/session/IoTDBSessionRelationalIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/session/IoTDBSessionRelationalIT.java index 7d89b5efee6..ab449315481 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/session/IoTDBSessionRelationalIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/session/IoTDBSessionRelationalIT.java @@ -40,7 +40,7 @@ import org.apache.tsfile.file.metadata.TableSchema; import org.apache.tsfile.read.common.RowRecord; import org.apache.tsfile.utils.Binary; import org.apache.tsfile.write.record.Tablet; -import org.apache.tsfile.write.record.Tablet.ColumnCategory; +import org.apache.tsfile.enums.ColumnCategory; import org.apache.tsfile.write.schema.IMeasurementSchema; import org.apache.tsfile.write.schema.MeasurementSchema; import org.apache.tsfile.write.v4.ITsFileWriter; diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/session/pool/IoTDBInsertTableSessionPoolIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/session/pool/IoTDBInsertTableSessionPoolIT.java index c9b28178794..9e8cd9b186e 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/session/pool/IoTDBInsertTableSessionPoolIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/session/pool/IoTDBInsertTableSessionPoolIT.java @@ -33,7 +33,7 @@ import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.RowRecord; import org.apache.tsfile.utils.Binary; import org.apache.tsfile.write.record.Tablet; -import org.apache.tsfile.write.record.Tablet.ColumnCategory; +import org.apache.tsfile.enums.ColumnCategory; import org.apache.tsfile.write.schema.IMeasurementSchema; import org.apache.tsfile.write.schema.MeasurementSchema; import org.junit.AfterClass; diff --git a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/data/AbstractDataTool.java b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/data/AbstractDataTool.java index 35f28bec05c..54d35c4f370 100644 --- a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/data/AbstractDataTool.java +++ b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/data/AbstractDataTool.java @@ -45,11 +45,11 @@ import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.thrift.annotation.Nullable; import org.apache.tsfile.common.constant.TsFileConstant; +import org.apache.tsfile.enums.ColumnCategory; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.Field; import org.apache.tsfile.read.common.RowRecord; import org.apache.tsfile.utils.Binary; -import org.apache.tsfile.write.record.Tablet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -442,10 +442,10 @@ public abstract class AbstractDataTool { * @param typeStr * @return */ - protected static Tablet.ColumnCategory getColumnCategory(String typeStr) { + protected static ColumnCategory getColumnCategory(String typeStr) { if (StringUtils.isNotBlank(typeStr)) { try { - return Tablet.ColumnCategory.valueOf(typeStr); + return ColumnCategory.valueOf(typeStr); } catch (Exception e) { return null; } diff --git a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/data/ImportDataTable.java b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/data/ImportDataTable.java index 84a307f113f..1b3e2689e9c 100644 --- a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/data/ImportDataTable.java +++ b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/data/ImportDataTable.java @@ -35,6 +35,7 @@ import org.apache.commons.csv.CSVParser; import org.apache.commons.csv.CSVRecord; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.tsfile.enums.ColumnCategory; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.read.common.RowRecord; import org.apache.tsfile.write.record.Tablet; @@ -62,7 +63,7 @@ public class ImportDataTable extends AbstractImportData { private static final IoTPrinter ioTPrinter = new IoTPrinter(System.out); private static ITableSessionPool sessionPool; private static Map<String, TSDataType> dataTypes = new HashMap<>(); - private static Map<String, Tablet.ColumnCategory> columnCategory = new HashMap<>(); + private static Map<String, ColumnCategory> columnCategory = new HashMap<>(); public void init() throws InterruptedException { sessionPool = @@ -256,7 +257,7 @@ public class ImportDataTable extends AbstractImportData { }); List<String> headNames = new LinkedList<>(dataTypes.keySet()); List<TSDataType> columnTypes = new LinkedList<>(dataTypes.values()); - List<Tablet.ColumnCategory> columnCategorys = new LinkedList<>(columnCategory.values()); + List<ColumnCategory> columnCategorys = new LinkedList<>(columnCategory.values()); Tablet tablet = new Tablet(table, headNames, columnTypes, columnCategorys, batchPointSize); for (CSVRecord recordObj : records) { boolean isFail = false; @@ -277,11 +278,11 @@ public class ImportDataTable extends AbstractImportData { if (newIndex >= columnTypes.size()) { headNames.add(headerName); columnTypes.add(type); - columnCategorys.add(Tablet.ColumnCategory.FIELD); + columnCategorys.add(ColumnCategory.FIELD); } else { headNames.add(headerName); columnTypes.add(newIndex, type); - columnCategorys.add(newIndex, Tablet.ColumnCategory.FIELD); + columnCategorys.add(newIndex, ColumnCategory.FIELD); } writeAndEmptyDataSet(tablet, 3); tablet = new Tablet(table, headNames, columnTypes, columnCategorys, batchPointSize); diff --git a/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/payload/SubscriptionSessionDataSet.java b/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/payload/SubscriptionSessionDataSet.java index 6bb4a8d7b86..a3f7f8e3f26 100644 --- a/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/payload/SubscriptionSessionDataSet.java +++ b/iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/payload/SubscriptionSessionDataSet.java @@ -31,7 +31,6 @@ import org.apache.tsfile.utils.BitMap; 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.schema.IMeasurementSchema; import java.time.LocalDate; diff --git a/iotdb-client/session/src/test/java/org/apache/iotdb/session/SessionCacheLeaderTest.java b/iotdb-client/session/src/test/java/org/apache/iotdb/session/SessionCacheLeaderTest.java index a969c8d0c70..40268a54cd3 100644 --- a/iotdb-client/session/src/test/java/org/apache/iotdb/session/SessionCacheLeaderTest.java +++ b/iotdb-client/session/src/test/java/org/apache/iotdb/session/SessionCacheLeaderTest.java @@ -32,11 +32,11 @@ import org.apache.iotdb.service.rpc.thrift.TSInsertStringRecordsReq; import org.apache.iotdb.service.rpc.thrift.TSInsertTabletReq; import org.apache.iotdb.service.rpc.thrift.TSInsertTabletsReq; +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; 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; import org.junit.Assert; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/opcua/OpcUaNameSpace.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/opcua/OpcUaNameSpace.java index 41f8a20e587..ac689ad8114 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/opcua/OpcUaNameSpace.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/opcua/OpcUaNameSpace.java @@ -29,6 +29,7 @@ import org.apache.iotdb.db.utils.TimestampPrecisionUtils; import org.apache.iotdb.pipe.api.event.Event; import org.apache.tsfile.common.constant.TsFileConstant; +import org.apache.tsfile.enums.ColumnCategory; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.Binary; import org.apache.tsfile.write.UnSupportedDataTypeException; @@ -141,7 +142,7 @@ public class OpcUaNameSpace extends ManagedNamespaceWithLifecycle { final List<Integer> columnIndexes = new ArrayList<>(); for (int i = 0; i < schemas.size(); ++i) { - if (tablet.getColumnTypes().get(i) == Tablet.ColumnCategory.FIELD) { + if (tablet.getColumnTypes().get(i) == ColumnCategory.FIELD) { columnIndexes.add(i); newSchemas.add(schemas.get(i)); } @@ -342,8 +343,7 @@ public class OpcUaNameSpace extends ManagedNamespaceWithLifecycle { // Use eventNode here because other nodes doesn't support values and times simultaneously for (int columnIndex = 0; columnIndex < tablet.getSchemas().size(); ++columnIndex) { - if (isTableModel - && !tablet.getColumnTypes().get(columnIndex).equals(Tablet.ColumnCategory.FIELD)) { + if (isTableModel && !tablet.getColumnTypes().get(columnIndex).equals(ColumnCategory.FIELD)) { continue; } final TSDataType dataType = tablet.getSchemas().get(columnIndex).getType(); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/builder/PipeTableModelTsFileBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/builder/PipeTableModelTsFileBuilder.java index 4232ebab676..0766ce58e83 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/builder/PipeTableModelTsFileBuilder.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/builder/PipeTableModelTsFileBuilder.java @@ -22,6 +22,7 @@ package org.apache.iotdb.db.pipe.connector.util.builder; import org.apache.iotdb.pipe.api.exception.PipeException; import org.apache.commons.io.FileUtils; +import org.apache.tsfile.enums.ColumnCategory; import org.apache.tsfile.exception.write.WriteProcessException; import org.apache.tsfile.file.metadata.IDeviceID; import org.apache.tsfile.file.metadata.TableSchema; @@ -30,7 +31,6 @@ import org.apache.tsfile.utils.Pair; import org.apache.tsfile.utils.WriteUtils; 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.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -289,7 +289,7 @@ public class PipeTableModelTsFileBuilder extends PipeTsFileBuilder { String tableName = null; final List<IMeasurementSchema> columnSchemas = new ArrayList<>(); - final List<Tablet.ColumnCategory> columnCategories = new ArrayList<>(); + final List<ColumnCategory> columnCategories = new ArrayList<>(); final Set<String> columnNames = new HashSet<>(); while (!tablets.isEmpty()) { diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/builder/PipeTableModelTsFileBuilderV2.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/builder/PipeTableModelTsFileBuilderV2.java index bba600df7ae..a7400370a38 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/builder/PipeTableModelTsFileBuilderV2.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/util/builder/PipeTableModelTsFileBuilderV2.java @@ -27,13 +27,13 @@ import org.apache.iotdb.db.storageengine.dataregion.flush.MemTableFlushTask; import org.apache.iotdb.db.storageengine.dataregion.memtable.IMemTable; import org.apache.iotdb.db.storageengine.dataregion.memtable.PrimitiveMemTable; +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.TableSchema; import org.apache.tsfile.utils.DateUtils; import org.apache.tsfile.utils.Pair; 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; import org.apache.tsfile.write.writer.RestorableTsFileIOWriter; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tablet/parser/TabletInsertionEventParser.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tablet/parser/TabletInsertionEventParser.java index 713e5da872c..0cdba9d28d4 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tablet/parser/TabletInsertionEventParser.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tablet/parser/TabletInsertionEventParser.java @@ -28,6 +28,7 @@ import org.apache.iotdb.pipe.api.access.Row; import org.apache.iotdb.pipe.api.collector.RowCollector; import org.apache.iotdb.pipe.api.event.dml.insertion.TabletInsertionEvent; +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; @@ -70,7 +71,7 @@ public abstract class TabletInsertionEventParser { protected String[] columnNameStringList; protected long[] timestampColumn; - protected Tablet.ColumnCategory[] valueColumnTypes; + protected ColumnCategory[] valueColumnTypes; protected TSDataType[] valueColumnDataTypes; // Each column of Object[] is a column of primitive type array protected Object[] valueColumns; @@ -135,7 +136,7 @@ public abstract class TabletInsertionEventParser { this.measurementSchemaList = new MeasurementSchema[filteredColumnSize]; this.columnNameStringList = new String[filteredColumnSize]; this.valueColumnDataTypes = new TSDataType[filteredColumnSize]; - this.valueColumnTypes = new Tablet.ColumnCategory[filteredColumnSize]; + this.valueColumnTypes = new ColumnCategory[filteredColumnSize]; this.valueColumns = new Object[filteredColumnSize]; this.nullValueColumnBitmaps = new BitMap[filteredColumnSize]; @@ -153,7 +154,7 @@ public abstract class TabletInsertionEventParser { this.valueColumnTypes[filteredColumnIndex] = originColumnCategories != null && originColumnCategories[i] != null ? originColumnCategories[i].toTsFileColumnType() - : Tablet.ColumnCategory.FIELD; + : ColumnCategory.FIELD; this.valueColumnDataTypes[filteredColumnIndex] = originValueDataTypes[i]; final BitMap bitMap = new BitMap(this.timestampColumn.length); if (Objects.isNull(originValues[i]) || Objects.isNull(originValueDataTypes[i])) { @@ -214,7 +215,7 @@ public abstract class TabletInsertionEventParser { this.measurementSchemaList = new MeasurementSchema[filteredColumnSize]; this.columnNameStringList = new String[filteredColumnSize]; - this.valueColumnTypes = new Tablet.ColumnCategory[filteredColumnSize]; + this.valueColumnTypes = new ColumnCategory[filteredColumnSize]; this.valueColumnDataTypes = new TSDataType[filteredColumnSize]; this.valueColumns = new Object[filteredColumnSize]; this.nullValueColumnBitmaps = new BitMap[filteredColumnSize]; @@ -246,7 +247,7 @@ public abstract class TabletInsertionEventParser { this.valueColumnTypes[filteredColumnIndex] = originColumnCategories != null && originColumnCategories[i] != null ? originColumnCategories[i].toTsFileColumnType() - : Tablet.ColumnCategory.FIELD; + : ColumnCategory.FIELD; this.valueColumnDataTypes[filteredColumnIndex] = originValueColumnDataTypes[i]; final BitMap bitMap = new BitMap(this.timestampColumn.length); if (Objects.isNull(originValueColumns[i]) @@ -316,20 +317,20 @@ public abstract class TabletInsertionEventParser { this.measurementSchemaList = new MeasurementSchema[filteredColumnSize]; this.columnNameStringList = new String[filteredColumnSize]; - this.valueColumnTypes = new Tablet.ColumnCategory[filteredColumnSize]; + this.valueColumnTypes = new ColumnCategory[filteredColumnSize]; this.valueColumnDataTypes = new TSDataType[filteredColumnSize]; this.valueColumns = new Object[filteredColumnSize]; this.nullValueColumnBitmaps = new BitMap[filteredColumnSize]; final String[] originColumnNameStringList = new String[originColumnSize]; - final Tablet.ColumnCategory[] originColumnTypes = new Tablet.ColumnCategory[originColumnSize]; + final ColumnCategory[] originColumnTypes = new ColumnCategory[originColumnSize]; final TSDataType[] originValueColumnDataTypes = new TSDataType[originColumnSize]; for (int i = 0; i < originColumnSize; i++) { originColumnNameStringList[i] = originMeasurementSchemaList.get(i).getMeasurementName(); originColumnTypes[i] = tablet.getColumnTypes() != null && tablet.getColumnTypes().get(i) != null ? tablet.getColumnTypes().get(i) - : Tablet.ColumnCategory.FIELD; + : ColumnCategory.FIELD; originValueColumnDataTypes[i] = originMeasurementSchemaList.get(i).getType(); } final Object[] originValueColumns = @@ -353,7 +354,7 @@ public abstract class TabletInsertionEventParser { this.measurementSchemaList[filteredColumnIndex] = originMeasurementSchemaList.get(i); this.columnNameStringList[filteredColumnIndex] = originColumnNameStringList[i]; this.valueColumnTypes[filteredColumnIndex] = - originColumnTypes[i] != null ? originColumnTypes[i] : Tablet.ColumnCategory.FIELD; + originColumnTypes[i] != null ? originColumnTypes[i] : ColumnCategory.FIELD; this.valueColumnDataTypes[filteredColumnIndex] = originValueColumnDataTypes[i]; final BitMap bitMap = new BitMap(this.timestampColumn.length); if (Objects.isNull(originValueColumns[i]) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/parser/table/TsFileInsertionEventTableParserTabletIterator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/parser/table/TsFileInsertionEventTableParserTabletIterator.java index 661c5cc6feb..4f114bb9cbb 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/parser/table/TsFileInsertionEventTableParserTabletIterator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tsfile/parser/table/TsFileInsertionEventTableParserTabletIterator.java @@ -25,6 +25,7 @@ import org.apache.iotdb.db.pipe.resource.memory.PipeMemoryBlock; import org.apache.iotdb.db.pipe.resource.memory.PipeMemoryWeightUtil; import org.apache.iotdb.pipe.api.exception.PipeException; +import org.apache.tsfile.enums.ColumnCategory; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.file.metadata.AbstractAlignedChunkMetadata; import org.apache.tsfile.file.metadata.ChunkMetadata; @@ -93,7 +94,7 @@ public class TsFileInsertionEventTableParserTabletIterator implements Iterator<T // Record the information of the currently read Table private String tableName; private IDeviceID deviceID; - private List<Tablet.ColumnCategory> columnTypes; + private List<ColumnCategory> columnTypes; private List<String> measurementList; private List<TSDataType> dataTypeList; private int deviceIdSize; @@ -231,13 +232,13 @@ public class TsFileInsertionEventTableParserTabletIterator implements Iterator<T for (int i = 0; i < columnSchemaSize; i++) { final IMeasurementSchema schema = tableSchema.getColumnSchemas().get(i); - final Tablet.ColumnCategory columnCategory = tableSchema.getColumnTypes().get(i); + final ColumnCategory columnCategory = tableSchema.getColumnTypes().get(i); if (schema != null && schema.getMeasurementName() != null && !schema.getMeasurementName().isEmpty()) { final String measurementName = schema.getMeasurementName(); - if (Tablet.ColumnCategory.TAG.equals(columnCategory)) { - columnTypes.add(Tablet.ColumnCategory.TAG); + if (ColumnCategory.TAG.equals(columnCategory)) { + columnTypes.add(ColumnCategory.TAG); measurementList.add(measurementName); dataTypeList.add(schema.getType()); } @@ -337,10 +338,10 @@ public class TsFileInsertionEventTableParserTabletIterator implements Iterator<T isSameDeviceID = false; // Need to ensure that columnTypes recreates an array - final List<Tablet.ColumnCategory> categories = + final List<ColumnCategory> categories = new ArrayList<>(deviceIdSize + pipeMaxAlignedSeriesNumInOneBatch); for (int i = 0; i < deviceIdSize; i++) { - categories.add(Tablet.ColumnCategory.TAG); + categories.add(ColumnCategory.TAG); } columnTypes = categories; @@ -353,7 +354,7 @@ public class TsFileInsertionEventTableParserTabletIterator implements Iterator<T final IChunkMetadata metadata = alignedChunkMetadata.getValueChunkMetadataList().get(offset); if (metadata != null) { // Record the column information corresponding to Meta to fill in Tablet - columnTypes.add(Tablet.ColumnCategory.FIELD); + columnTypes.add(ColumnCategory.FIELD); measurementList.add(metadata.getMeasurementUid()); dataTypeList.add(metadata.getDataType()); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/memory/PipeMemoryWeightUtil.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/memory/PipeMemoryWeightUtil.java index 5f28fedf14a..1521f425f16 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/memory/PipeMemoryWeightUtil.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/memory/PipeMemoryWeightUtil.java @@ -23,6 +23,7 @@ import org.apache.iotdb.commons.pipe.config.PipeConfig; import org.apache.iotdb.db.pipe.event.common.row.PipeRow; import org.apache.iotdb.db.utils.MemUtils; +import org.apache.tsfile.enums.ColumnCategory; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.file.metadata.AbstractAlignedChunkMetadata; import org.apache.tsfile.file.metadata.ChunkMetadata; @@ -279,7 +280,7 @@ public class PipeMemoryWeightUtil { } } - final List<Tablet.ColumnCategory> categories = tableSchema.getColumnTypes(); + final List<ColumnCategory> categories = tableSchema.getColumnTypes(); if (categories != null) { totalSizeInBytes += alignObjectSize( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest/table/v1/handler/StatementConstructionHandler.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest/table/v1/handler/StatementConstructionHandler.java index 10d32d03147..a5a19ebf0d1 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest/table/v1/handler/StatementConstructionHandler.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/rest/table/v1/handler/StatementConstructionHandler.java @@ -25,10 +25,10 @@ import org.apache.iotdb.db.queryengine.plan.analyze.cache.schema.DataNodeDeviceP import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertTabletStatement; import org.apache.iotdb.db.utils.TimestampPrecisionUtils; +import org.apache.tsfile.enums.ColumnCategory; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.Binary; import org.apache.tsfile.utils.BitMap; -import org.apache.tsfile.write.record.Tablet; import java.nio.charset.StandardCharsets; import java.util.List; @@ -179,7 +179,7 @@ public class StatementConstructionHandler { for (int i = 0; i < columnCategories.length; i++) { columnCategories[i] = TsTableColumnCategory.fromTsFileColumnCategory( - Tablet.ColumnCategory.valueOf(insertTabletReq.getColumnCatogories().get(i))); + ColumnCategory.valueOf(insertTabletReq.getColumnCatogories().get(i))); } insertStatement.setColumnCategories(columnCategories); diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java index 9467d2b016b..83209580ad2 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGenerator.java @@ -98,12 +98,12 @@ import org.antlr.v4.runtime.CommonTokenStream; import org.antlr.v4.runtime.atn.PredictionMode; import org.antlr.v4.runtime.tree.ParseTree; import org.apache.tsfile.common.constant.TsFileConstant; +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.utils.ReadWriteIOUtils; import org.apache.tsfile.utils.TimeDuration; -import org.apache.tsfile.write.record.Tablet.ColumnCategory; import java.nio.ByteBuffer; import java.time.ZoneId; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TableSchema.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TableSchema.java index aea54307b91..850ee2bc004 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TableSchema.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/TableSchema.java @@ -24,8 +24,8 @@ import org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory; import org.apache.iotdb.commons.schema.table.column.TsTableColumnSchema; import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager; +import org.apache.tsfile.enums.ColumnCategory; import org.apache.tsfile.enums.TSDataType; -import org.apache.tsfile.write.record.Tablet.ColumnCategory; import org.apache.tsfile.write.schema.IMeasurementSchema; import org.apache.tsfile.write.schema.MeasurementSchema; import org.slf4j.Logger; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/utils/CompactionTableSchema.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/utils/CompactionTableSchema.java index 7aab249022f..605cdda0230 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/utils/CompactionTableSchema.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/execute/utils/CompactionTableSchema.java @@ -21,8 +21,8 @@ package org.apache.iotdb.db.storageengine.dataregion.compaction.execute.utils; import org.apache.iotdb.db.storageengine.dataregion.compaction.execute.exception.CompactionTableSchemaNotMatchException; +import org.apache.tsfile.enums.ColumnCategory; import org.apache.tsfile.file.metadata.TableSchema; -import org.apache.tsfile.write.record.Tablet.ColumnCategory; import org.apache.tsfile.write.schema.IMeasurementSchema; import java.util.ArrayList; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/io/CompactionTsFileWriter.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/io/CompactionTsFileWriter.java index fcea93d6c2e..4f0ae737704 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/io/CompactionTsFileWriter.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/io/CompactionTsFileWriter.java @@ -24,6 +24,7 @@ import org.apache.iotdb.db.storageengine.dataregion.compaction.schedule.Compacti import org.apache.iotdb.db.storageengine.dataregion.compaction.schedule.constant.CompactionIoDataType; import org.apache.iotdb.db.storageengine.dataregion.compaction.schedule.constant.CompactionType; +import org.apache.tsfile.enums.ColumnCategory; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.file.metadata.ChunkMetadata; import org.apache.tsfile.file.metadata.IDeviceID; @@ -34,7 +35,6 @@ import org.apache.tsfile.file.metadata.statistics.Statistics; import org.apache.tsfile.read.common.Chunk; import org.apache.tsfile.write.chunk.AlignedChunkWriterImpl; import org.apache.tsfile.write.chunk.IChunkWriter; -import org.apache.tsfile.write.record.Tablet.ColumnCategory; import org.apache.tsfile.write.writer.TsFileIOWriter; import org.apache.tsfile.write.writer.tsmiterator.TSMIterator; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/connector/PipeTabletEventSorterTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/connector/PipeTabletEventSorterTest.java index 72d20dab050..92a4d33fcef 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/connector/PipeTabletEventSorterTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/connector/PipeTabletEventSorterTest.java @@ -22,6 +22,7 @@ package org.apache.iotdb.db.pipe.connector; import org.apache.iotdb.db.pipe.connector.util.sorter.PipeTableModelTabletEventSorter; import org.apache.iotdb.db.pipe.connector.util.sorter.PipeTreeModelTabletEventSorter; +import org.apache.tsfile.enums.ColumnCategory; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.utils.Binary; import org.apache.tsfile.utils.DateUtils; @@ -306,17 +307,17 @@ public class PipeTabletEventSorterTest { schemaList.add(new MeasurementSchema("s7", TSDataType.DATE)); schemaList.add(new MeasurementSchema("s8", TSDataType.TEXT)); - final List<Tablet.ColumnCategory> columnTypes = + final List<ColumnCategory> columnTypes = Arrays.asList( - Tablet.ColumnCategory.TAG, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD, - Tablet.ColumnCategory.FIELD); + ColumnCategory.TAG, + ColumnCategory.FIELD, + ColumnCategory.FIELD, + ColumnCategory.FIELD, + ColumnCategory.FIELD, + ColumnCategory.FIELD, + ColumnCategory.FIELD, + ColumnCategory.FIELD, + ColumnCategory.FIELD); Tablet tablet = new Tablet( tableName, diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGeneratorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGeneratorTest.java index 5bb36669f70..cc46c63f24e 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGeneratorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/parser/StatementGeneratorTest.java @@ -82,13 +82,13 @@ import org.apache.iotdb.service.rpc.thrift.TSRawDataQueryReq; import org.apache.iotdb.service.rpc.thrift.TSUnsetSchemaTemplateReq; import org.apache.iotdb.session.template.MeasurementNode; +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.read.common.type.TypeFactory; import org.apache.tsfile.utils.Binary; import org.apache.tsfile.utils.BitMap; -import org.apache.tsfile.write.record.Tablet; import org.junit.Assert; import org.junit.Test; @@ -213,11 +213,8 @@ public class StatementGeneratorTest { public void testInsertRelationalTablet() throws IllegalPathException { List<String> measurements = Arrays.asList("id1", "attr1", "m1"); List<TSDataType> dataTypes = Arrays.asList(TSDataType.TEXT, TSDataType.TEXT, TSDataType.DOUBLE); - List<Tablet.ColumnCategory> tsfileColumnCategories = - Arrays.asList( - Tablet.ColumnCategory.TAG, - Tablet.ColumnCategory.ATTRIBUTE, - Tablet.ColumnCategory.FIELD); + List<ColumnCategory> tsfileColumnCategories = + Arrays.asList(ColumnCategory.TAG, ColumnCategory.ATTRIBUTE, ColumnCategory.FIELD); List<TsTableColumnCategory> columnCategories = tsfileColumnCategories.stream() .map(TsTableColumnCategory::fromTsFileColumnCategory) diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/tablemodel/CompactionTableModelTestFileWriter.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/tablemodel/CompactionTableModelTestFileWriter.java index d7a13b1f321..f586f6a5473 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/tablemodel/CompactionTableModelTestFileWriter.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/tablemodel/CompactionTableModelTestFileWriter.java @@ -23,13 +23,13 @@ import org.apache.iotdb.db.storageengine.dataregion.compaction.execute.utils.Com import org.apache.iotdb.db.storageengine.dataregion.compaction.utils.CompactionTestFileWriter; import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource; +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; 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; import org.apache.tsfile.write.schema.Schema; diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/tablemodel/CompactionTableSchemaCollectorTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/tablemodel/CompactionTableSchemaCollectorTest.java index 9a627d27ea9..932573ddbce 100644 --- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/tablemodel/CompactionTableSchemaCollectorTest.java +++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/tablemodel/CompactionTableSchemaCollectorTest.java @@ -22,9 +22,9 @@ package org.apache.iotdb.db.storageengine.dataregion.compaction.tablemodel; import org.apache.iotdb.db.storageengine.dataregion.compaction.execute.exception.CompactionTableSchemaNotMatchException; import org.apache.iotdb.db.storageengine.dataregion.compaction.execute.utils.CompactionTableSchema; +import org.apache.tsfile.enums.ColumnCategory; import org.apache.tsfile.enums.TSDataType; import org.apache.tsfile.file.metadata.TableSchema; -import org.apache.tsfile.write.record.Tablet.ColumnCategory; import org.apache.tsfile.write.schema.IMeasurementSchema; import org.apache.tsfile.write.schema.MeasurementSchema; import org.junit.Assert; diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/column/TsTableColumnCategory.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/column/TsTableColumnCategory.java index 9f6dcd6019c..0ee7133b2d0 100644 --- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/column/TsTableColumnCategory.java +++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/column/TsTableColumnCategory.java @@ -19,8 +19,8 @@ package org.apache.iotdb.commons.schema.table.column; +import org.apache.tsfile.enums.ColumnCategory; import org.apache.tsfile.utils.ReadWriteIOUtils; -import org.apache.tsfile.write.record.Tablet.ColumnCategory; import java.io.IOException; import java.io.InputStream;
