You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@iotdb.apache.org by GitBox <gi...@apache.org> on 2022/09/16 10:06:09 UTC
[GitHub] [iotdb] ericpai commented on a diff in pull request #7354: [IOTDB-3656] mpp load supports modification
ericpai commented on code in PR #7354:
URL: https://github.com/apache/iotdb/pull/7354#discussion_r972864057
##########
integration-test/src/test/java/org/apache/iotdb/db/it/IOTDBLoadTsFileIT.java:
##########
@@ -0,0 +1,579 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iotdb.db.it;
+
+import org.apache.iotdb.commons.exception.IllegalPathException;
+import org.apache.iotdb.commons.path.PartialPath;
+import org.apache.iotdb.db.engine.modification.Deletion;
+import org.apache.iotdb.db.engine.modification.ModificationFile;
+import org.apache.iotdb.it.env.ConfigFactory;
+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.tsfile.exception.write.WriteProcessException;
+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.Path;
+import org.apache.iotdb.tsfile.utils.Binary;
+import org.apache.iotdb.tsfile.write.TsFileWriter;
+import org.apache.iotdb.tsfile.write.record.Tablet;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.TreeSet;
+
+@RunWith(IoTDBTestRunner.class)
+@Category({LocalStandaloneIT.class, ClusterIT.class})
+public class IOTDBLoadTsFileIT {
+ private static final Logger LOGGER = LoggerFactory.getLogger(IOTDBLoadTsFileIT.class);
+ private static final long PARTITION_INTERVAL = 10L;
+
+ private boolean originEnablePartition;
+ private long originPartitionInterval;
+
+ private File tmpDir;
+
+ @Before
+ public void setUp() throws Exception {
+ tmpDir = new File(Files.createTempDirectory("load").toUri());
+ originEnablePartition = ConfigFactory.getConfig().isEnablePartition();
+ originPartitionInterval = ConfigFactory.getConfig().getPartitionInterval();
+ ConfigFactory.getConfig().setPartitionInterval(PARTITION_INTERVAL);
+ EnvFactory.getEnv().initBeforeTest();
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ deleteSG();
+
+ EnvFactory.getEnv().cleanAfterTest();
+ ConfigFactory.getConfig().setEnablePartition(originEnablePartition);
+ ConfigFactory.getConfig().setPartitionInterval(originPartitionInterval);
+
+ if (!deleteDir()) {
+ LOGGER.error("Can not delete tmp dir for loading tsfile.");
+ }
+ }
+
+ private void registerSchema() throws SQLException {
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+
+ statement.execute("set storage group to " + SchemaConfig.STORAGE_GROUP_0);
+ statement.execute("set storage group to " + SchemaConfig.STORAGE_GROUP_1);
+
+ statement.execute(convert2SQL(SchemaConfig.DEVICE_0, SchemaConfig.MEASUREMENT_00));
+ statement.execute(convert2SQL(SchemaConfig.DEVICE_0, SchemaConfig.MEASUREMENT_01));
+ statement.execute(convert2SQL(SchemaConfig.DEVICE_0, SchemaConfig.MEASUREMENT_02));
+ statement.execute(convert2SQL(SchemaConfig.DEVICE_0, SchemaConfig.MEASUREMENT_03));
+
+ statement.execute(
+ convert2AlignedSQL(
+ SchemaConfig.DEVICE_1,
+ Arrays.asList(
+ SchemaConfig.MEASUREMENT_10,
+ SchemaConfig.MEASUREMENT_11,
+ SchemaConfig.MEASUREMENT_12,
+ SchemaConfig.MEASUREMENT_13)));
+
+ statement.execute(convert2SQL(SchemaConfig.DEVICE_2, SchemaConfig.MEASUREMENT_20));
+
+ statement.execute(convert2SQL(SchemaConfig.DEVICE_3, SchemaConfig.MEASUREMENT_30));
+
+ statement.execute(
+ convert2AlignedSQL(SchemaConfig.DEVICE_4, Arrays.asList(SchemaConfig.MEASUREMENT_40)));
+ }
+ }
+
+ private String convert2SQL(String device, MeasurementSchema schema) {
+ String sql =
+ String.format(
+ "create timeseries %s %s",
+ new Path(device, schema.getMeasurementId()).getFullPath(), schema.getType().name());
+ LOGGER.info(String.format("schema execute: %s.", sql));
+ return sql;
+ }
+
+ private String convert2AlignedSQL(String device, List<MeasurementSchema> schemas) {
+ String sql = String.format("create aligned timeseries %s(", device);
+ for (int i = 0; i < schemas.size(); i++) {
+ MeasurementSchema schema = schemas.get(i);
+ sql += (String.format("%s %s", schema.getMeasurementId(), schema.getType().name()));
+ sql += (i == schemas.size() - 1 ? ")" : ",");
+ }
+ LOGGER.info(String.format("schema execute: %s.", sql));
+ return sql;
+ }
+
+ private void deleteSG() throws SQLException {
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+
+ statement.execute(String.format("delete storage group %s", SchemaConfig.STORAGE_GROUP_0));
+ statement.execute(String.format("delete storage group %s", SchemaConfig.STORAGE_GROUP_1));
+ }
+ }
+
+ private boolean deleteDir() {
+ for (File file : tmpDir.listFiles()) {
+ if (!file.delete()) {
+ return false;
+ }
+ }
+ return tmpDir.delete();
+ }
+
+ @Test
+ public void testLoad() throws Exception {
+ registerSchema();
+
+ long writtenPoint1 = 0;
+ // device 0, device 1, sg 0
+ try (TsFileGenerator generator = new TsFileGenerator(new File(tmpDir, "1-0-0-0.tsfile"))) {
+ generator.registerTimeseries(
+ new Path(SchemaConfig.DEVICE_0),
+ Arrays.asList(
+ SchemaConfig.MEASUREMENT_00,
+ SchemaConfig.MEASUREMENT_01,
+ SchemaConfig.MEASUREMENT_02,
+ SchemaConfig.MEASUREMENT_03));
+ generator.registerAlignedTimeseries(
+ new Path(SchemaConfig.DEVICE_1),
+ Arrays.asList(
+ SchemaConfig.MEASUREMENT_10,
+ SchemaConfig.MEASUREMENT_11,
+ SchemaConfig.MEASUREMENT_12,
+ SchemaConfig.MEASUREMENT_13));
+ generator.generateData(new Path(SchemaConfig.DEVICE_0), 100000, false);
+ generator.generateData(new Path(SchemaConfig.DEVICE_1), 100000, true);
+ writtenPoint1 = generator.getTotalNumber();
+ }
+
+ long writtenPoint2 = 0;
+ // device 2, device 3, device4, sg 1
+ try (TsFileGenerator generator = new TsFileGenerator(new File(tmpDir, "2-0-0-0.tsfile"))) {
+ generator.registerTimeseries(
+ new Path(SchemaConfig.DEVICE_2), Arrays.asList(SchemaConfig.MEASUREMENT_20));
+ generator.registerTimeseries(
+ new Path(SchemaConfig.DEVICE_3), Arrays.asList(SchemaConfig.MEASUREMENT_30));
+ generator.registerAlignedTimeseries(
+ new Path(SchemaConfig.DEVICE_4), Arrays.asList(SchemaConfig.MEASUREMENT_40));
+ generator.generateData(new Path(SchemaConfig.DEVICE_2), 10000, false);
+ generator.generateData(new Path(SchemaConfig.DEVICE_3), 10000, false);
+ generator.generateData(new Path(SchemaConfig.DEVICE_4), 10000, true);
+ writtenPoint2 = generator.getTotalNumber();
+ }
+
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+
+ statement.execute(String.format("load \"%s\" sglevel=2", tmpDir.getAbsolutePath()));
+
+ try (ResultSet resultSet =
+ statement.executeQuery("select count(*) from root.** group by level=1,2")) {
+ if (resultSet.next()) {
+ long sg1Count = resultSet.getLong("count(root.sg.test_0.*.*)");
+ Assert.assertEquals(writtenPoint1, sg1Count);
+ long sg2Count = resultSet.getLong("count(root.sg.test_1.*.*)");
+ Assert.assertEquals(writtenPoint2, sg2Count);
+ } else {
+ Assert.fail("This ResultSet is empty.");
+ }
+ }
+ }
+ }
+
+ @Test
+ public void testLoadWithAutoRegister() throws Exception {
+ long writtenPoint1 = 0;
+ // device 0, device 1, sg 0
+ try (TsFileGenerator generator = new TsFileGenerator(new File(tmpDir, "1-0-0-0.tsfile"))) {
+ generator.registerTimeseries(
+ new Path(SchemaConfig.DEVICE_0),
+ Arrays.asList(
+ SchemaConfig.MEASUREMENT_00,
+ SchemaConfig.MEASUREMENT_01,
+ SchemaConfig.MEASUREMENT_02,
+ SchemaConfig.MEASUREMENT_03));
+ generator.registerAlignedTimeseries(
+ new Path(SchemaConfig.DEVICE_1),
+ Arrays.asList(
+ SchemaConfig.MEASUREMENT_10,
+ SchemaConfig.MEASUREMENT_11,
+ SchemaConfig.MEASUREMENT_12,
+ SchemaConfig.MEASUREMENT_13));
+ generator.generateData(new Path(SchemaConfig.DEVICE_0), 10000, false);
+ generator.generateData(new Path(SchemaConfig.DEVICE_1), 10000, true);
+ writtenPoint1 = generator.getTotalNumber();
+ }
+
+ long writtenPoint2 = 0;
+ // device 2, device 3, device4, sg 1
+ try (TsFileGenerator generator = new TsFileGenerator(new File(tmpDir, "2-0-0-0.tsfile"))) {
+ generator.registerTimeseries(
+ new Path(SchemaConfig.DEVICE_2), Arrays.asList(SchemaConfig.MEASUREMENT_20));
+ generator.registerTimeseries(
+ new Path(SchemaConfig.DEVICE_3), Arrays.asList(SchemaConfig.MEASUREMENT_30));
+ generator.registerAlignedTimeseries(
+ new Path(SchemaConfig.DEVICE_4), Arrays.asList(SchemaConfig.MEASUREMENT_40));
+ generator.generateData(new Path(SchemaConfig.DEVICE_2), 10000, false);
+ generator.generateData(new Path(SchemaConfig.DEVICE_3), 10000, false);
+ generator.generateData(new Path(SchemaConfig.DEVICE_4), 10000, true);
+ writtenPoint2 = generator.getTotalNumber();
+ }
+
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+
+ statement.execute(
+ String.format("load \"%s\" sglevel=2,autoregister=true", tmpDir.getAbsolutePath()));
+
+ try (ResultSet resultSet =
+ statement.executeQuery("select count(*) from root.** group by level=1,2")) {
+ if (resultSet.next()) {
+ long sg1Count = resultSet.getLong("count(root.sg.test_0.*.*)");
+ Assert.assertEquals(writtenPoint1, sg1Count);
+ long sg2Count = resultSet.getLong("count(root.sg.test_1.*.*)");
+ Assert.assertEquals(writtenPoint2, sg2Count);
+ } else {
+ Assert.fail("This ResultSet is empty.");
+ }
+ }
+
+ Map<String, String> isAligned = new HashMap<>();
+ isAligned.put(SchemaConfig.DEVICE_0, "false");
+ isAligned.put(SchemaConfig.DEVICE_1, "true");
+ isAligned.put(SchemaConfig.DEVICE_2, "false");
+ isAligned.put(SchemaConfig.DEVICE_3, "false");
+ isAligned.put(SchemaConfig.DEVICE_4, "true");
+ try (ResultSet resultSet = statement.executeQuery("show devices")) {
+ int size = 0;
+ while (resultSet.next()) {
+ size += 1;
+ String device = resultSet.getString("devices");
+ Assert.assertEquals(isAligned.get(device), resultSet.getString("isAligned"));
+ }
+ Assert.assertEquals(isAligned.size(), size);
+ } catch (Exception e) {
+ e.printStackTrace();
+ Assert.fail("Parse result set error.");
+ }
+ }
+ }
+
+ @Test
+ public void testLoadWithMods() throws Exception {
+ long writtenPoint1 = 0;
+ // device 0, device 1, sg 0
+ try (TsFileGenerator generator = new TsFileGenerator(new File(tmpDir, "1-0-0-0.tsfile"))) {
+ generator.registerTimeseries(
+ new Path(SchemaConfig.DEVICE_0),
+ Arrays.asList(
+ SchemaConfig.MEASUREMENT_00,
+ SchemaConfig.MEASUREMENT_01,
+ SchemaConfig.MEASUREMENT_02,
+ SchemaConfig.MEASUREMENT_03));
+ generator.registerAlignedTimeseries(
+ new Path(SchemaConfig.DEVICE_1),
+ Arrays.asList(
+ SchemaConfig.MEASUREMENT_10,
+ SchemaConfig.MEASUREMENT_11,
+ SchemaConfig.MEASUREMENT_12,
+ SchemaConfig.MEASUREMENT_13));
+ generator.generateData(new Path(SchemaConfig.DEVICE_0), 10000, false);
+ generator.generateData(new Path(SchemaConfig.DEVICE_1), 10000, true);
+ generator.generateDeletion(new Path(SchemaConfig.DEVICE_0), 10);
+ generator.generateDeletion(new Path(SchemaConfig.DEVICE_1), 10);
+ writtenPoint1 = generator.getTotalNumber();
+ }
+
+ long writtenPoint2 = 0;
+ // device 2, device 3, device4, sg 1
+ try (TsFileGenerator generator = new TsFileGenerator(new File(tmpDir, "2-0-0-0.tsfile"))) {
+ generator.registerTimeseries(
+ new Path(SchemaConfig.DEVICE_2), Arrays.asList(SchemaConfig.MEASUREMENT_20));
+ generator.registerTimeseries(
+ new Path(SchemaConfig.DEVICE_3), Arrays.asList(SchemaConfig.MEASUREMENT_30));
+ generator.registerAlignedTimeseries(
+ new Path(SchemaConfig.DEVICE_4), Arrays.asList(SchemaConfig.MEASUREMENT_40));
+ generator.generateData(new Path(SchemaConfig.DEVICE_2), 10000, false);
+ generator.generateData(new Path(SchemaConfig.DEVICE_3), 10000, false);
+ generator.generateData(new Path(SchemaConfig.DEVICE_4), 10000, true);
+ generator.generateDeletion(new Path(SchemaConfig.DEVICE_2), 10);
+ generator.generateDeletion(new Path(SchemaConfig.DEVICE_4), 10);
+ generator.generateData(new Path(SchemaConfig.DEVICE_2), 10000, false);
+ generator.generateData(new Path(SchemaConfig.DEVICE_4), 10000, true);
+ generator.generateDeletion(new Path(SchemaConfig.DEVICE_2), 10);
+ generator.generateDeletion(new Path(SchemaConfig.DEVICE_4), 10);
+ writtenPoint2 = generator.getTotalNumber();
+ }
+
+ try (Connection connection = EnvFactory.getEnv().getConnection();
+ Statement statement = connection.createStatement()) {
+
+ statement.execute(String.format("load \"%s\" sglevel=2", tmpDir.getAbsolutePath()));
+
+ try (ResultSet resultSet =
+ statement.executeQuery("select count(*) from root.** group by level=1,2")) {
+ if (resultSet.next()) {
+ long sg1Count = resultSet.getLong("count(root.sg.test_0.*.*)");
+ Assert.assertEquals(writtenPoint1, sg1Count);
+ long sg2Count = resultSet.getLong("count(root.sg.test_1.*.*)");
+ Assert.assertEquals(writtenPoint2, sg2Count);
+ } else {
+ Assert.fail("This ResultSet is empty.");
+ }
+ }
+ }
+ }
+
+ private static class SchemaConfig {
+ private static final String STORAGE_GROUP_0 = "root.sg.test_0";
+ private static final String STORAGE_GROUP_1 = "root.sg.test_1";
+
+ // device 0, nonaligned, sg 0
+ private static final String DEVICE_0 = "root.sg.test_0.d_0";
+ private static final MeasurementSchema MEASUREMENT_00 =
+ new MeasurementSchema("sensor_00", TSDataType.INT32, TSEncoding.RLE);
+ private static final MeasurementSchema MEASUREMENT_01 =
+ new MeasurementSchema("sensor_01", TSDataType.INT64, TSEncoding.RLE);
+ private static final MeasurementSchema MEASUREMENT_02 =
+ new MeasurementSchema("sensor_02", TSDataType.DOUBLE, TSEncoding.GORILLA);
+ private static final MeasurementSchema MEASUREMENT_03 =
+ new MeasurementSchema("sensor_03", TSDataType.TEXT, TSEncoding.PLAIN);
+
+ // device 1, aligned, sg 0
+ private static final String DEVICE_1 = "root.sg.test_0.a_1";
+ private static final MeasurementSchema MEASUREMENT_10 =
+ new MeasurementSchema("sensor_10", TSDataType.INT32, TSEncoding.RLE);
+ private static final MeasurementSchema MEASUREMENT_11 =
+ new MeasurementSchema("sensor_11", TSDataType.INT64, TSEncoding.RLE);
+ private static final MeasurementSchema MEASUREMENT_12 =
+ new MeasurementSchema("sensor_12", TSDataType.DOUBLE, TSEncoding.GORILLA);
+ private static final MeasurementSchema MEASUREMENT_13 =
+ new MeasurementSchema("sensor_13", TSDataType.TEXT, TSEncoding.PLAIN);
+
+ // device 2, non aligned, sg 1
+ private static final String DEVICE_2 = "root.sg.test_1.d_2";
+ private static final MeasurementSchema MEASUREMENT_20 =
+ new MeasurementSchema("sensor_20", TSDataType.INT32, TSEncoding.RLE);
+
+ // device 3, non aligned, sg 1
+ private static final String DEVICE_3 = "root.sg.test_1.d_3";
+ private static final MeasurementSchema MEASUREMENT_30 =
+ new MeasurementSchema("sensor_30", TSDataType.INT32, TSEncoding.RLE);
+
+ // device 4, aligned, sg 1
+ private static final String DEVICE_4 = "root.sg.test_1.a_4";
+ private static final MeasurementSchema MEASUREMENT_40 =
+ new MeasurementSchema("sensor_40", TSDataType.INT32, TSEncoding.RLE);
+ }
+
+ public class TsFileGenerator implements AutoCloseable {
Review Comment:
It seems that `TsFileGenerator` is a common tool in integration test, despite to depend on those internal classes of tsFile directly, you can
1. Move it to src/main, as a separate class in a package.
2. Refine the methods of this class, let the parameters are raw Java types(int, string, not Path etc).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@iotdb.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org