You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2024/12/24 10:32:20 UTC
(iotdb) 01/01: Rename table concept
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch rename_table_concepts
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit c895f8404095a04d11a48f92f5f3fcbb411ed048
Author: HTHou <ha...@apache.org>
AuthorDate: Tue Dec 24 18:31:57 2024 +0800
Rename table concept
---
.../org/apache/iotdb/TableModelSessionExample.java | 10 ++---
.../apache/iotdb/TableModelSessionPoolExample.java | 10 ++---
.../manual/IoTDBPipeTypeConversionISessionIT.java | 2 +-
.../iotdb/pipe/it/tablemodel/TableModelUtils.java | 18 ++++-----
.../relational/it/db/it/IoTDBInsertTableIT.java | 46 +++++++++++-----------
.../it/query/old/orderBy/IoTDBOrderByTableIT.java | 24 +++++------
.../it/session/IoTDBSessionRelationalIT.java | 26 ++++++------
.../pool/IoTDBInsertTableSessionPoolIT.java | 30 +++++++-------
.../iotdb/session/SessionCacheLeaderTest.java | 12 +++---
.../confignode/persistence/schema/ConfigMTree.java | 2 +-
.../connector/protocol/opcua/OpcUaNameSpace.java | 4 +-
.../tablet/parser/TabletInsertionEventParser.java | 8 ++--
...ileInsertionEventTableParserTabletIterator.java | 2 +-
.../resource/memory/InsertNodeMemoryEstimator.java | 2 +-
.../schema/source/TableDeviceFetchSource.java | 2 +-
.../schema/source/TableDeviceQuerySource.java | 2 +-
.../TableAggregationTableScanOperator.java | 10 ++---
.../source/relational/TableScanOperator.java | 4 +-
.../analyze/load/LoadTsFileTableSchemaCache.java | 4 +-
.../plan/planner/TableOperatorGenerator.java | 15 ++++---
.../plan/planner/plan/node/write/InsertNode.java | 8 ++--
.../relational/analyzer/StatementAnalyzer.java | 4 +-
.../predicate/ConvertPredicateToFilterVisitor.java | 2 +-
.../schema/CheckSchemaPredicateVisitor.java | 2 +-
.../ConvertSchemaPredicateToFilterVisitor.java | 4 +-
.../plan/relational/metadata/TableSchema.java | 2 +-
.../metadata/fetcher/TableDeviceSchemaFetcher.java | 2 +-
.../fetcher/TableHeaderSchemaValidator.java | 8 ++--
.../plan/relational/planner/RelationPlanner.java | 2 +-
.../distribute/TableDistributedPlanGenerator.java | 2 +-
.../relational/planner/node/TableScanNode.java | 7 ++--
.../PushLimitOffsetIntoTableScan.java | 5 +--
.../optimizations/PushPredicateIntoTableScan.java | 4 +-
.../TransformAggregationToStreamable.java | 4 +-
.../optimizations/TransformSortToStreamSort.java | 5 +--
.../sql/ast/AbstractQueryDeviceWithCache.java | 2 +-
.../plan/relational/sql/ast/ColumnDefinition.java | 2 +-
.../relational/sql/ast/WrappedInsertStatement.java | 7 ++--
.../plan/relational/sql/parser/AstBuilder.java | 10 ++---
.../plan/statement/crud/InsertBaseStatement.java | 2 +-
.../execute/utils/CompactionTableSchema.java | 4 +-
.../compaction/io/CompactionTsFileWriter.java | 2 +-
.../dataregion/memtable/AbstractMemTable.java | 4 +-
.../dataregion/memtable/TsFileProcessor.java | 17 ++++----
.../org/apache/iotdb/db/utils/CommonUtils.java | 2 +-
.../java/org/apache/iotdb/db/utils/MemUtils.java | 2 +-
.../db/utils/datastructure/AlignedTVList.java | 3 +-
.../plan/parser/StatementGeneratorTest.java | 11 ++----
.../node/write/InsertRowsNodeSerdeTest.java | 22 +++++------
.../node/write/InsertTabletNodeSerdeTest.java | 16 ++++----
.../planner/node/write/WritePlanNodeSplitTest.java | 2 +-
.../plan/relational/analyzer/TSBSMetadata.java | 38 +++++++-----------
.../plan/relational/analyzer/TestMatadata.java | 18 +++------
.../plan/relational/sql/ast/InsertTabletTest.java | 4 +-
.../plan/statement/InsertStatementTest.java | 45 +++++++++------------
.../plan/statement/StatementTestUtils.java | 6 +--
.../CompactionTableModelTestFileWriter.java | 2 +-
.../CompactionTableSchemaCollectorTest.java | 44 ++++++++++-----------
.../dataregion/wal/io/WALFileTest.java | 2 +-
.../apache/iotdb/commons/schema/table/TsTable.java | 10 ++---
.../schema/table/column/IdColumnSchema.java | 2 +-
.../table/column/MeasurementColumnSchema.java | 2 +-
.../schema/table/column/TsTableColumnCategory.java | 24 +++++------
.../table/column/TsTableColumnSchemaUtil.java | 8 ++--
pom.xml | 2 +-
65 files changed, 285 insertions(+), 324 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 7f2203f2e43..07f1418b37a 100644
--- a/example/session/src/main/java/org/apache/iotdb/TableModelSessionExample.java
+++ b/example/session/src/main/java/org/apache/iotdb/TableModelSessionExample.java
@@ -90,12 +90,12 @@ public class TableModelSessionExample {
List<Tablet.ColumnCategory> columnTypeList =
new ArrayList<>(
Arrays.asList(
- Tablet.ColumnCategory.ID,
- Tablet.ColumnCategory.ID,
- Tablet.ColumnCategory.ID,
+ Tablet.ColumnCategory.TAG,
+ Tablet.ColumnCategory.TAG,
+ Tablet.ColumnCategory.TAG,
Tablet.ColumnCategory.ATTRIBUTE,
- Tablet.ColumnCategory.MEASUREMENT,
- Tablet.ColumnCategory.MEASUREMENT));
+ Tablet.ColumnCategory.FIELD,
+ Tablet.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 88ae7a91692..fe2b5a55c73 100644
--- a/example/session/src/main/java/org/apache/iotdb/TableModelSessionPoolExample.java
+++ b/example/session/src/main/java/org/apache/iotdb/TableModelSessionPoolExample.java
@@ -108,12 +108,12 @@ public class TableModelSessionPoolExample {
List<ColumnCategory> columnTypeList =
new ArrayList<>(
Arrays.asList(
- ColumnCategory.ID,
- ColumnCategory.ID,
- ColumnCategory.ID,
+ ColumnCategory.TAG,
+ ColumnCategory.TAG,
+ ColumnCategory.TAG,
ColumnCategory.ATTRIBUTE,
- ColumnCategory.MEASUREMENT,
- ColumnCategory.MEASUREMENT));
+ 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/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeTypeConversionISessionIT.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeTypeConversionISessionIT.java
index f79ab8c7300..6d6d22fafce 100644
--- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeTypeConversionISessionIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeTypeConversionISessionIT.java
@@ -750,7 +750,7 @@ public class IoTDBPipeTypeConversionISessionIT extends AbstractPipeDualManualIT
for (int i = 0; i < objects.length; i++) {
MeasurementSchema schema = pairs.get(i).left;
measurementSchemas.add(schema);
- columnTypes.add(Tablet.ColumnCategory.MEASUREMENT);
+ columnTypes.add(Tablet.ColumnCategory.FIELD);
switch (schema.getType()) {
case INT64:
objects[i] = createTestDataForInt64();
diff --git a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/TableModelUtils.java b/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/TableModelUtils.java
index ce33dc3e6a5..914392ad0f8 100644
--- a/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/TableModelUtils.java
+++ b/integration-test/src/test/java/org/apache/iotdb/pipe/it/tablemodel/TableModelUtils.java
@@ -382,15 +382,15 @@ public class TableModelUtils {
final List<Tablet.ColumnCategory> columnTypes =
Arrays.asList(
- Tablet.ColumnCategory.ID,
- Tablet.ColumnCategory.MEASUREMENT,
- Tablet.ColumnCategory.MEASUREMENT,
- Tablet.ColumnCategory.MEASUREMENT,
- Tablet.ColumnCategory.MEASUREMENT,
- Tablet.ColumnCategory.MEASUREMENT,
- Tablet.ColumnCategory.MEASUREMENT,
- Tablet.ColumnCategory.MEASUREMENT,
- Tablet.ColumnCategory.MEASUREMENT);
+ Tablet.ColumnCategory.TAG,
+ Tablet.ColumnCategory.FIELD,
+ Tablet.ColumnCategory.FIELD,
+ Tablet.ColumnCategory.FIELD,
+ Tablet.ColumnCategory.FIELD,
+ Tablet.ColumnCategory.FIELD,
+ Tablet.ColumnCategory.FIELD,
+ Tablet.ColumnCategory.FIELD,
+ Tablet.ColumnCategory.FIELD);
Tablet tablet =
new Tablet(
tableName,
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 816aba7c183..3fac1aee130 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
@@ -188,10 +188,10 @@ public class IoTDBInsertTableIT {
schemaList.add(new MeasurementSchema("s3", TSDataType.INT64));
final List<ColumnCategory> columnTypes =
Arrays.asList(
- ColumnCategory.ID,
- ColumnCategory.MEASUREMENT,
- ColumnCategory.MEASUREMENT,
- ColumnCategory.MEASUREMENT);
+ ColumnCategory.TAG,
+ ColumnCategory.FIELD,
+ ColumnCategory.FIELD,
+ ColumnCategory.FIELD);
Tablet tablet =
new Tablet(
"sg6",
@@ -578,7 +578,7 @@ public class IoTDBInsertTableIT {
schemaList.add(new MeasurementSchema("attr1", TSDataType.STRING));
schemaList.add(new MeasurementSchema("m1", TSDataType.DOUBLE));
final List<ColumnCategory> columnTypes =
- Arrays.asList(ColumnCategory.ID, ColumnCategory.ATTRIBUTE, ColumnCategory.MEASUREMENT);
+ Arrays.asList(ColumnCategory.TAG, ColumnCategory.ATTRIBUTE, ColumnCategory.FIELD);
long timestamp = 0;
@@ -626,7 +626,7 @@ public class IoTDBInsertTableIT {
schemaList.add(new MeasurementSchema("attr1", TSDataType.STRING));
schemaList.add(new MeasurementSchema("m1", TSDataType.DOUBLE));
final List<ColumnCategory> columnTypes =
- Arrays.asList(ColumnCategory.ID, ColumnCategory.ATTRIBUTE, ColumnCategory.MEASUREMENT);
+ Arrays.asList(ColumnCategory.TAG, ColumnCategory.ATTRIBUTE, ColumnCategory.FIELD);
List<String> measurementIds =
schemaList.stream()
.map(IMeasurementSchema::getMeasurementName)
@@ -675,7 +675,7 @@ public class IoTDBInsertTableIT {
schemaList.add(new MeasurementSchema("attr1", TSDataType.STRING));
schemaList.add(new MeasurementSchema("m1", TSDataType.DOUBLE));
final List<ColumnCategory> columnTypes =
- Arrays.asList(ColumnCategory.ID, ColumnCategory.ATTRIBUTE, ColumnCategory.MEASUREMENT);
+ Arrays.asList(ColumnCategory.TAG, ColumnCategory.ATTRIBUTE, ColumnCategory.FIELD);
long timestamp = 0;
Tablet tablet =
@@ -730,7 +730,7 @@ public class IoTDBInsertTableIT {
schemaList.add(new MeasurementSchema("attr1", TSDataType.STRING));
schemaList.add(new MeasurementSchema("m1", TSDataType.DOUBLE));
final List<ColumnCategory> columnTypes =
- Arrays.asList(ColumnCategory.ID, ColumnCategory.ATTRIBUTE, ColumnCategory.MEASUREMENT);
+ Arrays.asList(ColumnCategory.TAG, ColumnCategory.ATTRIBUTE, ColumnCategory.FIELD);
long timestamp = 0;
Tablet tablet =
@@ -807,18 +807,18 @@ public class IoTDBInsertTableIT {
schemas.add(new MeasurementSchema("date", TSDataType.DATE));
final List<ColumnCategory> columnTypes =
Arrays.asList(
- ColumnCategory.ID,
+ ColumnCategory.TAG,
ColumnCategory.ATTRIBUTE,
- ColumnCategory.MEASUREMENT,
- ColumnCategory.MEASUREMENT,
- ColumnCategory.MEASUREMENT,
- ColumnCategory.MEASUREMENT,
- ColumnCategory.MEASUREMENT,
- ColumnCategory.MEASUREMENT,
- ColumnCategory.MEASUREMENT,
- ColumnCategory.MEASUREMENT,
- ColumnCategory.MEASUREMENT,
- ColumnCategory.MEASUREMENT);
+ ColumnCategory.FIELD,
+ ColumnCategory.FIELD,
+ ColumnCategory.FIELD,
+ ColumnCategory.FIELD,
+ ColumnCategory.FIELD,
+ ColumnCategory.FIELD,
+ ColumnCategory.FIELD,
+ ColumnCategory.FIELD,
+ ColumnCategory.FIELD,
+ ColumnCategory.FIELD);
long timestamp = 0;
Tablet tablet =
@@ -949,7 +949,7 @@ public class IoTDBInsertTableIT {
schemaList.add(new MeasurementSchema("id1", TSDataType.STRING));
schemaList.add(new MeasurementSchema("s1", TSDataType.INT64));
final List<ColumnCategory> columnTypes =
- Arrays.asList(ColumnCategory.ID, ColumnCategory.MEASUREMENT);
+ Arrays.asList(ColumnCategory.TAG, ColumnCategory.FIELD);
// all expired
long timestamp = 0;
@@ -1024,10 +1024,10 @@ public class IoTDBInsertTableIT {
schemaList.add(new MeasurementSchema("m2", TSDataType.DOUBLE));
final List<ColumnCategory> columnTypes =
Arrays.asList(
- ColumnCategory.ID,
+ ColumnCategory.TAG,
ColumnCategory.ATTRIBUTE,
- ColumnCategory.MEASUREMENT,
- ColumnCategory.MEASUREMENT);
+ ColumnCategory.FIELD,
+ ColumnCategory.FIELD);
long timestamp = 0;
Tablet tablet =
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 84da55ea3c7..b598591792c 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
@@ -1477,13 +1477,13 @@ public class IoTDBOrderByTableIT {
schemaList.add(new MeasurementSchema("bool", TSDataType.BOOLEAN));
final List<Tablet.ColumnCategory> columnTypes =
Arrays.asList(
- Tablet.ColumnCategory.ID,
+ Tablet.ColumnCategory.TAG,
Tablet.ColumnCategory.ATTRIBUTE,
- Tablet.ColumnCategory.MEASUREMENT,
- Tablet.ColumnCategory.MEASUREMENT,
- Tablet.ColumnCategory.MEASUREMENT,
- Tablet.ColumnCategory.MEASUREMENT,
- Tablet.ColumnCategory.MEASUREMENT);
+ Tablet.ColumnCategory.FIELD,
+ Tablet.ColumnCategory.FIELD,
+ Tablet.ColumnCategory.FIELD,
+ Tablet.ColumnCategory.FIELD,
+ Tablet.ColumnCategory.FIELD);
List<String> measurementIds = IMeasurementSchema.getMeasurementNameList(schemaList);
List<TSDataType> dataTypes = IMeasurementSchema.getDataTypeList(schemaList);
@@ -1532,13 +1532,13 @@ public class IoTDBOrderByTableIT {
schemaList.add(new MeasurementSchema("bool", TSDataType.BOOLEAN));
final List<Tablet.ColumnCategory> columnTypes =
Arrays.asList(
- Tablet.ColumnCategory.ID,
+ Tablet.ColumnCategory.TAG,
Tablet.ColumnCategory.ATTRIBUTE,
- Tablet.ColumnCategory.MEASUREMENT,
- Tablet.ColumnCategory.MEASUREMENT,
- Tablet.ColumnCategory.MEASUREMENT,
- Tablet.ColumnCategory.MEASUREMENT,
- Tablet.ColumnCategory.MEASUREMENT);
+ Tablet.ColumnCategory.FIELD,
+ Tablet.ColumnCategory.FIELD,
+ Tablet.ColumnCategory.FIELD,
+ Tablet.ColumnCategory.FIELD,
+ Tablet.ColumnCategory.FIELD);
List<String> measurementIds = 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/session/IoTDBSessionRelationalIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/session/IoTDBSessionRelationalIT.java
index a57028dddbf..ebacbf818a9 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
@@ -160,7 +160,7 @@ public class IoTDBSessionRelationalIT {
schemaList.add(new MeasurementSchema("attr1", TSDataType.STRING));
schemaList.add(new MeasurementSchema("m1", TSDataType.DOUBLE));
final List<ColumnCategory> columnTypes =
- Arrays.asList(ColumnCategory.ID, ColumnCategory.ATTRIBUTE, ColumnCategory.MEASUREMENT);
+ Arrays.asList(ColumnCategory.TAG, ColumnCategory.ATTRIBUTE, ColumnCategory.FIELD);
long timestamp = 0;
Tablet tablet =
@@ -385,10 +385,10 @@ public class IoTDBSessionRelationalIT {
schemaList.add(new MeasurementSchema("m2", TSDataType.DOUBLE));
final List<ColumnCategory> columnTypes =
Arrays.asList(
- ColumnCategory.ID,
+ ColumnCategory.TAG,
ColumnCategory.ATTRIBUTE,
- ColumnCategory.MEASUREMENT,
- ColumnCategory.MEASUREMENT);
+ ColumnCategory.FIELD,
+ ColumnCategory.FIELD);
long timestamp = 0;
Tablet tablet =
@@ -522,7 +522,7 @@ public class IoTDBSessionRelationalIT {
schemaList.add(new MeasurementSchema("attr1", TSDataType.STRING));
schemaList.add(new MeasurementSchema("m1", TSDataType.DOUBLE));
final List<ColumnCategory> columnTypes =
- Arrays.asList(ColumnCategory.ID, ColumnCategory.ATTRIBUTE, ColumnCategory.MEASUREMENT);
+ Arrays.asList(ColumnCategory.TAG, ColumnCategory.ATTRIBUTE, ColumnCategory.FIELD);
long timestamp = 0;
Tablet tablet =
@@ -599,7 +599,7 @@ public class IoTDBSessionRelationalIT {
schemaList.add(new MeasurementSchema("attr1", TSDataType.STRING));
schemaList.add(new MeasurementSchema("m1", TSDataType.DOUBLE));
final List<ColumnCategory> columnTypes =
- Arrays.asList(ColumnCategory.ID, ColumnCategory.ATTRIBUTE, ColumnCategory.MEASUREMENT);
+ Arrays.asList(ColumnCategory.TAG, ColumnCategory.ATTRIBUTE, ColumnCategory.FIELD);
long timestamp = 0;
Tablet tablet =
@@ -679,7 +679,7 @@ public class IoTDBSessionRelationalIT {
schemaList.add(new MeasurementSchema("attr1", TSDataType.STRING));
schemaList.add(new MeasurementSchema("m1", TSDataType.DOUBLE));
final List<ColumnCategory> columnTypes =
- Arrays.asList(ColumnCategory.ID, ColumnCategory.ATTRIBUTE, ColumnCategory.MEASUREMENT);
+ Arrays.asList(ColumnCategory.TAG, ColumnCategory.ATTRIBUTE, ColumnCategory.FIELD);
long timestamp = 0;
Tablet tablet =
@@ -752,7 +752,7 @@ public class IoTDBSessionRelationalIT {
schemaList.add(new MeasurementSchema("attr1", TSDataType.STRING));
schemaList.add(new MeasurementSchema("m1", TSDataType.DOUBLE));
final List<ColumnCategory> columnTypes =
- Arrays.asList(ColumnCategory.ID, ColumnCategory.ATTRIBUTE, ColumnCategory.MEASUREMENT);
+ Arrays.asList(ColumnCategory.TAG, ColumnCategory.ATTRIBUTE, ColumnCategory.FIELD);
long timestamp = 0;
Tablet tablet =
@@ -813,7 +813,7 @@ public class IoTDBSessionRelationalIT {
schemaList.add(new MeasurementSchema("attr1", TSDataType.STRING));
schemaList.add(new MeasurementSchema("m1", TSDataType.DOUBLE));
final List<ColumnCategory> columnTypes =
- Arrays.asList(ColumnCategory.ID, ColumnCategory.ATTRIBUTE, ColumnCategory.MEASUREMENT);
+ Arrays.asList(ColumnCategory.TAG, ColumnCategory.ATTRIBUTE, ColumnCategory.FIELD);
long timestamp = 0;
Tablet tablet =
@@ -895,10 +895,10 @@ public class IoTDBSessionRelationalIT {
schemaList.add(new MeasurementSchema("m1", TSDataType.DOUBLE));
final List<ColumnCategory> columnTypes =
Arrays.asList(
- ColumnCategory.ID,
- ColumnCategory.ID,
+ ColumnCategory.TAG,
+ ColumnCategory.TAG,
ColumnCategory.ATTRIBUTE,
- ColumnCategory.MEASUREMENT);
+ ColumnCategory.FIELD);
List<String> measurementIds = IMeasurementSchema.getMeasurementNameList(schemaList);
List<TSDataType> dataTypes = IMeasurementSchema.getDataTypeList(schemaList);
@@ -1154,7 +1154,7 @@ public class IoTDBSessionRelationalIT {
schemaList.add(new MeasurementSchema("id1", TSDataType.STRING));
schemaList.add(new MeasurementSchema("m1", from));
final List<ColumnCategory> columnTypes =
- Arrays.asList(ColumnCategory.ID, ColumnCategory.MEASUREMENT);
+ Arrays.asList(ColumnCategory.TAG, ColumnCategory.FIELD);
Tablet tablet =
new Tablet(
"table" + testNum,
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 9441bca94b5..77ccea19d33 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
@@ -88,10 +88,10 @@ public class IoTDBInsertTableSessionPoolIT {
schemaList.add(new MeasurementSchema("s3", TSDataType.INT64));
final List<ColumnCategory> columnTypes =
Arrays.asList(
- ColumnCategory.ID,
- ColumnCategory.MEASUREMENT,
- ColumnCategory.MEASUREMENT,
- ColumnCategory.MEASUREMENT);
+ ColumnCategory.TAG,
+ ColumnCategory.FIELD,
+ ColumnCategory.FIELD,
+ ColumnCategory.FIELD);
Tablet tablet =
new Tablet(
"sg6",
@@ -193,18 +193,18 @@ public class IoTDBInsertTableSessionPoolIT {
schemas.add(new MeasurementSchema("date", TSDataType.DATE));
final List<ColumnCategory> columnTypes =
Arrays.asList(
- ColumnCategory.ID,
+ ColumnCategory.TAG,
ColumnCategory.ATTRIBUTE,
- ColumnCategory.MEASUREMENT,
- ColumnCategory.MEASUREMENT,
- ColumnCategory.MEASUREMENT,
- ColumnCategory.MEASUREMENT,
- ColumnCategory.MEASUREMENT,
- ColumnCategory.MEASUREMENT,
- ColumnCategory.MEASUREMENT,
- ColumnCategory.MEASUREMENT,
- ColumnCategory.MEASUREMENT,
- ColumnCategory.MEASUREMENT);
+ ColumnCategory.FIELD,
+ ColumnCategory.FIELD,
+ ColumnCategory.FIELD,
+ ColumnCategory.FIELD,
+ ColumnCategory.FIELD,
+ ColumnCategory.FIELD,
+ ColumnCategory.FIELD,
+ ColumnCategory.FIELD,
+ ColumnCategory.FIELD,
+ ColumnCategory.FIELD);
long timestamp = 0;
Tablet tablet =
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 e1af26845fe..a969c8d0c70 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
@@ -643,9 +643,9 @@ public class SessionCacheLeaderTest {
dataTypes.add(TSDataType.INT64);
dataTypes.add(TSDataType.INT64);
List<ColumnCategory> columnTypeList = new ArrayList<>();
- columnTypeList.add(ColumnCategory.ID);
- columnTypeList.add(ColumnCategory.MEASUREMENT);
- columnTypeList.add(ColumnCategory.MEASUREMENT);
+ columnTypeList.add(ColumnCategory.TAG);
+ columnTypeList.add(ColumnCategory.FIELD);
+ columnTypeList.add(ColumnCategory.FIELD);
Tablet tablet = new Tablet(tableName, measurements, dataTypes, columnTypeList, 50);
long timestamp = System.currentTimeMillis();
for (long row = 0; row < 100; row++) {
@@ -1038,9 +1038,9 @@ public class SessionCacheLeaderTest {
schemaList.add(new MeasurementSchema("id", TSDataType.STRING));
schemaList.add(new MeasurementSchema("s1", TSDataType.INT64));
schemaList.add(new MeasurementSchema("s2", TSDataType.INT64));
- columnTypeList.add(ColumnCategory.ID);
- columnTypeList.add(ColumnCategory.MEASUREMENT);
- columnTypeList.add(ColumnCategory.MEASUREMENT);
+ columnTypeList.add(ColumnCategory.TAG);
+ columnTypeList.add(ColumnCategory.FIELD);
+ columnTypeList.add(ColumnCategory.FIELD);
Tablet tablet =
new Tablet(
tableName,
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/ConfigMTree.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/ConfigMTree.java
index 248b9ec2f35..bb6474258bd 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/ConfigMTree.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/schema/ConfigMTree.java
@@ -848,7 +848,7 @@ public class ConfigMTree {
throw new ColumnNotExistsException(
PathUtils.unQualifyDatabaseName(database.getFullPath()), tableName, columnName);
}
- if (columnSchema.getColumnCategory() == TsTableColumnCategory.ID
+ if (columnSchema.getColumnCategory() == TsTableColumnCategory.TAG
|| columnSchema.getColumnCategory() == TsTableColumnCategory.TIME) {
throw new SemanticException("Dropping id or time column is not supported.");
}
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 8467e559656..270188005ce 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
@@ -139,7 +139,7 @@ public class OpcUaNameSpace extends ManagedNamespaceWithLifecycle {
} else {
final List<Integer> columnIndexes = new ArrayList<>();
for (int i = 0; i < schemas.size(); ++i) {
- if (tablet.getColumnTypes().get(i) == Tablet.ColumnCategory.MEASUREMENT) {
+ if (tablet.getColumnTypes().get(i) == Tablet.ColumnCategory.FIELD) {
columnIndexes.add(i);
newSchemas.add(schemas.get(i));
}
@@ -335,7 +335,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.MEASUREMENT)) {
+ && !tablet.getColumnTypes().get(columnIndex).equals(Tablet.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/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 3eddd7ee6ac..d6011b054f1 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
@@ -153,7 +153,7 @@ public abstract class TabletInsertionEventParser {
this.valueColumnTypes[filteredColumnIndex] =
originColumnCategories != null && originColumnCategories[i] != null
? originColumnCategories[i].toTsFileColumnType()
- : Tablet.ColumnCategory.MEASUREMENT;
+ : Tablet.ColumnCategory.FIELD;
this.valueColumnDataTypes[filteredColumnIndex] = originValueColumnDataTypes[i];
final BitMap bitMap = new BitMap(this.timestampColumn.length);
if (Objects.isNull(originValueColumns[i])
@@ -247,7 +247,7 @@ public abstract class TabletInsertionEventParser {
this.valueColumnTypes[filteredColumnIndex] =
originColumnCategories != null && originColumnCategories[i] != null
? originColumnCategories[i].toTsFileColumnType()
- : Tablet.ColumnCategory.MEASUREMENT;
+ : Tablet.ColumnCategory.FIELD;
this.valueColumnDataTypes[filteredColumnIndex] = originValueColumnDataTypes[i];
final BitMap bitMap = new BitMap(this.timestampColumn.length);
if (Objects.isNull(originValueColumns[i])
@@ -330,7 +330,7 @@ public abstract class TabletInsertionEventParser {
originColumnTypes[i] =
tablet.getColumnTypes() != null && tablet.getColumnTypes().get(i) != null
? tablet.getColumnTypes().get(i)
- : Tablet.ColumnCategory.MEASUREMENT;
+ : Tablet.ColumnCategory.FIELD;
originValueColumnDataTypes[i] = originMeasurementSchemaList.get(i).getType();
}
final Object[] originValueColumns =
@@ -354,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.MEASUREMENT;
+ originColumnTypes[i] != null ? originColumnTypes[i] : Tablet.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 39c109496c5..8aa47cfa595 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
@@ -133,7 +133,7 @@ public class TsFileInsertionEventTableParserTabletIterator implements Iterator<T
? row[i]
: DateUtils.parseIntToLocalDate((Integer) row[i]);
tablet.addValue(columnNames.get(i), rowIndex, value);
- if (value != null && columnTypes.get(i) == Tablet.ColumnCategory.MEASUREMENT) {
+ if (value != null && columnTypes.get(i) == Tablet.ColumnCategory.FIELD) {
isAllNull = false;
}
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/memory/InsertNodeMemoryEstimator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/memory/InsertNodeMemoryEstimator.java
index 2f7b12b2768..46c0ff4e121 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/memory/InsertNodeMemoryEstimator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/resource/memory/InsertNodeMemoryEstimator.java
@@ -514,7 +514,7 @@ public class InsertNodeMemoryEstimator {
long size = SIZE_OF_ARRAYLIST;
size += NUM_BYTES_ARRAY_HEADER;
for (TsTableColumnCategory columnCategory : columnCategories) {
- if (columnCategory != null && columnCategory.equals(TsTableColumnCategory.ID)) {
+ if (columnCategory != null && columnCategory.equals(TsTableColumnCategory.TAG)) {
size += SIZE_OF_INT + NUM_BYTES_OBJECT_REF;
}
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/TableDeviceFetchSource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/TableDeviceFetchSource.java
index d1b5995bfc4..965d93fdcb2 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/TableDeviceFetchSource.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/TableDeviceFetchSource.java
@@ -83,7 +83,7 @@ public class TableDeviceFetchSource implements ISchemaSource<IDeviceSchemaInfo>
TsTableColumnSchema columnSchema;
for (final ColumnHeader columnHeader : columnHeaderList) {
columnSchema = table.getColumnSchema(columnHeader.getColumnName());
- if (columnSchema.getColumnCategory().equals(TsTableColumnCategory.ID)) {
+ if (columnSchema.getColumnCategory().equals(TsTableColumnCategory.TAG)) {
if (pathNodes.length <= idIndex + 3 || pathNodes[idIndex + 3] == null) {
builder.getColumnBuilder(resultIndex).appendNull();
} else {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/TableDeviceQuerySource.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/TableDeviceQuerySource.java
index 919553d2f18..dfa0cf4baf1 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/TableDeviceQuerySource.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/schema/source/TableDeviceQuerySource.java
@@ -224,7 +224,7 @@ public class TableDeviceQuerySource implements ISchemaSource<IDeviceSchemaInfo>
TsTableColumnSchema columnSchema;
for (final ColumnHeader columnHeader : columnHeaderList) {
columnSchema = table.getColumnSchema(columnHeader.getColumnName());
- if (columnSchema.getColumnCategory().equals(TsTableColumnCategory.ID)) {
+ if (columnSchema.getColumnCategory().equals(TsTableColumnCategory.TAG)) {
if (pathNodes.length <= idIndex || pathNodes[idIndex] == null) {
builder.getColumnBuilder(resultIndex).appendNull();
} else {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TableAggregationTableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TableAggregationTableScanOperator.java
index 8ef9ddbbf04..47f63fd6468 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TableAggregationTableScanOperator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TableAggregationTableScanOperator.java
@@ -443,7 +443,7 @@ public class TableAggregationTableScanOperator extends AbstractDataSourceOperato
switch (columnSchemaCategory) {
case TIME:
return inputRegion.getTimeColumn();
- case ID:
+ case TAG:
// TODO avoid create deviceStatics multi times; count, sum can use time statistics
String id =
(String)
@@ -460,7 +460,7 @@ public class TableAggregationTableScanOperator extends AbstractDataSourceOperato
.getAttributeColumnValues()
.get(aggColumnsIndexArray[columnIdx]);
return getIdOrAttrColumn(inputRegion.getTimeColumn().getPositionCount(), attr);
- case MEASUREMENT:
+ case FIELD:
return inputRegion.getColumn(aggColumnsIndexArray[columnIdx]);
default:
throw new IllegalStateException("Unsupported column type: " + columnSchemaCategory);
@@ -514,7 +514,7 @@ public class TableAggregationTableScanOperator extends AbstractDataSourceOperato
switch (columnSchemaCategory) {
case TIME:
return timeStatistics;
- case ID:
+ case TAG:
// TODO avoid create deviceStatics multi times; count, sum can use time statistics
String id =
(String)
@@ -530,7 +530,7 @@ public class TableAggregationTableScanOperator extends AbstractDataSourceOperato
.getAttributeColumnValues()
.get(aggColumnsIndexArray[columnIdx]);
return getStatistics(timeStatistics, attr);
- case MEASUREMENT:
+ case FIELD:
return valueStatistics[aggColumnsIndexArray[columnIdx]];
default:
throw new IllegalStateException("Unsupported column type: " + columnSchemaCategory);
@@ -736,7 +736,7 @@ public class TableAggregationTableScanOperator extends AbstractDataSourceOperato
if (groupingKeyIndex != null) {
for (int i = 0; i < groupKeySize; i++) {
- if (TsTableColumnCategory.ID == groupingKeySchemas.get(i).getColumnCategory()) {
+ if (TsTableColumnCategory.TAG == groupingKeySchemas.get(i).getColumnCategory()) {
String id =
(String) deviceEntries.get(currentDeviceIndex).getNthSegment(groupingKeyIndex[i] + 1);
if (id == null) {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TableScanOperator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TableScanOperator.java
index 1c9b7545d2f..6abf101ab60 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TableScanOperator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/operator/source/relational/TableScanOperator.java
@@ -213,7 +213,7 @@ public class TableScanOperator extends AbstractSeriesScanOperator {
Column[] valueColumns = new Column[columnsIndexArray.length];
for (int i = 0; i < columnsIndexArray.length; i++) {
switch (columnSchemas.get(i).getColumnCategory()) {
- case ID:
+ case TAG:
// +1 for skip the table name segment
String idColumnValue =
((String) currentDeviceEntry.getNthSegment(columnsIndexArray[i] + 1));
@@ -229,7 +229,7 @@ public class TableScanOperator extends AbstractSeriesScanOperator {
currentDeviceEntry.getAttributeColumnValues().get(columnsIndexArray[i]);
valueColumns[i] = getIdOrAttributeValueColumn(attributeColumnValue, positionCount);
break;
- case MEASUREMENT:
+ case FIELD:
valueColumns[i] = measurementDataBlock.getColumn(columnsIndexArray[i]);
break;
case TIME:
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileTableSchemaCache.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileTableSchemaCache.java
index 127b619f06c..eb78e0bf320 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileTableSchemaCache.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/load/LoadTsFileTableSchemaCache.java
@@ -276,7 +276,7 @@ public class LoadTsFileTableSchemaCache {
int idColumnIndex = 0;
for (int i = 0; i < fileSchema.getColumns().size(); i++) {
final ColumnSchema fileColumn = fileSchema.getColumns().get(i);
- if (fileColumn.getColumnCategory() == TsTableColumnCategory.ID) {
+ if (fileColumn.getColumnCategory() == TsTableColumnCategory.TAG) {
final int realIndex = realSchema.getIndexAmongIdColumns(fileColumn.getName());
if (realIndex != -1) {
idColumnMapping.put(idColumnIndex++, realIndex);
@@ -286,7 +286,7 @@ public class LoadTsFileTableSchemaCache {
"Id column %s in TsFile is not found in IoTDB table %s",
fileColumn.getName(), realSchema.getTableName()));
}
- } else if (fileColumn.getColumnCategory() == TsTableColumnCategory.MEASUREMENT) {
+ } else if (fileColumn.getColumnCategory() == TsTableColumnCategory.FIELD) {
final ColumnSchema realColumn =
realSchema.getColumn(fileColumn.getName(), fileColumn.getColumnCategory());
if (!fileColumn.getType().equals(realColumn.getType())) {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TableOperatorGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TableOperatorGenerator.java
index 3873973ca85..05e31ea4ed9 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TableOperatorGenerator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/TableOperatorGenerator.java
@@ -190,7 +190,7 @@ import java.util.stream.Collectors;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static java.util.Objects.requireNonNull;
-import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.MEASUREMENT;
+import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.FIELD;
import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TIME;
import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinAggregationFunction.getAggregationTypeByFuncName;
import static org.apache.iotdb.db.queryengine.common.DataNodeEndPoints.isSameNode;
@@ -336,14 +336,14 @@ public class TableOperatorGenerator extends PlanVisitor<Operator, LocalExecution
requireNonNull(columnSchemaMap.get(columnName), columnName + " is null");
switch (schema.getColumnCategory()) {
- case ID:
+ case TAG:
case ATTRIBUTE:
columnsIndexArray[idx++] =
requireNonNull(
idAndAttributeColumnsIndexMap.get(columnName), columnName + " is null");
columnSchemas.add(schema);
break;
- case MEASUREMENT:
+ case FIELD:
columnsIndexArray[idx++] = measurementColumnCount;
measurementColumnCount++;
measurementColumnNames.add(schema.getName());
@@ -365,8 +365,7 @@ public class TableOperatorGenerator extends PlanVisitor<Operator, LocalExecution
Set<Symbol> outputSet = new HashSet<>(outputColumnNames);
for (Map.Entry<Symbol, ColumnSchema> entry : node.getAssignments().entrySet()) {
- if (!outputSet.contains(entry.getKey())
- && entry.getValue().getColumnCategory() == MEASUREMENT) {
+ if (!outputSet.contains(entry.getKey()) && entry.getValue().getColumnCategory() == FIELD) {
measurementColumnCount++;
measurementColumnNames.add(entry.getValue().getName());
measurementSchemas.add(
@@ -1777,12 +1776,12 @@ public class TableOperatorGenerator extends PlanVisitor<Operator, LocalExecution
requireNonNull(node.getAssignments().get(symbol), symbol + " is null");
if (!aggColumnLayout.containsKey(symbol)) {
switch (schema.getColumnCategory()) {
- case ID:
+ case TAG:
case ATTRIBUTE:
aggColumnsIndexArray[channel] =
requireNonNull(node.getIdAndAttributeIndexMap().get(symbol), symbol + " is null");
break;
- case MEASUREMENT:
+ case FIELD:
aggColumnsIndexArray[channel] = measurementColumnCount;
measurementColumnCount++;
measurementColumnNames.add(schema.getName());
@@ -1810,7 +1809,7 @@ public class TableOperatorGenerator extends PlanVisitor<Operator, LocalExecution
for (Map.Entry<Symbol, ColumnSchema> entry : node.getAssignments().entrySet()) {
if (!aggColumnLayout.containsKey(entry.getKey())
- && entry.getValue().getColumnCategory() == MEASUREMENT) {
+ && entry.getValue().getColumnCategory() == FIELD) {
measurementColumnCount++;
measurementColumnNames.add(entry.getValue().getName());
measurementSchemas.add(
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertNode.java
index 9161d7ca26a..06ba52e78b3 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertNode.java
@@ -159,15 +159,13 @@ public abstract class InsertNode extends SearchNode {
return measurements.length;
}
return (int)
- Arrays.stream(columnCategories)
- .filter(col -> col == TsTableColumnCategory.MEASUREMENT)
- .count();
+ Arrays.stream(columnCategories).filter(col -> col == TsTableColumnCategory.FIELD).count();
}
public boolean isValidMeasurement(int i) {
return measurementSchemas != null
&& measurementSchemas[i] != null
- && (columnCategories == null || columnCategories[i] == TsTableColumnCategory.MEASUREMENT);
+ && (columnCategories == null || columnCategories[i] == TsTableColumnCategory.FIELD);
}
public void setMeasurements(String[] measurements) {
@@ -380,7 +378,7 @@ public abstract class InsertNode extends SearchNode {
if (columnCategories != null) {
idColumnIndices = new ArrayList<>();
for (int i = 0; i < columnCategories.length; i++) {
- if (columnCategories[i].equals(TsTableColumnCategory.ID)) {
+ if (columnCategories[i].equals(TsTableColumnCategory.TAG)) {
idColumnIndices.add(i);
}
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java
index 5ec2fda249a..53a67acb473 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/StatementAnalyzer.java
@@ -1580,7 +1580,7 @@ public class StatementAnalyzer {
Field.newUnqualified(
field.map(Identifier::getValue),
analysis.getType(expression),
- TsTableColumnCategory.MEASUREMENT,
+ TsTableColumnCategory.FIELD,
originTable,
originColumn,
column.getAlias().isPresent()); // TODO don't use analysis as a side-channel. Use
@@ -1975,7 +1975,7 @@ public class StatementAnalyzer {
.map(
valueType ->
Field.newUnqualified(
- Optional.empty(), valueType, TsTableColumnCategory.MEASUREMENT))
+ Optional.empty(), valueType, TsTableColumnCategory.FIELD))
.collect(toImmutableList());
return createAndAssignScope(node, scope, fields);
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java
index 627b168724d..1303584edc9 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/ConvertPredicateToFilterVisitor.java
@@ -424,7 +424,7 @@ public class ConvertPredicateToFilterVisitor
public boolean isMeasurementColumn(SymbolReference symbolReference) {
ColumnSchema schema = schemaMap.get(Symbol.from(symbolReference));
- return schema != null && schema.getColumnCategory() == TsTableColumnCategory.MEASUREMENT;
+ return schema != null && schema.getColumnCategory() == TsTableColumnCategory.FIELD;
}
}
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/CheckSchemaPredicateVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/CheckSchemaPredicateVisitor.java
index 9bcc6f869e3..7e6df862846 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/CheckSchemaPredicateVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/CheckSchemaPredicateVisitor.java
@@ -107,7 +107,7 @@ public class CheckSchemaPredicateVisitor
return true;
}
if (schema.getColumnCategory() == TsTableColumnCategory.TIME
- || schema.getColumnCategory() == TsTableColumnCategory.MEASUREMENT) {
+ || schema.getColumnCategory() == TsTableColumnCategory.FIELD) {
throw new SemanticException(
"The TIME/MEASUREMENT columns are currently not allowed in devices related operations");
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java
index 816a546b390..08f86321181 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/predicate/schema/ConvertSchemaPredicateToFilterVisitor.java
@@ -238,7 +238,7 @@ public class ConvertSchemaPredicateToFilterVisitor
.table
.getColumnSchema(columnName)
.getColumnCategory()
- .equals(TsTableColumnCategory.ID)
+ .equals(TsTableColumnCategory.TAG)
? new IdFilter(filter, context.idColumnIndexMap.get(columnName))
: new AttributeFilter(filter, columnName);
}
@@ -258,7 +258,7 @@ public class ConvertSchemaPredicateToFilterVisitor
List<TsTableColumnSchema> columnSchemaList = table.getColumnList();
int idIndex = 0;
for (TsTableColumnSchema columnSchema : columnSchemaList) {
- if (columnSchema.getColumnCategory().equals(TsTableColumnCategory.ID)) {
+ if (columnSchema.getColumnCategory().equals(TsTableColumnCategory.TAG)) {
map.put(columnSchema.getColumnName(), idIndex);
idIndex++;
}
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 f67fed6ca80..df7adc32ad4 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
@@ -191,7 +191,7 @@ public class TableSchema {
public List<ColumnSchema> getIdColumns() {
return columns.stream()
- .filter(c -> c.getColumnCategory() == TsTableColumnCategory.ID)
+ .filter(c -> c.getColumnCategory() == TsTableColumnCategory.TAG)
.collect(Collectors.toList());
}
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableDeviceSchemaFetcher.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableDeviceSchemaFetcher.java
index c6d6fc3a372..0f0774880c6 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableDeviceSchemaFetcher.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableDeviceSchemaFetcher.java
@@ -468,7 +468,7 @@ public class TableDeviceSchemaFetcher {
if (columnSchema == null) {
continue;
}
- if (columnSchema.getColumnCategory().equals(TsTableColumnCategory.ID)) {
+ if (columnSchema.getColumnCategory().equals(TsTableColumnCategory.TAG)) {
if (columns[j].isNull(rowIndex)) {
nodes[currentIndex] = null;
} else {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java
index 70850f6712b..da46cd24368 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableHeaderSchemaValidator.java
@@ -280,7 +280,7 @@ public class TableHeaderSchemaValidator {
public static TsTableColumnSchema generateColumnSchema(
final TsTableColumnCategory category, final String columnName, final TSDataType dataType) {
switch (category) {
- case ID:
+ case TAG:
if (!TSDataType.STRING.equals(dataType)) {
throw new SemanticException(
"DataType of ID Column should only be STRING, current is " + dataType);
@@ -295,7 +295,7 @@ public class TableHeaderSchemaValidator {
case TIME:
throw new SemanticException(
"Create table or add column statement shall not specify column category TIME");
- case MEASUREMENT:
+ case FIELD:
return new MeasurementColumnSchema(
columnName,
dataType,
@@ -341,7 +341,7 @@ public class TableHeaderSchemaValidator {
final List<TsTableColumnSchema> columnSchemaList = new ArrayList<>(inputColumnList.size());
for (final ColumnSchema inputColumn : inputColumnList) {
switch (inputColumn.getColumnCategory()) {
- case ID:
+ case TAG:
if (!inputColumn.getType().equals(StringType.STRING)) {
throw new SemanticException("Id column only support data type STRING.");
}
@@ -353,7 +353,7 @@ public class TableHeaderSchemaValidator {
}
columnSchemaList.add(new AttributeColumnSchema(inputColumn.getName(), TSDataType.STRING));
break;
- case MEASUREMENT:
+ case FIELD:
final TSDataType dataType = InternalTypeManager.getTSDataType(inputColumn.getType());
columnSchemaList.add(
new MeasurementColumnSchema(
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlanner.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlanner.java
index 6d97a4ed9d6..e825245f16e 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlanner.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlanner.java
@@ -191,7 +191,7 @@ public class RelationPlanner extends AstVisitor<RelationPlan, Void> {
symbol,
new ColumnSchema(
field.getName().orElse(null), field.getType(), field.isHidden(), category));
- if (category == TsTableColumnCategory.ID) {
+ if (category == TsTableColumnCategory.TAG) {
idAndAttributeIndexMap.put(symbol, idIndex++);
}
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableDistributedPlanGenerator.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableDistributedPlanGenerator.java
index dbab02fcf2c..470d616f44d 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableDistributedPlanGenerator.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/distribute/TableDistributedPlanGenerator.java
@@ -809,7 +809,7 @@ public class TableDistributedPlanGenerator
break;
}
if (deviceTableScanNode.getAssignments().get(symbol).getColumnCategory()
- == TsTableColumnCategory.ID) {
+ == TsTableColumnCategory.TAG) {
// segments[0] is always tableName
orderingRules.add(deviceEntry -> (String) deviceEntry.getNthSegment(idx + 1));
} else {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableScanNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableScanNode.java
index 2fd3764901e..8c6dcf33129 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableScanNode.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/node/TableScanNode.java
@@ -43,7 +43,7 @@ import java.util.Optional;
import java.util.stream.Collectors;
import static com.google.common.base.Preconditions.checkArgument;
-import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.MEASUREMENT;
+import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.FIELD;
import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TIME;
public abstract class TableScanNode extends SourceNode {
@@ -125,7 +125,7 @@ public abstract class TableScanNode extends SourceNode {
metadata.getTableSchema(session, qualifiedObjectName).orElse(null))
.getColumns()
.stream()
- .filter(columnSchema -> columnSchema.getColumnCategory() == TsTableColumnCategory.ID)
+ .filter(columnSchema -> columnSchema.getColumnCategory() == TsTableColumnCategory.TAG)
.map(columnSchema -> Symbol.of(columnSchema.getName()))
.collect(Collectors.toList());
}
@@ -133,8 +133,7 @@ public abstract class TableScanNode extends SourceNode {
public boolean isMeasurementOrTimeColumn(Symbol symbol) {
ColumnSchema columnSchema = assignments.get(symbol);
return columnSchema != null
- && (columnSchema.getColumnCategory() == MEASUREMENT
- || columnSchema.getColumnCategory() == TIME);
+ && (columnSchema.getColumnCategory() == FIELD || columnSchema.getColumnCategory() == TIME);
}
public boolean isTimeColumn(Symbol symbol) {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PushLimitOffsetIntoTableScan.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PushLimitOffsetIntoTableScan.java
index a91a34d4a0a..40995bc094b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PushLimitOffsetIntoTableScan.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PushLimitOffsetIntoTableScan.java
@@ -193,8 +193,7 @@ public class PushLimitOffsetIntoTableScan implements PlanOptimizer {
// order by measurement or expression, can not push down limit
if (!tableColumnSchema.containsKey(orderBy)
- || tableColumnSchema.get(orderBy).getColumnCategory()
- == TsTableColumnCategory.MEASUREMENT) {
+ || tableColumnSchema.get(orderBy).getColumnCategory() == TsTableColumnCategory.FIELD) {
context.enablePushDown = false;
return node;
}
@@ -204,7 +203,7 @@ public class PushLimitOffsetIntoTableScan implements PlanOptimizer {
boolean pushLimitToEachDevice = false;
for (Map.Entry<Symbol, ColumnSchema> entry : tableColumnSchema.entrySet()) {
- if (entry.getValue().getColumnCategory() == TsTableColumnCategory.ID
+ if (entry.getValue().getColumnCategory() == TsTableColumnCategory.TAG
&& !sortSymbols.contains(entry.getKey())) {
pushLimitToEachDevice = true;
break;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PushPredicateIntoTableScan.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PushPredicateIntoTableScan.java
index 420e682f723..fefdbf6f605 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PushPredicateIntoTableScan.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/PushPredicateIntoTableScan.java
@@ -79,7 +79,7 @@ import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.collect.ImmutableMap.toImmutableMap;
import static java.util.Objects.requireNonNull;
import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.ATTRIBUTE;
-import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.MEASUREMENT;
+import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.FIELD;
import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TIME;
import static org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet.PARTITION_FETCHER;
import static org.apache.iotdb.db.queryengine.metric.QueryPlanCostMetricSet.SCHEMA_FETCHER;
@@ -378,7 +378,7 @@ public class PushPredicateIntoTableScan implements PlanOptimizer {
if (TIME.equals(columnSchema.getColumnCategory())) {
measurementColumnNames.add(columnSymbol.getName());
timeColumnName = columnSymbol.getName();
- } else if (MEASUREMENT.equals(columnSchema.getColumnCategory())) {
+ } else if (FIELD.equals(columnSchema.getColumnCategory())) {
measurementColumnNames.add(columnSymbol.getName());
} else {
idOrAttributeColumnNames.add(columnSymbol.getName());
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformAggregationToStreamable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformAggregationToStreamable.java
index 3dd93067a88..340d9ebf592 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformAggregationToStreamable.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformAggregationToStreamable.java
@@ -38,7 +38,7 @@ import java.util.Set;
import java.util.stream.Collectors;
import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.ATTRIBUTE;
-import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.ID;
+import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TAG;
/**
* <b>Optimization phase:</b> Logical plan planning.
@@ -130,7 +130,7 @@ public class TransformAggregationToStreamable implements PlanOptimizer {
k -> {
ColumnSchema columnSchema = assignments.get(k);
if (columnSchema != null) {
- return columnSchema.getColumnCategory() == ID
+ return columnSchema.getColumnCategory() == TAG
|| columnSchema.getColumnCategory() == ATTRIBUTE;
}
return false;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformSortToStreamSort.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformSortToStreamSort.java
index cd5a5681e6b..c514a46746b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformSortToStreamSort.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/optimizations/TransformSortToStreamSort.java
@@ -96,8 +96,7 @@ public class TransformSortToStreamSort implements PlanOptimizer {
int streamSortIndex = -1;
for (Symbol orderBy : orderingScheme.getOrderBy()) {
if (!tableColumnSchema.containsKey(orderBy)
- || tableColumnSchema.get(orderBy).getColumnCategory()
- == TsTableColumnCategory.MEASUREMENT
+ || tableColumnSchema.get(orderBy).getColumnCategory() == TsTableColumnCategory.FIELD
|| tableColumnSchema.get(orderBy).getColumnCategory() == TsTableColumnCategory.TIME) {
break;
} else {
@@ -152,7 +151,7 @@ public class TransformSortToStreamSort implements PlanOptimizer {
OrderingScheme orderingScheme,
int streamSortIndex) {
for (Map.Entry<Symbol, ColumnSchema> entry : tableColumnSchema.entrySet()) {
- if (entry.getValue().getColumnCategory() == TsTableColumnCategory.ID
+ if (entry.getValue().getColumnCategory() == TsTableColumnCategory.TAG
&& !orderingScheme.getOrderings().containsKey(entry.getKey())) {
return false;
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AbstractQueryDeviceWithCache.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AbstractQueryDeviceWithCache.java
index 2dbf3c7aded..6617999b4b5 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AbstractQueryDeviceWithCache.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/AbstractQueryDeviceWithCache.java
@@ -77,7 +77,7 @@ public abstract class AbstractQueryDeviceWithCache extends AbstractTraverseDevic
return DataNodeTableCache.getInstance().getTable(database, tableName).getColumnList().stream()
.filter(
columnSchema ->
- columnSchema.getColumnCategory().equals(TsTableColumnCategory.ID)
+ columnSchema.getColumnCategory().equals(TsTableColumnCategory.TAG)
|| columnSchema.getColumnCategory().equals(TsTableColumnCategory.ATTRIBUTE))
.map(
columnSchema ->
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ColumnDefinition.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ColumnDefinition.java
index ad8d4685cf7..4782431165b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ColumnDefinition.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/ColumnDefinition.java
@@ -63,7 +63,7 @@ public final class ColumnDefinition extends Node {
this.name = requireNonNull(name, "name is null");
this.columnCategory = requireNonNull(columnCategory, "columnCategory is null");
if (Objects.isNull(type)) {
- if ((columnCategory == TsTableColumnCategory.ID
+ if ((columnCategory == TsTableColumnCategory.TAG
|| columnCategory == TsTableColumnCategory.ATTRIBUTE)) {
type = new GenericDataType(new Identifier("string"), new ArrayList<>());
} else if (columnCategory == TsTableColumnCategory.TIME) {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WrappedInsertStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WrappedInsertStatement.java
index 654c03a5220..bebb3c999f8 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WrappedInsertStatement.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/WrappedInsertStatement.java
@@ -171,7 +171,7 @@ public abstract class WrappedInsertStatement extends WrappedStatement
new SemanticException(
"Column " + incoming.getName() + " does not exists or fails to be " + "created",
TSStatusCode.COLUMN_NOT_EXISTS.getStatusCode());
- if (incoming.getColumnCategory() != TsTableColumnCategory.MEASUREMENT
+ if (incoming.getColumnCategory() != TsTableColumnCategory.FIELD
|| !IoTDBDescriptor.getInstance().getConfig().isEnablePartialInsert()) {
// non-measurement columns cannot be partially inserted
throw semanticException;
@@ -181,8 +181,7 @@ public abstract class WrappedInsertStatement extends WrappedStatement
return;
}
}
- if (incoming.getType() == null
- || incoming.getColumnCategory() != TsTableColumnCategory.MEASUREMENT) {
+ if (incoming.getType() == null || incoming.getColumnCategory() != TsTableColumnCategory.FIELD) {
// sql insertion does not provide type
// the type is inferred and can be inconsistent with the existing one
innerTreeStatement.setDataType(InternalTypeManager.getTSDataType(real.getType()), i);
@@ -194,7 +193,7 @@ public abstract class WrappedInsertStatement extends WrappedStatement
"Incompatible data type of column %s: %s/%s",
incoming.getName(), incoming.getType(), real.getType()),
TSStatusCode.DATA_TYPE_MISMATCH.getStatusCode());
- if (incoming.getColumnCategory() != TsTableColumnCategory.MEASUREMENT
+ if (incoming.getColumnCategory() != TsTableColumnCategory.FIELD
|| !IoTDBDescriptor.getInstance().getConfig().isEnablePartialInsert()) {
// non-measurement columns cannot be partially inserted
throw semanticException;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/AstBuilder.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/AstBuilder.java
index 8d0be07798a..8e083c27b3e 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/AstBuilder.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/sql/parser/AstBuilder.java
@@ -225,8 +225,8 @@ import static java.util.Objects.requireNonNull;
import static java.util.stream.Collectors.toList;
import static org.apache.iotdb.commons.schema.table.TsTable.TIME_COLUMN_NAME;
import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.ATTRIBUTE;
-import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.ID;
-import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.MEASUREMENT;
+import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.FIELD;
+import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TAG;
import static org.apache.iotdb.commons.schema.table.column.TsTableColumnCategory.TIME;
import static org.apache.iotdb.commons.udf.builtin.relational.TableBuiltinScalarFunction.DATE_BIN;
import static org.apache.iotdb.db.queryengine.plan.execution.config.TableConfigTaskVisitor.DATABASE_NOT_SPECIFIED;
@@ -2514,17 +2514,17 @@ public class AstBuilder extends RelationalSqlBaseVisitor<Node> {
private static TsTableColumnCategory getColumnCategory(Token category) {
if (category == null) {
- return MEASUREMENT;
+ return FIELD;
}
switch (category.getType()) {
case RelationalSqlLexer.ID:
- return ID;
+ return TAG;
case RelationalSqlLexer.ATTRIBUTE:
return ATTRIBUTE;
case RelationalSqlLexer.TIME:
return TIME;
case RelationalSqlLexer.MEASUREMENT:
- return MEASUREMENT;
+ return FIELD;
default:
throw new UnsupportedOperationException(
"Unsupported ColumnCategory: " + category.getText());
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertBaseStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertBaseStatement.java
index 2064c2309a2..e2e83826575 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertBaseStatement.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertBaseStatement.java
@@ -305,7 +305,7 @@ public abstract class InsertBaseStatement extends Statement {
if (idColumnIndices == null && columnCategories != null) {
idColumnIndices = new ArrayList<>();
for (int i = 0; i < columnCategories.length; i++) {
- if (columnCategories[i].equals(TsTableColumnCategory.ID)) {
+ if (columnCategories[i].equals(TsTableColumnCategory.TAG)) {
idColumnIndices.add(i);
}
}
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 5751c4beb82..7aab249022f 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
@@ -48,7 +48,7 @@ public class CompactionTableSchema extends TableSchema {
for (int i = 0; i < otherSchemaColumnCategories.size(); i++) {
ColumnCategory columnCategory = otherSchemaColumnCategories.get(i);
- if (columnCategory != ColumnCategory.ID) {
+ if (columnCategory != ColumnCategory.TAG) {
continue;
}
idColumnSchemasToMerge.add(otherSchemaColumnSchemas.get(i));
@@ -72,7 +72,7 @@ public class CompactionTableSchema extends TableSchema {
List<IMeasurementSchema> newIdColumns =
idColumnSchemasToMerge.subList(prefixLength, idColumnSchemasToMerge.size());
for (IMeasurementSchema newIdColumn : newIdColumns) {
- columnCategories.add(ColumnCategory.ID);
+ columnCategories.add(ColumnCategory.TAG);
measurementSchemas.add(newIdColumn);
}
}
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 fe7bd7ee8cb..7d89747d2f6 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
@@ -160,7 +160,7 @@ public class CompactionTsFileWriter extends TsFileIOWriter {
while (iterator.hasNext()) {
Map.Entry<String, TableSchema> entry = iterator.next();
List<ColumnCategory> columnTypes = entry.getValue().getColumnTypes();
- if (columnTypes.contains(ColumnCategory.MEASUREMENT)) {
+ if (columnTypes.contains(ColumnCategory.FIELD)) {
continue;
}
iterator.remove();
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractMemTable.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractMemTable.java
index 19de8cebc9c..027de99166b 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractMemTable.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/AbstractMemTable.java
@@ -248,7 +248,7 @@ public abstract class AbstractMemTable implements IMemTable {
if (measurements[i] == null
|| values[i] == null
|| insertRowNode.getColumnCategories() != null
- && insertRowNode.getColumnCategories()[i] != TsTableColumnCategory.MEASUREMENT) {
+ && insertRowNode.getColumnCategories()[i] != TsTableColumnCategory.FIELD) {
schemaList.add(null);
continue;
}
@@ -359,7 +359,7 @@ public abstract class AbstractMemTable implements IMemTable {
for (int i = 0; i < insertTabletNode.getMeasurementSchemas().length; i++) {
if (insertTabletNode.getColumns()[i] == null
|| (insertTabletNode.getColumnCategories() != null
- && insertTabletNode.getColumnCategories()[i] != TsTableColumnCategory.MEASUREMENT)) {
+ && insertTabletNode.getColumnCategories()[i] != TsTableColumnCategory.FIELD)) {
schemaList.add(null);
} else {
schemaList.add(insertTabletNode.getMeasurementSchemas()[i]);
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/TsFileProcessor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/TsFileProcessor.java
index f5c176521aa..3bef961ce79 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/TsFileProcessor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/memtable/TsFileProcessor.java
@@ -750,8 +750,7 @@ public class TsFileProcessor {
// Skip failed Measurements
if (dataTypes[i] == null
|| measurements[i] == null
- || (columnCategories != null
- && columnCategories[i] != TsTableColumnCategory.MEASUREMENT)) {
+ || (columnCategories != null && columnCategories[i] != TsTableColumnCategory.FIELD)) {
continue;
}
@@ -810,7 +809,7 @@ public class TsFileProcessor {
if (dataTypes[i] == null
|| measurements[i] == null
|| (insertRowNode.getColumnCategories() != null
- && insertRowNode.getColumnCategories()[i] != TsTableColumnCategory.MEASUREMENT)) {
+ && insertRowNode.getColumnCategories()[i] != TsTableColumnCategory.FIELD)) {
continue;
}
increasingMemTableInfo
@@ -834,7 +833,7 @@ public class TsFileProcessor {
if (dataTypes[i] == null
|| measurements[i] == null
|| (insertRowNode.getColumnCategories() != null
- && insertRowNode.getColumnCategories()[i] != TsTableColumnCategory.MEASUREMENT)) {
+ && insertRowNode.getColumnCategories()[i] != TsTableColumnCategory.FIELD)) {
continue;
}
@@ -873,7 +872,7 @@ public class TsFileProcessor {
if (dataTypes[i] == null
|| measurements[i] == null
|| (insertRowNode.getColumnCategories() != null
- && insertRowNode.getColumnCategories()[i] != TsTableColumnCategory.MEASUREMENT)) {
+ && insertRowNode.getColumnCategories()[i] != TsTableColumnCategory.FIELD)) {
continue;
}
// TEXT data mem size
@@ -1013,7 +1012,7 @@ public class TsFileProcessor {
measurementColumnNum = dataTypes.length;
} else {
for (TsTableColumnCategory columnCategory : columnCategories) {
- if (columnCategory == TsTableColumnCategory.MEASUREMENT) {
+ if (columnCategory == TsTableColumnCategory.FIELD) {
measurementColumnNum++;
}
}
@@ -1047,8 +1046,7 @@ public class TsFileProcessor {
if (dataType == null
|| column == null
|| measurement == null
- || (columnCategories != null
- && columnCategories[i] != TsTableColumnCategory.MEASUREMENT)) {
+ || (columnCategories != null && columnCategories[i] != TsTableColumnCategory.FIELD)) {
continue;
}
@@ -1086,8 +1084,7 @@ public class TsFileProcessor {
if (dataType == null
|| column == null
|| measurement == null
- || (columnCategories != null
- && columnCategories[i] != TsTableColumnCategory.MEASUREMENT)) {
+ || (columnCategories != null && columnCategories[i] != TsTableColumnCategory.FIELD)) {
continue;
}
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java
index 99f5577b366..36cd5616820 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/CommonUtils.java
@@ -379,7 +379,7 @@ public class CommonUtils {
break;
case TEXT:
case STRING:
- if (columnCategory.equals(TsTableColumnCategory.MEASUREMENT)) {
+ if (columnCategory.equals(TsTableColumnCategory.FIELD)) {
valueColumn = new Binary[rowNum];
} else {
valueColumn = new String[rowNum];
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/MemUtils.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/MemUtils.java
index 3f2e5327fec..843bcdb8937 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/MemUtils.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/MemUtils.java
@@ -89,7 +89,7 @@ public class MemUtils {
for (int i = 0; i < dataTypes.size(); i++) {
if (value[i] == null
|| dataTypes.get(i).isBinary()
- || columnCategories != null && columnCategories[i] != TsTableColumnCategory.MEASUREMENT) {
+ || columnCategories != null && columnCategories[i] != TsTableColumnCategory.FIELD) {
continue;
}
memSize += dataTypes.get(i).getDataTypeSize();
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/datastructure/AlignedTVList.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/datastructure/AlignedTVList.java
index 5d5a6e2b41c..b146b25c2ab 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/datastructure/AlignedTVList.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/datastructure/AlignedTVList.java
@@ -940,8 +940,7 @@ public abstract class AlignedTVList extends TVList {
for (int i = 0; i < types.length; i++) {
TSDataType type = types[i];
if (type != null
- && (columnCategories == null
- || columnCategories[i] == TsTableColumnCategory.MEASUREMENT)) {
+ && (columnCategories == null || columnCategories[i] == TsTableColumnCategory.FIELD)) {
size += (long) ARRAY_SIZE * (long) type.getDataTypeSize();
measurementColumnNum++;
}
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 968db18a065..9abe74153a0 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
@@ -215,9 +215,9 @@ public class StatementGeneratorTest {
List<TSDataType> dataTypes = Arrays.asList(TSDataType.TEXT, TSDataType.TEXT, TSDataType.DOUBLE);
List<Tablet.ColumnCategory> tsfileColumnCategories =
Arrays.asList(
- Tablet.ColumnCategory.ID,
+ Tablet.ColumnCategory.TAG,
Tablet.ColumnCategory.ATTRIBUTE,
- Tablet.ColumnCategory.MEASUREMENT);
+ Tablet.ColumnCategory.FIELD);
List<TsTableColumnCategory> columnCategories =
tsfileColumnCategories.stream()
.map(TsTableColumnCategory::fromTsFileColumnType)
@@ -251,7 +251,7 @@ public class StatementGeneratorTest {
ColumnSchema columnSchema =
new ColumnSchema(
- "s1", TypeFactory.getType(TSDataType.STRING), false, TsTableColumnCategory.ID);
+ "s1", TypeFactory.getType(TSDataType.STRING), false, TsTableColumnCategory.TAG);
insertTabletStatement.insertColumn(insertPos, columnSchema);
assertEquals(4, insertTabletStatement.getMeasurements().length);
assertEquals(columnSchema.getName(), insertTabletStatement.getMeasurements()[insertPos]);
@@ -287,10 +287,7 @@ public class StatementGeneratorTest {
insertPos = 5;
columnSchema =
new ColumnSchema(
- "s3",
- TypeFactory.getType(TSDataType.BOOLEAN),
- false,
- TsTableColumnCategory.MEASUREMENT);
+ "s3", TypeFactory.getType(TSDataType.BOOLEAN), false, TsTableColumnCategory.FIELD);
insertTabletStatement.insertColumn(insertPos, columnSchema);
assertEquals(6, insertTabletStatement.getMeasurements().length);
assertEquals(columnSchema.getName(), insertTabletStatement.getMeasurements()[insertPos]);
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowsNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowsNodeSerdeTest.java
index 0a8f3bc3939..1fcc77a3f01 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowsNodeSerdeTest.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertRowsNodeSerdeTest.java
@@ -170,11 +170,11 @@ public class InsertRowsNodeSerdeTest {
},
false,
new TsTableColumnCategory[] {
- TsTableColumnCategory.ID,
+ TsTableColumnCategory.TAG,
TsTableColumnCategory.ATTRIBUTE,
- TsTableColumnCategory.MEASUREMENT,
- TsTableColumnCategory.MEASUREMENT,
- TsTableColumnCategory.MEASUREMENT
+ TsTableColumnCategory.FIELD,
+ TsTableColumnCategory.FIELD,
+ TsTableColumnCategory.FIELD
}),
0);
@@ -189,9 +189,9 @@ public class InsertRowsNodeSerdeTest {
new Object[] {2.0, false},
false,
new TsTableColumnCategory[] {
- TsTableColumnCategory.ID,
+ TsTableColumnCategory.TAG,
TsTableColumnCategory.ATTRIBUTE,
- TsTableColumnCategory.MEASUREMENT
+ TsTableColumnCategory.FIELD
}),
1);
@@ -236,11 +236,11 @@ public class InsertRowsNodeSerdeTest {
},
false,
new TsTableColumnCategory[] {
- TsTableColumnCategory.ID,
+ TsTableColumnCategory.TAG,
TsTableColumnCategory.ATTRIBUTE,
- TsTableColumnCategory.MEASUREMENT,
- TsTableColumnCategory.MEASUREMENT,
- TsTableColumnCategory.MEASUREMENT
+ TsTableColumnCategory.FIELD,
+ TsTableColumnCategory.FIELD,
+ TsTableColumnCategory.FIELD
}),
0);
@@ -259,7 +259,7 @@ public class InsertRowsNodeSerdeTest {
new Object[] {2.0, false},
false,
new TsTableColumnCategory[] {
- TsTableColumnCategory.ID, TsTableColumnCategory.ATTRIBUTE
+ TsTableColumnCategory.TAG, TsTableColumnCategory.ATTRIBUTE
}),
1);
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertTabletNodeSerdeTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertTabletNodeSerdeTest.java
index 69587fbd9d7..420b7e7b73f 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertTabletNodeSerdeTest.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/InsertTabletNodeSerdeTest.java
@@ -311,11 +311,11 @@ public class InsertTabletNodeSerdeTest {
columns,
times.length,
new TsTableColumnCategory[] {
- TsTableColumnCategory.ID,
- TsTableColumnCategory.MEASUREMENT,
+ TsTableColumnCategory.TAG,
+ TsTableColumnCategory.FIELD,
TsTableColumnCategory.ATTRIBUTE,
- TsTableColumnCategory.ID,
- TsTableColumnCategory.MEASUREMENT
+ TsTableColumnCategory.TAG,
+ TsTableColumnCategory.FIELD
});
return tabletNode;
@@ -357,11 +357,11 @@ public class InsertTabletNodeSerdeTest {
columns,
times.length,
new TsTableColumnCategory[] {
- TsTableColumnCategory.ID,
- TsTableColumnCategory.MEASUREMENT,
+ TsTableColumnCategory.TAG,
+ TsTableColumnCategory.FIELD,
TsTableColumnCategory.ATTRIBUTE,
- TsTableColumnCategory.ID,
- TsTableColumnCategory.MEASUREMENT
+ TsTableColumnCategory.TAG,
+ TsTableColumnCategory.FIELD
});
insertTabletNode.setMeasurementSchemas(
new MeasurementSchema[] {
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/WritePlanNodeSplitTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/WritePlanNodeSplitTest.java
index e0d3354d2b1..807186c26da 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/WritePlanNodeSplitTest.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/planner/node/write/WritePlanNodeSplitTest.java
@@ -268,7 +268,7 @@ public class WritePlanNodeSplitTest {
new int[] {-20, -10, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100}
});
relationalInsertTabletNode.setColumnCategories(
- new TsTableColumnCategory[] {TsTableColumnCategory.ID, TsTableColumnCategory.MEASUREMENT});
+ new TsTableColumnCategory[] {TsTableColumnCategory.TAG, TsTableColumnCategory.FIELD});
relationalInsertTabletNode.setRowCount(12);
List<DataPartitionQueryParam> dataPartitionQueryParamList = new ArrayList<>();
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java
index a34129a73f8..0a665fbed04 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TSBSMetadata.java
@@ -146,13 +146,13 @@ public class TSBSMetadata implements Metadata {
columnSchemas.add(
ColumnSchema.builder(TIME_CM).setColumnCategory(TsTableColumnCategory.TIME).build());
columnSchemas.add(
- ColumnSchema.builder(NAME_CM).setColumnCategory(TsTableColumnCategory.ID).build());
+ ColumnSchema.builder(NAME_CM).setColumnCategory(TsTableColumnCategory.TAG).build());
columnSchemas.add(
- ColumnSchema.builder(FLEET_CM).setColumnCategory(TsTableColumnCategory.ID).build());
+ ColumnSchema.builder(FLEET_CM).setColumnCategory(TsTableColumnCategory.TAG).build());
columnSchemas.add(
- ColumnSchema.builder(DRIVER_CM).setColumnCategory(TsTableColumnCategory.ID).build());
+ ColumnSchema.builder(DRIVER_CM).setColumnCategory(TsTableColumnCategory.TAG).build());
columnSchemas.add(
- ColumnSchema.builder(MODEL_CM).setColumnCategory(TsTableColumnCategory.ID).build());
+ ColumnSchema.builder(MODEL_CM).setColumnCategory(TsTableColumnCategory.TAG).build());
columnSchemas.add(
ColumnSchema.builder(DEVICE_VERSION_CM)
.setColumnCategory(TsTableColumnCategory.ATTRIBUTE)
@@ -173,45 +173,35 @@ public class TSBSMetadata implements Metadata {
if (name.getObjectName().equalsIgnoreCase(TABLE_DIAGNOSTICS)) {
columnSchemas.add(
ColumnSchema.builder(FUEL_STATE_CM)
- .setColumnCategory(TsTableColumnCategory.MEASUREMENT)
+ .setColumnCategory(TsTableColumnCategory.FIELD)
.build());
columnSchemas.add(
ColumnSchema.builder(CURRENT_LOAD_CM)
- .setColumnCategory(TsTableColumnCategory.MEASUREMENT)
+ .setColumnCategory(TsTableColumnCategory.FIELD)
.build());
columnSchemas.add(
- ColumnSchema.builder(STATUS_CM)
- .setColumnCategory(TsTableColumnCategory.MEASUREMENT)
- .build());
+ ColumnSchema.builder(STATUS_CM).setColumnCategory(TsTableColumnCategory.FIELD).build());
return Optional.of(new TableSchema(TABLE_DIAGNOSTICS, columnSchemas));
} else if (name.getObjectName().equalsIgnoreCase(TABLE_READINGS)) {
columnSchemas.add(
- ColumnSchema.builder(LATITUDE_CM)
- .setColumnCategory(TsTableColumnCategory.MEASUREMENT)
- .build());
+ ColumnSchema.builder(LATITUDE_CM).setColumnCategory(TsTableColumnCategory.FIELD).build());
columnSchemas.add(
ColumnSchema.builder(LONGITUDE_CM)
- .setColumnCategory(TsTableColumnCategory.MEASUREMENT)
+ .setColumnCategory(TsTableColumnCategory.FIELD)
.build());
columnSchemas.add(
ColumnSchema.builder(ELEVATION_CM)
- .setColumnCategory(TsTableColumnCategory.MEASUREMENT)
+ .setColumnCategory(TsTableColumnCategory.FIELD)
.build());
columnSchemas.add(
- ColumnSchema.builder(VELOCITY_CM)
- .setColumnCategory(TsTableColumnCategory.MEASUREMENT)
- .build());
+ ColumnSchema.builder(VELOCITY_CM).setColumnCategory(TsTableColumnCategory.FIELD).build());
columnSchemas.add(
- ColumnSchema.builder(HEADING_CM)
- .setColumnCategory(TsTableColumnCategory.MEASUREMENT)
- .build());
+ ColumnSchema.builder(HEADING_CM).setColumnCategory(TsTableColumnCategory.FIELD).build());
columnSchemas.add(
- ColumnSchema.builder(GRADE_CM)
- .setColumnCategory(TsTableColumnCategory.MEASUREMENT)
- .build());
+ ColumnSchema.builder(GRADE_CM).setColumnCategory(TsTableColumnCategory.FIELD).build());
columnSchemas.add(
ColumnSchema.builder(FUEL_CONSUMPTION_CM)
- .setColumnCategory(TsTableColumnCategory.MEASUREMENT)
+ .setColumnCategory(TsTableColumnCategory.FIELD)
.build());
return Optional.of(new TableSchema(TABLE_READINGS, columnSchemas));
} else {
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMatadata.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMatadata.java
index a26aa698085..8d2d32cdfcd 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMatadata.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/analyzer/TestMatadata.java
@@ -146,24 +146,18 @@ public class TestMatadata implements Metadata {
final List<ColumnSchema> columnSchemas =
Arrays.asList(
ColumnSchema.builder(TIME_CM).setColumnCategory(TsTableColumnCategory.TIME).build(),
- ColumnSchema.builder(TAG1_CM).setColumnCategory(TsTableColumnCategory.ID).build(),
- ColumnSchema.builder(TAG2_CM).setColumnCategory(TsTableColumnCategory.ID).build(),
- ColumnSchema.builder(TAG3_CM).setColumnCategory(TsTableColumnCategory.ID).build(),
+ ColumnSchema.builder(TAG1_CM).setColumnCategory(TsTableColumnCategory.TAG).build(),
+ ColumnSchema.builder(TAG2_CM).setColumnCategory(TsTableColumnCategory.TAG).build(),
+ ColumnSchema.builder(TAG3_CM).setColumnCategory(TsTableColumnCategory.TAG).build(),
ColumnSchema.builder(ATTR1_CM)
.setColumnCategory(TsTableColumnCategory.ATTRIBUTE)
.build(),
ColumnSchema.builder(ATTR2_CM)
.setColumnCategory(TsTableColumnCategory.ATTRIBUTE)
.build(),
- ColumnSchema.builder(S1_CM)
- .setColumnCategory(TsTableColumnCategory.MEASUREMENT)
- .build(),
- ColumnSchema.builder(S2_CM)
- .setColumnCategory(TsTableColumnCategory.MEASUREMENT)
- .build(),
- ColumnSchema.builder(S3_CM)
- .setColumnCategory(TsTableColumnCategory.MEASUREMENT)
- .build());
+ ColumnSchema.builder(S1_CM).setColumnCategory(TsTableColumnCategory.FIELD).build(),
+ ColumnSchema.builder(S2_CM).setColumnCategory(TsTableColumnCategory.FIELD).build(),
+ ColumnSchema.builder(S3_CM).setColumnCategory(TsTableColumnCategory.FIELD).build());
return Optional.of(new TableSchema(TABLE1, columnSchemas));
}
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertTabletTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertTabletTest.java
index c5ffbf76d10..a78fabeb865 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertTabletTest.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/sql/ast/InsertTabletTest.java
@@ -47,9 +47,9 @@ public class InsertTabletTest {
new String[] {"deviceId_1", "deviceId_2", "attr1", "attr2", "measurement"});
innerStmt.setColumnCategories(
new TsTableColumnCategory[] {
- TsTableColumnCategory.ID, TsTableColumnCategory.ID,
+ TsTableColumnCategory.TAG, TsTableColumnCategory.TAG,
TsTableColumnCategory.ATTRIBUTE, TsTableColumnCategory.ATTRIBUTE,
- TsTableColumnCategory.MEASUREMENT
+ TsTableColumnCategory.FIELD
});
innerStmt.setDataTypes(
new TSDataType[] {
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/InsertStatementTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/InsertStatementTest.java
index af0c4f01f6f..098da8d321c 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/InsertStatementTest.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/InsertStatementTest.java
@@ -60,11 +60,11 @@ public class InsertStatementTest {
columnSchemas =
Arrays.asList(
new ColumnSchema(
- "id1", TypeFactory.getType(TSDataType.STRING), false, TsTableColumnCategory.ID),
+ "id1", TypeFactory.getType(TSDataType.STRING), false, TsTableColumnCategory.TAG),
new ColumnSchema(
- "id2", TypeFactory.getType(TSDataType.STRING), false, TsTableColumnCategory.ID),
+ "id2", TypeFactory.getType(TSDataType.STRING), false, TsTableColumnCategory.TAG),
new ColumnSchema(
- "id3", TypeFactory.getType(TSDataType.STRING), false, TsTableColumnCategory.ID),
+ "id3", TypeFactory.getType(TSDataType.STRING), false, TsTableColumnCategory.TAG),
new ColumnSchema(
"attr1",
TypeFactory.getType(TSDataType.STRING),
@@ -76,20 +76,11 @@ public class InsertStatementTest {
false,
TsTableColumnCategory.ATTRIBUTE),
new ColumnSchema(
- "m1",
- TypeFactory.getType(TSDataType.DOUBLE),
- false,
- TsTableColumnCategory.MEASUREMENT),
+ "m1", TypeFactory.getType(TSDataType.DOUBLE), false, TsTableColumnCategory.FIELD),
new ColumnSchema(
- "m2",
- TypeFactory.getType(TSDataType.DOUBLE),
- false,
- TsTableColumnCategory.MEASUREMENT),
+ "m2", TypeFactory.getType(TSDataType.DOUBLE), false, TsTableColumnCategory.FIELD),
new ColumnSchema(
- "m3",
- TypeFactory.getType(TSDataType.INT64),
- false,
- TsTableColumnCategory.MEASUREMENT));
+ "m3", TypeFactory.getType(TSDataType.INT64), false, TsTableColumnCategory.FIELD));
tableSchema = new TableSchema("table1", columnSchemas);
when(metadata.validateTableHeaderSchema(
any(String.class),
@@ -121,11 +112,11 @@ public class InsertStatementTest {
});
insertRowStatement.setColumnCategories(
new TsTableColumnCategory[] {
- TsTableColumnCategory.ID,
+ TsTableColumnCategory.TAG,
TsTableColumnCategory.ATTRIBUTE,
- TsTableColumnCategory.MEASUREMENT,
- TsTableColumnCategory.MEASUREMENT,
- TsTableColumnCategory.ID
+ TsTableColumnCategory.FIELD,
+ TsTableColumnCategory.FIELD,
+ TsTableColumnCategory.TAG
});
insertRowStatement.setValues(new String[] {"id2", "attr2", "m1", "m2", "id1"});
InsertRow insertRow = new InsertRow(insertRowStatement, queryContext);
@@ -150,11 +141,11 @@ public class InsertStatementTest {
insertRowStatement.getDataTypes());
assertArrayEquals(
new TsTableColumnCategory[] {
- TsTableColumnCategory.ID,
- TsTableColumnCategory.ID,
- TsTableColumnCategory.ID,
- TsTableColumnCategory.MEASUREMENT,
- TsTableColumnCategory.MEASUREMENT,
+ TsTableColumnCategory.TAG,
+ TsTableColumnCategory.TAG,
+ TsTableColumnCategory.TAG,
+ TsTableColumnCategory.FIELD,
+ TsTableColumnCategory.FIELD,
TsTableColumnCategory.ATTRIBUTE
},
insertRowStatement.getColumnCategories());
@@ -168,7 +159,7 @@ public class InsertStatementTest {
// category is ID in row but ATTRIBUTE in table
insertRowStatement.setMeasurements(new String[] {"id1"});
insertRowStatement.setDataTypes(new TSDataType[] {TSDataType.STRING});
- insertRowStatement.setColumnCategories(new TsTableColumnCategory[] {TsTableColumnCategory.ID});
+ insertRowStatement.setColumnCategories(new TsTableColumnCategory[] {TsTableColumnCategory.TAG});
insertRowStatement.setValues(new String[] {"id1"});
InsertRow insertRow = new InsertRow(insertRowStatement, null);
@@ -201,7 +192,7 @@ public class InsertStatementTest {
// id1 not in the table
insertRowStatement.setMeasurements(new String[] {"id1"});
insertRowStatement.setDataTypes(new TSDataType[] {TSDataType.STRING});
- insertRowStatement.setColumnCategories(new TsTableColumnCategory[] {TsTableColumnCategory.ID});
+ insertRowStatement.setColumnCategories(new TsTableColumnCategory[] {TsTableColumnCategory.TAG});
insertRowStatement.setValues(new String[] {"id1"});
InsertRow insertRow = new InsertRow(insertRowStatement, null);
@@ -209,7 +200,7 @@ public class InsertStatementTest {
columnSchemas =
Collections.singletonList(
new ColumnSchema(
- "id2", TypeFactory.getType(TSDataType.STRING), false, TsTableColumnCategory.ID));
+ "id2", TypeFactory.getType(TSDataType.STRING), false, TsTableColumnCategory.TAG));
tableSchema = new TableSchema("table1", columnSchemas);
when(metadata.validateTableHeaderSchema(
any(String.class),
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/StatementTestUtils.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/StatementTestUtils.java
index 9392f4163d4..c2906da17e6 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/StatementTestUtils.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/statement/StatementTestUtils.java
@@ -76,7 +76,7 @@ public class StatementTestUtils {
public static TsTableColumnCategory[] genColumnCategories() {
return new TsTableColumnCategory[] {
- TsTableColumnCategory.ID, TsTableColumnCategory.ATTRIBUTE, TsTableColumnCategory.MEASUREMENT
+ TsTableColumnCategory.TAG, TsTableColumnCategory.ATTRIBUTE, TsTableColumnCategory.FIELD
};
}
@@ -238,13 +238,13 @@ public class StatementTestUtils {
TsTableColumnCategory[] columnCategories = genColumnCategories();
for (int i = 0; i < columnCategories.length; i++) {
switch (columnCategories[i]) {
- case ID:
+ case TAG:
tsTable.addColumnSchema(new IdColumnSchema(measurements[i], dataTypes[i]));
break;
case ATTRIBUTE:
tsTable.addColumnSchema(new AttributeColumnSchema(measurements[i], dataTypes[i]));
break;
- case MEASUREMENT:
+ case FIELD:
default:
tsTable.addColumnSchema(
new MeasurementColumnSchema(
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 d1403ed8e8c..0e5fa29a41a 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
@@ -55,7 +55,7 @@ public class CompactionTableModelTestFileWriter extends CompactionTestFileWriter
measurementSchemas.add(
new MeasurementSchema(
idColumnName, TSDataType.TEXT, TSEncoding.PLAIN, CompressionType.UNCOMPRESSED));
- columnTypes.add(ColumnCategory.ID);
+ columnTypes.add(ColumnCategory.TAG);
}
tableSchema.merge(new TableSchema(tableName, measurementSchemas, columnTypes));
schema.registerTableSchema(tableSchema);
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 9c445916eab..9a627d27ea9 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
@@ -45,11 +45,11 @@ public class CompactionTableSchemaCollectorTest {
measurementSchemaList1.add(new MeasurementSchema("s1", TSDataType.INT32));
measurementSchemaList1.add(new MeasurementSchema("s2", TSDataType.INT32));
List<ColumnCategory> columnTypeList1 = new ArrayList<>();
- columnTypeList1.add(ColumnCategory.ID);
- columnTypeList1.add(ColumnCategory.ID);
- columnTypeList1.add(ColumnCategory.ID);
- columnTypeList1.add(ColumnCategory.MEASUREMENT);
- columnTypeList1.add(ColumnCategory.MEASUREMENT);
+ columnTypeList1.add(ColumnCategory.TAG);
+ columnTypeList1.add(ColumnCategory.TAG);
+ columnTypeList1.add(ColumnCategory.TAG);
+ columnTypeList1.add(ColumnCategory.FIELD);
+ columnTypeList1.add(ColumnCategory.FIELD);
TableSchema tableSchema1 = new TableSchema("t1", measurementSchemaList1, columnTypeList1);
compactionTableSchema.merge(tableSchema1);
Assert.assertEquals(3, compactionTableSchema.getColumnSchemas().size());
@@ -61,11 +61,11 @@ public class CompactionTableSchemaCollectorTest {
measurementSchemaList2.add(new MeasurementSchema("id3", TSDataType.STRING));
measurementSchemaList2.add(new MeasurementSchema("s2", TSDataType.INT32));
List<ColumnCategory> columnTypeList2 = new ArrayList<>();
- columnTypeList2.add(ColumnCategory.MEASUREMENT);
- columnTypeList2.add(ColumnCategory.ID);
- columnTypeList2.add(ColumnCategory.ID);
- columnTypeList2.add(ColumnCategory.ID);
- columnTypeList2.add(ColumnCategory.MEASUREMENT);
+ columnTypeList2.add(ColumnCategory.FIELD);
+ columnTypeList2.add(ColumnCategory.TAG);
+ columnTypeList2.add(ColumnCategory.TAG);
+ columnTypeList2.add(ColumnCategory.TAG);
+ columnTypeList2.add(ColumnCategory.FIELD);
TableSchema tableSchema2 = new TableSchema("t1", measurementSchemaList2, columnTypeList2);
compactionTableSchema.merge(tableSchema2);
Assert.assertEquals(3, compactionTableSchema.getColumnSchemas().size());
@@ -78,12 +78,12 @@ public class CompactionTableSchemaCollectorTest {
measurementSchemaList3.add(new MeasurementSchema("s2", TSDataType.INT32));
measurementSchemaList3.add(new MeasurementSchema("id4", TSDataType.STRING));
List<ColumnCategory> columnTypeList3 = new ArrayList<>();
- columnTypeList3.add(ColumnCategory.MEASUREMENT);
- columnTypeList3.add(ColumnCategory.ID);
- columnTypeList3.add(ColumnCategory.ID);
- columnTypeList3.add(ColumnCategory.ID);
- columnTypeList3.add(ColumnCategory.MEASUREMENT);
- columnTypeList3.add(ColumnCategory.ID);
+ columnTypeList3.add(ColumnCategory.FIELD);
+ columnTypeList3.add(ColumnCategory.TAG);
+ columnTypeList3.add(ColumnCategory.TAG);
+ columnTypeList3.add(ColumnCategory.TAG);
+ columnTypeList3.add(ColumnCategory.FIELD);
+ columnTypeList3.add(ColumnCategory.TAG);
TableSchema tableSchema3 = new TableSchema("t1", measurementSchemaList3, columnTypeList3);
compactionTableSchema.merge(tableSchema3);
@@ -97,12 +97,12 @@ public class CompactionTableSchemaCollectorTest {
measurementSchemaList4.add(new MeasurementSchema("s2", TSDataType.INT32));
measurementSchemaList4.add(new MeasurementSchema("id3", TSDataType.STRING));
List<ColumnCategory> columnTypeList4 = new ArrayList<>();
- columnTypeList4.add(ColumnCategory.MEASUREMENT);
- columnTypeList4.add(ColumnCategory.ID);
- columnTypeList4.add(ColumnCategory.ID);
- columnTypeList4.add(ColumnCategory.ID);
- columnTypeList4.add(ColumnCategory.MEASUREMENT);
- columnTypeList4.add(ColumnCategory.ID);
+ columnTypeList4.add(ColumnCategory.FIELD);
+ columnTypeList4.add(ColumnCategory.TAG);
+ columnTypeList4.add(ColumnCategory.TAG);
+ columnTypeList4.add(ColumnCategory.TAG);
+ columnTypeList4.add(ColumnCategory.FIELD);
+ columnTypeList4.add(ColumnCategory.TAG);
TableSchema tableSchema4 = new TableSchema("t1", measurementSchemaList4, columnTypeList4);
try {
compactionTableSchema.merge(tableSchema4);
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/io/WALFileTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/io/WALFileTest.java
index 95263f0ec2c..762c54ac8d9 100644
--- a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/io/WALFileTest.java
+++ b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/io/WALFileTest.java
@@ -419,7 +419,7 @@ public class WALFileTest {
columns,
times.length,
new TsTableColumnCategory[] {
- TsTableColumnCategory.ID, TsTableColumnCategory.MEASUREMENT,
+ TsTableColumnCategory.TAG, TsTableColumnCategory.FIELD,
});
}
diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/TsTable.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/TsTable.java
index 40a4bdbb2fe..905620f4613 100644
--- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/TsTable.java
+++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/TsTable.java
@@ -114,7 +114,7 @@ public class TsTable {
try {
final List<TsTableColumnSchema> idColumnSchemaList = new ArrayList<>();
for (final TsTableColumnSchema columnSchema : columnSchemaMap.values()) {
- if (TsTableColumnCategory.ID.equals(columnSchema.getColumnCategory())) {
+ if (TsTableColumnCategory.TAG.equals(columnSchema.getColumnCategory())) {
idColumnSchemaList.add(columnSchema);
}
}
@@ -128,10 +128,10 @@ public class TsTable {
readWriteLock.writeLock().lock();
try {
columnSchemaMap.put(columnSchema.getColumnName(), columnSchema);
- if (columnSchema.getColumnCategory().equals(TsTableColumnCategory.ID)) {
+ if (columnSchema.getColumnCategory().equals(TsTableColumnCategory.TAG)) {
idNums++;
idColumnIndexMap.put(columnSchema.getColumnName(), idNums - 1);
- } else if (columnSchema.getColumnCategory().equals(TsTableColumnCategory.MEASUREMENT)) {
+ } else if (columnSchema.getColumnCategory().equals(TsTableColumnCategory.FIELD)) {
measurementNum++;
}
} finally {
@@ -157,11 +157,11 @@ public class TsTable {
try {
final TsTableColumnSchema columnSchema = columnSchemaMap.get(columnName);
if (columnSchema != null
- && columnSchema.getColumnCategory().equals(TsTableColumnCategory.ID)) {
+ && columnSchema.getColumnCategory().equals(TsTableColumnCategory.TAG)) {
throw new SchemaExecutionException("Cannot remove an id column: " + columnName);
} else if (columnSchema != null) {
columnSchemaMap.remove(columnName);
- if (columnSchema.getColumnCategory().equals(TsTableColumnCategory.MEASUREMENT)) {
+ if (columnSchema.getColumnCategory().equals(TsTableColumnCategory.FIELD)) {
measurementNum--;
}
}
diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/column/IdColumnSchema.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/column/IdColumnSchema.java
index 87b2f3c77fe..28cd612c8e6 100644
--- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/column/IdColumnSchema.java
+++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/column/IdColumnSchema.java
@@ -39,7 +39,7 @@ public class IdColumnSchema extends TsTableColumnSchema {
@Override
public TsTableColumnCategory getColumnCategory() {
- return TsTableColumnCategory.ID;
+ return TsTableColumnCategory.TAG;
}
static IdColumnSchema deserialize(final InputStream stream) throws IOException {
diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/column/MeasurementColumnSchema.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/column/MeasurementColumnSchema.java
index b5ff592dff6..feea92e2034 100644
--- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/column/MeasurementColumnSchema.java
+++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/column/MeasurementColumnSchema.java
@@ -68,7 +68,7 @@ public class MeasurementColumnSchema extends TsTableColumnSchema {
@Override
public TsTableColumnCategory getColumnCategory() {
- return TsTableColumnCategory.MEASUREMENT;
+ return TsTableColumnCategory.FIELD;
}
public TSEncoding getEncoding() {
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 ae287e4f551..03069f14742 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
@@ -28,10 +28,10 @@ import java.io.OutputStream;
import java.nio.ByteBuffer;
public enum TsTableColumnCategory {
- ID((byte) 0),
+ TAG((byte) 0),
ATTRIBUTE((byte) 1),
TIME((byte) 2),
- MEASUREMENT((byte) 3);
+ FIELD((byte) 3);
private final byte category;
@@ -64,13 +64,13 @@ public enum TsTableColumnCategory {
public static TsTableColumnCategory deserialize(byte category) {
switch (category) {
case 0:
- return ID;
+ return TAG;
case 1:
return ATTRIBUTE;
case 2:
return TIME;
case 3:
- return MEASUREMENT;
+ return FIELD;
default:
throw new IllegalArgumentException();
}
@@ -78,12 +78,12 @@ public enum TsTableColumnCategory {
public ColumnCategory toTsFileColumnType() {
switch (this) {
- case ID:
- return ColumnCategory.ID;
+ case TAG:
+ return ColumnCategory.TAG;
case ATTRIBUTE:
return ColumnCategory.ATTRIBUTE;
- case MEASUREMENT:
- return ColumnCategory.MEASUREMENT;
+ case FIELD:
+ return ColumnCategory.FIELD;
default:
throw new IllegalArgumentException("Unsupported column type in TsFile: " + this);
}
@@ -91,10 +91,10 @@ public enum TsTableColumnCategory {
public static TsTableColumnCategory fromTsFileColumnType(ColumnCategory columnType) {
switch (columnType) {
- case MEASUREMENT:
- return MEASUREMENT;
- case ID:
- return ID;
+ case FIELD:
+ return FIELD;
+ case TAG:
+ return TAG;
case ATTRIBUTE:
return ATTRIBUTE;
default:
diff --git a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/column/TsTableColumnSchemaUtil.java b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/column/TsTableColumnSchemaUtil.java
index c227f96d705..026d61828eb 100644
--- a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/column/TsTableColumnSchemaUtil.java
+++ b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/column/TsTableColumnSchemaUtil.java
@@ -48,13 +48,13 @@ public class TsTableColumnSchemaUtil {
private static TsTableColumnSchema deserialize(TsTableColumnCategory category, InputStream stream)
throws IOException {
switch (category) {
- case ID:
+ case TAG:
return IdColumnSchema.deserialize(stream);
case ATTRIBUTE:
return AttributeColumnSchema.deserialize(stream);
case TIME:
return TimeColumnSchema.deserialize(stream);
- case MEASUREMENT:
+ case FIELD:
return MeasurementColumnSchema.deserialize(stream);
default:
throw new IllegalArgumentException();
@@ -68,13 +68,13 @@ public class TsTableColumnSchemaUtil {
private static TsTableColumnSchema deserialize(
TsTableColumnCategory category, ByteBuffer buffer) {
switch (category) {
- case ID:
+ case TAG:
return IdColumnSchema.deserialize(buffer);
case ATTRIBUTE:
return AttributeColumnSchema.deserialize(buffer);
case TIME:
return TimeColumnSchema.deserialize(buffer);
- case MEASUREMENT:
+ case FIELD:
return MeasurementColumnSchema.deserialize(buffer);
default:
throw new IllegalArgumentException();
diff --git a/pom.xml b/pom.xml
index 60498a1ee01..430ade43f21 100644
--- a/pom.xml
+++ b/pom.xml
@@ -167,7 +167,7 @@
<thrift.version>0.14.1</thrift.version>
<xz.version>1.9</xz.version>
<zstd-jni.version>1.5.6-3</zstd-jni.version>
- <tsfile.version>1.2.0-241211-SNAPSHOT</tsfile.version>
+ <tsfile.version>1.2.0-241224-SNAPSHOT</tsfile.version>
</properties>
<!--
if we claim dependencies in dependencyManagement, then we do not claim