From 609b3f69369c0fbf8c2b3cbc3f3e11fd68d6cc7a Mon Sep 17 00:00:00 2001 From: MarcosZyk <1534661820@qq.com> Date: Tue, 25 Apr 2023 09:13:35 +0800 Subject: [PATCH 1/2] refactor schema IT --- .../db/it/schema/IoTDBAutoCreateSchemaIT.java | 1 + .../IoTDBCreateAlignedTimeseriesIT.java | 1 + .../it/schema/IoTDBCreateStorageGroupIT.java | 1 + .../db/it/schema/IoTDBCreateTimeseriesIT.java | 1 + .../it/schema/IoTDBDeactivateTemplateIT.java | 1 + .../IoTDBDeleteAlignedTimeseriesIT.java | 1 + .../it/schema/IoTDBDeleteStorageGroupIT.java | 1 + .../db/it/schema/IoTDBDeleteTimeseriesIT.java | 1 + .../db/it/schema/IoTDBExtendTemplateIT.java | 1 + .../db/it/schema/IoTDBMetadataFetchIT.java | 1 + .../db/it/schema/IoTDBSchemaTemplateIT.java | 66 +------------------ .../schema/IoTDBSortedShowTimeseriesIT.java | 1 + .../iotdb/db/it/schema/IoTDBTagAlterIT.java | 1 + .../apache/iotdb/db/it/schema/IoTDBTagIT.java | 1 + .../it/IoTDBSessionSchemaTemplateIT.java | 10 ++- .../it/schema => util}/AbstractSchemaIT.java | 4 +- 16 files changed, 24 insertions(+), 69 deletions(-) rename integration-test/src/test/java/org/apache/iotdb/{db/it/schema => util}/AbstractSchemaIT.java (98%) diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBAutoCreateSchemaIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBAutoCreateSchemaIT.java index 5fea0be42d05d..d4367ccdb7156 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBAutoCreateSchemaIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBAutoCreateSchemaIT.java @@ -24,6 +24,7 @@ import org.apache.iotdb.itbase.category.ClusterIT; import org.apache.iotdb.itbase.category.LocalStandaloneIT; import org.apache.iotdb.itbase.constant.TestConstant; +import org.apache.iotdb.util.AbstractSchemaIT; import org.junit.After; import org.junit.Assert; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBCreateAlignedTimeseriesIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBCreateAlignedTimeseriesIT.java index 09449e49d41a2..9ce141efcf7ee 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBCreateAlignedTimeseriesIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBCreateAlignedTimeseriesIT.java @@ -22,6 +22,7 @@ import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.itbase.category.ClusterIT; import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.util.AbstractSchemaIT; import org.junit.After; import org.junit.Assert; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBCreateStorageGroupIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBCreateStorageGroupIT.java index 9687436e2483f..f0db152d8ab87 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBCreateStorageGroupIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBCreateStorageGroupIT.java @@ -24,6 +24,7 @@ import org.apache.iotdb.itbase.category.ClusterIT; import org.apache.iotdb.itbase.category.LocalStandaloneIT; import org.apache.iotdb.rpc.TSStatusCode; +import org.apache.iotdb.util.AbstractSchemaIT; import org.junit.After; import org.junit.Assert; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBCreateTimeseriesIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBCreateTimeseriesIT.java index 2c90c0d315901..374b6d780defb 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBCreateTimeseriesIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBCreateTimeseriesIT.java @@ -23,6 +23,7 @@ import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.itbase.category.ClusterIT; import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.util.AbstractSchemaIT; import org.junit.After; import org.junit.Assert; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBDeactivateTemplateIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBDeactivateTemplateIT.java index 590a349a99ab9..e31ede5eda5d4 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBDeactivateTemplateIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBDeactivateTemplateIT.java @@ -23,6 +23,7 @@ import org.apache.iotdb.itbase.category.ClusterIT; import org.apache.iotdb.itbase.category.LocalStandaloneIT; import org.apache.iotdb.rpc.TSStatusCode; +import org.apache.iotdb.util.AbstractSchemaIT; import org.junit.After; import org.junit.Assert; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBDeleteAlignedTimeseriesIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBDeleteAlignedTimeseriesIT.java index 9f81b6476f50c..8947080e36c1e 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBDeleteAlignedTimeseriesIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBDeleteAlignedTimeseriesIT.java @@ -22,6 +22,7 @@ import org.apache.iotdb.db.mpp.common.header.ColumnHeaderConstant; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.itbase.category.ClusterIT; +import org.apache.iotdb.util.AbstractSchemaIT; import org.junit.After; import org.junit.Assert; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBDeleteStorageGroupIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBDeleteStorageGroupIT.java index 8063023328b74..51528e379d9fd 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBDeleteStorageGroupIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBDeleteStorageGroupIT.java @@ -21,6 +21,7 @@ import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.itbase.category.ClusterIT; import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.util.AbstractSchemaIT; import org.junit.After; import org.junit.Before; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBDeleteTimeseriesIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBDeleteTimeseriesIT.java index 08fa2f672f152..457d7f8b860cd 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBDeleteTimeseriesIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBDeleteTimeseriesIT.java @@ -23,6 +23,7 @@ import org.apache.iotdb.itbase.category.ClusterIT; import org.apache.iotdb.itbase.category.LocalStandaloneIT; import org.apache.iotdb.rpc.TSStatusCode; +import org.apache.iotdb.util.AbstractSchemaIT; import org.junit.After; import org.junit.Assert; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBExtendTemplateIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBExtendTemplateIT.java index 011a7082de858..1816c17adcf1a 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBExtendTemplateIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBExtendTemplateIT.java @@ -22,6 +22,7 @@ import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.itbase.category.ClusterIT; import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.util.AbstractSchemaIT; import org.junit.After; import org.junit.Assert; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBMetadataFetchIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBMetadataFetchIT.java index 2a669c298b1ee..d51e0e4fe5bf7 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBMetadataFetchIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBMetadataFetchIT.java @@ -21,6 +21,7 @@ import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.itbase.category.ClusterIT; import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.util.AbstractSchemaIT; import org.junit.After; import org.junit.Assert; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBSchemaTemplateIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBSchemaTemplateIT.java index 117e1fa417cb5..670e219899038 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBSchemaTemplateIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBSchemaTemplateIT.java @@ -19,20 +19,11 @@ package org.apache.iotdb.db.it.schema; import org.apache.iotdb.db.mpp.common.header.ColumnHeaderConstant; -import org.apache.iotdb.isession.ISession; -import org.apache.iotdb.isession.SessionDataSet; -import org.apache.iotdb.isession.template.Template; -import org.apache.iotdb.isession.template.TemplateNode; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.itbase.category.ClusterIT; import org.apache.iotdb.itbase.category.LocalStandaloneIT; -import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.rpc.TSStatusCode; -import org.apache.iotdb.session.template.MeasurementNode; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; -import org.apache.iotdb.tsfile.read.common.RowRecord; +import org.apache.iotdb.util.AbstractSchemaIT; import org.junit.After; import org.junit.Assert; @@ -44,11 +35,9 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; -import java.util.List; import java.util.Set; import static org.junit.Assert.fail; @@ -667,57 +656,4 @@ public void testTemplateSetAndTimeSeriesExistenceCheck() throws SQLException { statement.execute("CREATE TIMESERIES root.sg1.d2.s INT32"); } } - - @Test - public void testInsertRecordsWithTemplate() throws Exception { - ISession session = EnvFactory.getEnv().getSessionConnection(); - - session.createDatabase("root.db"); - - Template temp1 = getTemplate("template1"); - session.createSchemaTemplate(temp1); - - session.setSchemaTemplate("template1", "root.db.v1"); - - List devices = new ArrayList<>(); - List> measurementsList = new ArrayList<>(); - List measurements = Arrays.asList(new String[] {"x", "y"}); - List times = new ArrayList<>(); - List> values = new ArrayList<>(); - List value = Arrays.asList(new String[] {"1.23", "2.34"}); - for (int i = 0; i < 101; i++) { - devices.add("root.db.v1.d" + i); - measurementsList.add(measurements); - times.add(12345L + i); - values.add(value); - } - - session.insertRecords(devices, times, measurementsList, values); - SessionDataSet dataSet; - RowRecord row; - for (int i = 0; i < 10; i++) { - dataSet = - session.executeQueryStatement( - String.format("SELECT * from root.db.v1.d%d", (int) (Math.random() * 100))); - while (dataSet.hasNext()) { - row = dataSet.next(); - Assert.assertEquals("1.23", row.getFields().get(0).toString()); - Assert.assertEquals("2.34", row.getFields().get(1).toString()); - } - } - } - - private Template getTemplate(String name) throws StatementExecutionException { - Template sessionTemplate = new Template(name, false); - - TemplateNode mNodeX = - new MeasurementNode("x", TSDataType.FLOAT, TSEncoding.RLE, CompressionType.SNAPPY); - TemplateNode mNodeY = - new MeasurementNode("y", TSDataType.FLOAT, TSEncoding.RLE, CompressionType.SNAPPY); - - sessionTemplate.addToTemplate(mNodeX); - sessionTemplate.addToTemplate(mNodeY); - - return sessionTemplate; - } } diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBSortedShowTimeseriesIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBSortedShowTimeseriesIT.java index c3fcbfe250415..18de644f14085 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBSortedShowTimeseriesIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBSortedShowTimeseriesIT.java @@ -22,6 +22,7 @@ import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.itbase.category.ClusterIT; import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.util.AbstractSchemaIT; import org.junit.After; import org.junit.Before; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBTagAlterIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBTagAlterIT.java index d37c241df3552..f616ca9ed7ee4 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBTagAlterIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBTagAlterIT.java @@ -22,6 +22,7 @@ import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.itbase.category.ClusterIT; import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.util.AbstractSchemaIT; import org.junit.After; import org.junit.Before; diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBTagIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBTagIT.java index cc94dec78595e..8327e8a988e11 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBTagIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/schema/IoTDBTagIT.java @@ -22,6 +22,7 @@ import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.itbase.category.ClusterIT; import org.apache.iotdb.itbase.category.LocalStandaloneIT; +import org.apache.iotdb.util.AbstractSchemaIT; import org.junit.After; import org.junit.Before; diff --git a/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionSchemaTemplateIT.java b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionSchemaTemplateIT.java index 99e63bfe49439..1ca6f5a503961 100644 --- a/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionSchemaTemplateIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionSchemaTemplateIT.java @@ -26,6 +26,7 @@ import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; import org.apache.iotdb.itbase.category.ClusterIT; +import org.apache.iotdb.itbase.category.LocalStandaloneIT; import org.apache.iotdb.rpc.IoTDBConnectionException; import org.apache.iotdb.rpc.StatementExecutionException; import org.apache.iotdb.rpc.TSStatusCode; @@ -34,6 +35,7 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding; import org.apache.iotdb.tsfile.read.common.RowRecord; +import org.apache.iotdb.util.AbstractSchemaIT; import org.junit.After; import org.junit.Assert; @@ -54,11 +56,15 @@ import static org.junit.Assert.fail; @RunWith(IoTDBTestRunner.class) -@Category({ClusterIT.class}) -public class IoTDBSessionSchemaTemplateIT { +@Category({LocalStandaloneIT.class, ClusterIT.class}) +public class IoTDBSessionSchemaTemplateIT extends AbstractSchemaIT { private ISession session; + public IoTDBSessionSchemaTemplateIT(SchemaTestMode schemaTestMode) { + super(schemaTestMode); + } + @Before public void setUp() throws Exception { EnvFactory.getEnv().initClusterEnvironment(); diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/AbstractSchemaIT.java b/integration-test/src/test/java/org/apache/iotdb/util/AbstractSchemaIT.java similarity index 98% rename from integration-test/src/test/java/org/apache/iotdb/db/it/schema/AbstractSchemaIT.java rename to integration-test/src/test/java/org/apache/iotdb/util/AbstractSchemaIT.java index 0c74d462253db..4501b5d28b55d 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/schema/AbstractSchemaIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/util/AbstractSchemaIT.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.iotdb.db.it.schema; +package org.apache.iotdb.util; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunnerWithParametersFactory; @@ -85,7 +85,7 @@ protected void allocateMemoryForSchemaRegion(int allocateMemoryForSchemaRegion) .setSchemaMemoryAllocate(StringUtils.join(proportion, ':')); } - enum SchemaTestMode { + protected enum SchemaTestMode { Memory, SchemaFile } From 4981b47ed83e395bc4a05ddee3666639ec5409b8 Mon Sep 17 00:00:00 2001 From: MarcosZyk <1534661820@qq.com> Date: Tue, 25 Apr 2023 14:19:51 +0800 Subject: [PATCH 2/2] fix CI --- .../apache/iotdb/session/it/IoTDBSessionSchemaTemplateIT.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionSchemaTemplateIT.java b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionSchemaTemplateIT.java index 1ca6f5a503961..72cc377ae98a4 100644 --- a/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionSchemaTemplateIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionSchemaTemplateIT.java @@ -24,7 +24,6 @@ import org.apache.iotdb.isession.template.Template; import org.apache.iotdb.isession.template.TemplateNode; import org.apache.iotdb.it.env.EnvFactory; -import org.apache.iotdb.it.framework.IoTDBTestRunner; import org.apache.iotdb.itbase.category.ClusterIT; import org.apache.iotdb.itbase.category.LocalStandaloneIT; import org.apache.iotdb.rpc.IoTDBConnectionException; @@ -42,7 +41,6 @@ import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.junit.runner.RunWith; import java.io.IOException; import java.util.ArrayList; @@ -55,7 +53,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -@RunWith(IoTDBTestRunner.class) @Category({LocalStandaloneIT.class, ClusterIT.class}) public class IoTDBSessionSchemaTemplateIT extends AbstractSchemaIT {