Skip to content

Move model annotations to tsfile #14358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jt2594838 merged 4 commits into from
Dec 12, 2024
Merged

Move model annotations to tsfile #14358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ed77afb
move model annotations to tsfile
shuwenwei Dec 9, 2024
8de32bd
recover some change
shuwenwei Dec 9, 2024
c1650f5
update tsfile version
shuwenwei Dec 11, 2024
618262b
ignore IoTDBEncryptionValueQueryIT
shuwenwei Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions example/session/src/main/java/org/apache/iotdb/TableModelSessionExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions example/session/src/main/java/org/apache/iotdb/TableModelSessionPoolExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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);
Expand Down
2 changes: 2 additions & 0 deletions integration-test/src/test/java/org/apache/iotdb/db/it/query/IoTDBEncryptionValueQueryIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -45,6 +46,7 @@

@RunWith(IoTDBTestRunner.class)
@Category({LocalStandaloneIT.class, ClusterIT.class})
@Ignore
public class IoTDBEncryptionValueQueryIT {
private static String[] sqls =
new String[] {
Expand Down
3 changes: 1 addition & 2 deletions ...test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeTypeConversionISessionIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertBaseStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertMultiTabletsStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...a/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsOfOneDeviceStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/InsertRowsStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/org/apache/iotdb/db/queryengine/plan/statement/crud/LoadTsFileStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion .../main/java/org/apache/iotdb/db/queryengine/plan/statement/pipe/PipeEnrichedStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...ode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/modification/ModEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
33 changes: 0 additions & 33 deletions iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/annotations/TableModel.java
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/annotations/TreeModel.java
View file
Open in desktop

This file was deleted.

22 changes: 1 addition & 21 deletions ...anode/src/test/java/org/apache/iotdb/db/pipe/connector/PipeDataNodeThriftRequestTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;

public class PipeDataNodeThriftRequestTest {

Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading