Move model annotations to tsfile (#14358)

shuwenwei · web-flow · commit 839e2221dce2 · 2024-12-12T16:08:34.000+08:00
* move model annotations to tsfile

* recover some change

* update tsfile version

* ignore IoTDBEncryptionValueQueryIT
diff --git a/example/session/src/main/java/org/apache/iotdb/TableModelSessionExample.java b/example/session/src/main/java/org/apache/iotdb/TableModelSessionExample.java
@@ -77,7 +77,7 @@ public static void main(String[] args) {
       }
 
       // insert table data by tablet
-      List<String> measurementNameList =
+      List<String> columnNameList =
           Arrays.asList("region_id", "plant_id", "device_id", "model", "temperature", "humidity");
       List<TSDataType> dataTypeList =
           Arrays.asList(
@@ -96,7 +96,7 @@ public static void main(String[] args) {
                   Tablet.ColumnCategory.ATTRIBUTE,
                   Tablet.ColumnCategory.MEASUREMENT,
                   Tablet.ColumnCategory.MEASUREMENT));
-      Tablet tablet = new Tablet("test1", measurementNameList, dataTypeList, columnTypeList, 100);
+      Tablet tablet = new Tablet("test1", columnNameList, dataTypeList, columnTypeList, 100);
       for (long timestamp = 0; timestamp < 100; timestamp++) {
         int rowIndex = tablet.getRowSize();
         tablet.addTimestamp(rowIndex, timestamp);
diff --git a/example/session/src/main/java/org/apache/iotdb/TableModelSessionPoolExample.java b/example/session/src/main/java/org/apache/iotdb/TableModelSessionPoolExample.java
@@ -95,7 +95,7 @@ public static void main(String[] args) {
       }
 
       // insert table data by tablet
-      List<String> measurementNameList =
+      List<String> columnNameList =
           Arrays.asList("region_id", "plant_id", "device_id", "model", "temperature", "humidity");
       List<TSDataType> dataTypeList =
           Arrays.asList(
@@ -114,7 +114,7 @@ public static void main(String[] args) {
                   ColumnCategory.ATTRIBUTE,
                   ColumnCategory.MEASUREMENT,
                   ColumnCategory.MEASUREMENT));
-      Tablet tablet = new Tablet("test1", measurementNameList, dataTypeList, columnTypeList, 100);
+      Tablet tablet = new Tablet("test1", columnNameList, dataTypeList, columnTypeList, 100);
       for (long timestamp = 0; timestamp < 100; timestamp++) {
         int rowIndex = tablet.getRowSize();
         tablet.addTimestamp(rowIndex, timestamp);
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/query/IoTDBEncryptionValueQueryIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/query/IoTDBEncryptionValueQueryIT.java
@@ -26,6 +26,7 @@
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
@@ -45,6 +46,7 @@
 
 @RunWith(IoTDBTestRunner.class)
 @Category({LocalStandaloneIT.class, ClusterIT.class})
+@Ignore
 public class IoTDBEncryptionValueQueryIT {
   private static String[] sqls =
       new String[] {
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
@@ -780,8 +780,7 @@ private Tablet generateTabletAndMeasurementSchema(
           break;
       }
     }
-    return new Tablet(
-        deviceId, measurementSchemas, columnTypes, timestamp, objects, bitMaps, generateDataSize);
+    return new Tablet(deviceId, measurementSchemas, timestamp, objects, bitMaps, generateDataSize);
   }
 
   private List<Pair<MeasurementSchema, MeasurementSchema>> generateMeasurementSchemas() {
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
@@ -37,9 +37,9 @@
 import org.apache.iotdb.db.queryengine.plan.relational.type.InternalTypeManager;
 import org.apache.iotdb.db.queryengine.plan.statement.Statement;
 import org.apache.iotdb.db.utils.CommonUtils;
-import org.apache.iotdb.db.utils.annotations.TableModel;
 import org.apache.iotdb.rpc.TSStatusCode;
 
+import org.apache.tsfile.annotations.TableModel;
 import org.apache.tsfile.enums.TSDataType;
 import org.apache.tsfile.utils.Pair;
 import org.apache.tsfile.write.schema.MeasurementSchema;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertMultiTabletsStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertMultiTabletsStatement.java
@@ -25,8 +25,8 @@
 import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaValidation;
 import org.apache.iotdb.db.queryengine.plan.statement.StatementType;
 import org.apache.iotdb.db.queryengine.plan.statement.StatementVisitor;
-import org.apache.iotdb.db.utils.annotations.TableModel;
 
+import org.apache.tsfile.annotations.TableModel;
 import org.apache.tsfile.enums.TSDataType;
 import org.apache.tsfile.exception.NotImplementedException;
 
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowStatement.java
@@ -39,9 +39,9 @@
 import org.apache.iotdb.db.queryengine.plan.statement.StatementVisitor;
 import org.apache.iotdb.db.utils.CommonUtils;
 import org.apache.iotdb.db.utils.TypeInferenceUtils;
-import org.apache.iotdb.db.utils.annotations.TableModel;
 import org.apache.iotdb.rpc.TSStatusCode;
 
+import org.apache.tsfile.annotations.TableModel;
 import org.apache.tsfile.enums.TSDataType;
 import org.apache.tsfile.file.metadata.IDeviceID;
 import org.apache.tsfile.file.metadata.IDeviceID.Factory;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsOfOneDeviceStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsOfOneDeviceStatement.java
@@ -28,8 +28,8 @@
 import org.apache.iotdb.db.queryengine.plan.analyze.schema.ISchemaValidation;
 import org.apache.iotdb.db.queryengine.plan.statement.StatementType;
 import org.apache.iotdb.db.queryengine.plan.statement.StatementVisitor;
-import org.apache.iotdb.db.utils.annotations.TableModel;
 
+import org.apache.tsfile.annotations.TableModel;
 import org.apache.tsfile.enums.TSDataType;
 import org.apache.tsfile.exception.NotImplementedException;
 
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsStatement.java
@@ -28,8 +28,8 @@
 import org.apache.iotdb.db.queryengine.plan.relational.sql.ast.Statement;
 import org.apache.iotdb.db.queryengine.plan.statement.StatementType;
 import org.apache.iotdb.db.queryengine.plan.statement.StatementVisitor;
-import org.apache.iotdb.db.utils.annotations.TableModel;
 
+import org.apache.tsfile.annotations.TableModel;
 import org.apache.tsfile.enums.TSDataType;
 import org.apache.tsfile.exception.NotImplementedException;
 
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/LoadTsFileStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/LoadTsFileStatement.java
@@ -29,9 +29,9 @@
 import org.apache.iotdb.db.queryengine.plan.statement.StatementVisitor;
 import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource;
 import org.apache.iotdb.db.storageengine.load.config.LoadTsFileConfigurator;
-import org.apache.iotdb.db.utils.annotations.TableModel;
 import org.apache.iotdb.rpc.TSStatusCode;
 
+import org.apache.tsfile.annotations.TableModel;
 import org.apache.tsfile.common.constant.TsFileConstant;
 
 import java.io.File;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/pipe/PipeEnrichedStatement.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/statement/pipe/PipeEnrichedStatement.java
@@ -26,7 +26,8 @@
 import org.apache.iotdb.db.queryengine.plan.statement.Statement;
 import org.apache.iotdb.db.queryengine.plan.statement.StatementType;
 import org.apache.iotdb.db.queryengine.plan.statement.StatementVisitor;
-import org.apache.iotdb.db.utils.annotations.TableModel;
+
+import org.apache.tsfile.annotations.TableModel;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/ModEntry.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/ModEntry.java
@@ -19,10 +19,10 @@
 package org.apache.iotdb.db.storageengine.dataregion.modification;
 
 import org.apache.iotdb.commons.path.PartialPath;
-import org.apache.iotdb.db.utils.annotations.TreeModel;
 import org.apache.iotdb.db.utils.io.BufferSerializable;
 import org.apache.iotdb.db.utils.io.StreamSerializable;
 
+import org.apache.tsfile.annotations.TreeModel;
 import org.apache.tsfile.file.metadata.IDeviceID;
 import org.apache.tsfile.read.common.TimeRange;
 import org.apache.tsfile.utils.ReadWriteIOUtils;
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/annotations/TableModel.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/annotations/TableModel.java
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/annotations/TreeModel.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/annotations/TreeModel.java
diff --git a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/connector/PipeDataNodeThriftRequestTest.java b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/connector/PipeDataNodeThriftRequestTest.java
@@ -63,7 +63,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.stream.Collectors;
 
 public class PipeDataNodeThriftRequestTest {
 
@@ -266,26 +265,7 @@ public void testPipeTransferTabletReqV2() {
       schemaList.add(new MeasurementSchema("s8", TSDataType.DATE));
       schemaList.add(new MeasurementSchema("s9", TSDataType.BLOB));
       schemaList.add(new MeasurementSchema("s10", TSDataType.STRING));
-      List<Tablet.ColumnCategory> columnTypes = new ArrayList<>();
-      columnTypes.add(Tablet.ColumnCategory.MEASUREMENT);
-      columnTypes.add(Tablet.ColumnCategory.MEASUREMENT);
-      columnTypes.add(Tablet.ColumnCategory.MEASUREMENT);
-      columnTypes.add(Tablet.ColumnCategory.MEASUREMENT);
-      columnTypes.add(Tablet.ColumnCategory.MEASUREMENT);
-      columnTypes.add(Tablet.ColumnCategory.MEASUREMENT);
-      columnTypes.add(Tablet.ColumnCategory.MEASUREMENT);
-      columnTypes.add(Tablet.ColumnCategory.MEASUREMENT);
-      columnTypes.add(Tablet.ColumnCategory.MEASUREMENT);
-      columnTypes.add(Tablet.ColumnCategory.MEASUREMENT);
-      final Tablet t =
-          new Tablet(
-              "root.sg.d",
-              schemaList.stream()
-                  .map(IMeasurementSchema::getMeasurementName)
-                  .collect(Collectors.toList()),
-              IMeasurementSchema.getDataTypeList(schemaList),
-              columnTypes,
-              1024);
+      final Tablet t = new Tablet("root.sg.d", schemaList, 1024);
       t.addTimestamp(0, 2000);
       t.addTimestamp(1, 1000);
       t.addValue("s1", 0, 2);
diff --git a/pom.xml b/pom.xml
@@ -166,7 +166,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-241129-SNAPSHOT</tsfile.version>
+        <tsfile.version>1.2.0-241211-SNAPSHOT</tsfile.version>
     </properties>
     <!--
     if we claim dependencies in dependencyManagement, then we do not claim

Original file line number	Diff line number	Diff line change
`@@ -780,8 +780,7 @@ private Tablet generateTabletAndMeasurementSchema(`
`780`	`780`	`break;`
`781`	`781`	`}`
`782`	`782`	`}`
`783`		`- return new Tablet(`
`784`		`- deviceId, measurementSchemas, columnTypes, timestamp, objects, bitMaps, generateDataSize);`
	`783`	`+ return new Tablet(deviceId, measurementSchemas, timestamp, objects, bitMaps, generateDataSize);`
`785`	`784`	`}`
`786`	`785`
`787`	`786`	`private List<Pair<MeasurementSchema, MeasurementSchema>> generateMeasurementSchemas() {`