This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch ty_new_vector in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 636b1f695179e0c8ac8303abb95c21cca4632399 Author: JackieTien97 <[email protected]> AuthorDate: Fri Nov 19 17:15:12 2021 +0800 add value filter IT --- .../apache/iotdb/db/metadata/path/AlignedPath.java | 20 + .../iotdb/db/metadata/path/MeasurementPath.java | 1 + .../query/reader/chunk/MemAlignedPageReader.java | 24 +- .../iotdb/db/query/reader/series/SeriesReader.java | 21 +- .../aligned/IoTDBRawQueryWithValueFilter2IT.java | 11 +- .../aligned/IoTDBRawQueryWithValueFilterIT.java | 424 +++++++++--------- ...oTDBRawQueryWithValueFilterWithDeletion2IT.java | 23 +- ...IoTDBRawQueryWithValueFilterWithDeletionIT.java | 472 +++++++++++---------- .../IoTDBRawQueryWithoutValueFilter2IT.java | 8 +- .../aligned/IoTDBRawQueryWithoutValueFilterIT.java | 8 +- ...BRawQueryWithoutValueFilterWithDeletion2IT.java | 8 +- ...DBRawQueryWithoutValueFilterWithDeletionIT.java | 8 +- 12 files changed, 546 insertions(+), 482 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/path/AlignedPath.java b/server/src/main/java/org/apache/iotdb/db/metadata/path/AlignedPath.java index e908417..d11be02 100644 --- a/server/src/main/java/org/apache/iotdb/db/metadata/path/AlignedPath.java +++ b/server/src/main/java/org/apache/iotdb/db/metadata/path/AlignedPath.java @@ -50,6 +50,9 @@ import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema; import org.apache.iotdb.tsfile.write.schema.VectorMeasurementSchema; import org.apache.iotdb.tsfile.write.writer.RestorableTsFileIOWriter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.io.Serializable; import java.util.ArrayList; @@ -66,6 +69,8 @@ import java.util.Set; */ public class AlignedPath extends PartialPath { + private static final Logger logger = LoggerFactory.getLogger(AlignedPath.class); + // todo improve vector implementation by remove this placeholder public static final String VECTOR_PLACEHOLDER = ""; @@ -412,4 +417,19 @@ public class AlignedPath extends PartialPath { public int getColumnNum() { return measurementList.size(); } + + @Override + public AlignedPath clone() { + AlignedPath alignedPath = null; + try { + alignedPath = + new AlignedPath( + this.getDevice(), + new ArrayList<>(this.measurementList), + new ArrayList<>(this.schemaList)); + } catch (IllegalPathException e) { + logger.warn("path is illegal: {}", this.getFullPath(), e); + } + return alignedPath; + } } diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/path/MeasurementPath.java b/server/src/main/java/org/apache/iotdb/db/metadata/path/MeasurementPath.java index d8aef64..6adb1e3 100644 --- a/server/src/main/java/org/apache/iotdb/db/metadata/path/MeasurementPath.java +++ b/server/src/main/java/org/apache/iotdb/db/metadata/path/MeasurementPath.java @@ -273,6 +273,7 @@ public class MeasurementPath extends PartialPath { try { newMeasurementPath = new MeasurementPath(this.getDevice(), this.getMeasurement(), this.getMeasurementSchema()); + newMeasurementPath.setUnderAlignedEntity(this.isUnderAlignedEntity); } catch (IllegalPathException e) { logger.warn("path is illegal: {}", this.getFullPath(), e); } diff --git a/server/src/main/java/org/apache/iotdb/db/query/reader/chunk/MemAlignedPageReader.java b/server/src/main/java/org/apache/iotdb/db/query/reader/chunk/MemAlignedPageReader.java index a084f12..7dcd5ec 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/reader/chunk/MemAlignedPageReader.java +++ b/server/src/main/java/org/apache/iotdb/db/query/reader/chunk/MemAlignedPageReader.java @@ -29,6 +29,7 @@ import org.apache.iotdb.tsfile.read.filter.operator.AndFilter; import org.apache.iotdb.tsfile.read.reader.IAlignedPageReader; import org.apache.iotdb.tsfile.read.reader.IPageReader; import org.apache.iotdb.tsfile.read.reader.IPointReader; +import org.apache.iotdb.tsfile.utils.TsPrimitiveType; import java.io.IOException; @@ -52,14 +53,25 @@ public class MemAlignedPageReader implements IPageReader, IAlignedPageReader { @Override public BatchData getAllSatisfiedPageData(boolean ascending) throws IOException { - TSDataType dataType = chunkMetadata.getDataType(); - BatchData batchData = BatchDataFactory.createBatchData(dataType, ascending, false); + BatchData batchData = BatchDataFactory.createBatchData(TSDataType.VECTOR, ascending, false); while (timeValuePairIterator.hasNextTimeValuePair()) { TimeValuePair timeValuePair = timeValuePairIterator.nextTimeValuePair(); - if (valueFilter == null - || valueFilter.satisfy( - timeValuePair.getTimestamp(), timeValuePair.getValue().getValue())) { - batchData.putAnObject(timeValuePair.getTimestamp(), timeValuePair.getValue().getValue()); + TsPrimitiveType[] values = timeValuePair.getValue().getVector(); + // save the first not null value of each row + Object firstNotNullObject = null; + for (TsPrimitiveType value : values) { + if (value != null) { + firstNotNullObject = value.getValue(); + break; + } + } + // if all the sub sensors' value are null in current time + // or current row is not satisfied with the filter, just discard it + // TODO fix value filter firstNotNullObject, currently, if it's a value filter, it will only + // accept AlignedPath with only one sub sensor + if (firstNotNullObject != null && valueFilter == null + || valueFilter.satisfy(timeValuePair.getTimestamp(), firstNotNullObject)) { + batchData.putVector(timeValuePair.getTimestamp(), values); } } return batchData.flip(); diff --git a/server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesReader.java b/server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesReader.java index 128686e..416f47b 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesReader.java +++ b/server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesReader.java @@ -18,16 +18,6 @@ */ package org.apache.iotdb.db.query.reader.series; -import java.io.IOException; -import java.io.Serializable; -import java.util.Comparator; -import java.util.LinkedList; -import java.util.List; -import java.util.Objects; -import java.util.PriorityQueue; -import java.util.Set; -import java.util.function.ToLongFunction; -import java.util.stream.Collectors; import org.apache.iotdb.db.engine.querycontext.QueryDataSource; import org.apache.iotdb.db.engine.storagegroup.TsFileResource; import org.apache.iotdb.db.metadata.path.PartialPath; @@ -56,6 +46,17 @@ import org.apache.iotdb.tsfile.read.reader.IAlignedPageReader; import org.apache.iotdb.tsfile.read.reader.IPageReader; import org.apache.iotdb.tsfile.utils.TsPrimitiveType; +import java.io.IOException; +import java.io.Serializable; +import java.util.Comparator; +import java.util.LinkedList; +import java.util.List; +import java.util.Objects; +import java.util.PriorityQueue; +import java.util.Set; +import java.util.function.ToLongFunction; +import java.util.stream.Collectors; + public class SeriesReader { // inner class of SeriesReader for order purpose diff --git a/server/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBRawQueryWithValueFilter2IT.java b/server/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBRawQueryWithValueFilter2IT.java index 4ebaf2f..213b70c 100644 --- a/server/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBRawQueryWithValueFilter2IT.java +++ b/server/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBRawQueryWithValueFilter2IT.java @@ -21,12 +21,12 @@ package org.apache.iotdb.db.integration.aligned; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; + import org.junit.AfterClass; import org.junit.BeforeClass; public class IoTDBRawQueryWithValueFilter2IT extends IoTDBRawQueryWithValueFilterIT { - private static int numOfPointsPerPage; @BeforeClass @@ -42,8 +42,8 @@ public class IoTDBRawQueryWithValueFilter2IT extends IoTDBRawQueryWithValueFilte IoTDBDescriptor.getInstance().getConfig().isEnableCrossSpaceCompaction(); numOfPointsPerPage = TSFileDescriptor.getInstance().getConfig().getMaxNumberOfPointsInPage(); IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false); - IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false); - IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false); + IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false); + IoTDBDescriptor.getInstance().getConfig().setEnableCrossSpaceCompaction(false); TSFileDescriptor.getInstance().getConfig().setMaxNumberOfPointsInPage(3); AlignedWriteUtil.insertData(); } @@ -53,12 +53,11 @@ public class IoTDBRawQueryWithValueFilter2IT extends IoTDBRawQueryWithValueFilte IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(enableSeqSpaceCompaction); IoTDBDescriptor.getInstance() .getConfig() - .setEnableSeqSpaceCompaction(enableUnseqSpaceCompaction); + .setEnableUnseqSpaceCompaction(enableUnseqSpaceCompaction); IoTDBDescriptor.getInstance() .getConfig() - .setEnableSeqSpaceCompaction(enableCrossSpaceCompaction); + .setEnableCrossSpaceCompaction(enableCrossSpaceCompaction); TSFileDescriptor.getInstance().getConfig().setMaxNumberOfPointsInPage(numOfPointsPerPage); EnvironmentUtils.cleanEnv(); } - } diff --git a/server/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBRawQueryWithValueFilterIT.java b/server/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBRawQueryWithValueFilterIT.java index 9d0e7c6..6bd4649 100644 --- a/server/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBRawQueryWithValueFilterIT.java +++ b/server/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBRawQueryWithValueFilterIT.java @@ -18,8 +18,14 @@ */ package org.apache.iotdb.db.integration.aligned; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.utils.EnvironmentUtils; +import org.apache.iotdb.jdbc.Config; + +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; import java.sql.Connection; import java.sql.DriverManager; @@ -29,13 +35,9 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.HashMap; import java.util.Map; -import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.utils.EnvironmentUtils; -import org.apache.iotdb.jdbc.Config; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; public class IoTDBRawQueryWithValueFilterIT { protected static boolean enableSeqSpaceCompaction; @@ -54,8 +56,8 @@ public class IoTDBRawQueryWithValueFilterIT { enableCrossSpaceCompaction = IoTDBDescriptor.getInstance().getConfig().isEnableCrossSpaceCompaction(); IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false); - IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false); - IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false); + IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false); + IoTDBDescriptor.getInstance().getConfig().setEnableCrossSpaceCompaction(false); AlignedWriteUtil.insertData(); } @@ -64,10 +66,10 @@ public class IoTDBRawQueryWithValueFilterIT { IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(enableSeqSpaceCompaction); IoTDBDescriptor.getInstance() .getConfig() - .setEnableSeqSpaceCompaction(enableUnseqSpaceCompaction); + .setEnableUnseqSpaceCompaction(enableUnseqSpaceCompaction); IoTDBDescriptor.getInstance() .getConfig() - .setEnableSeqSpaceCompaction(enableCrossSpaceCompaction); + .setEnableCrossSpaceCompaction(enableCrossSpaceCompaction); EnvironmentUtils.cleanEnv(); } @@ -76,27 +78,27 @@ public class IoTDBRawQueryWithValueFilterIT { String[] retArray = new String[] { - "1,1.0,1,1,true,aligned_test1", - "3,30000.0,null,30000,true,aligned_unseq_test3", - "4,4.0,4,null,true,aligned_test4", - "5,5.0,5,null,true,aligned_test5", - "6,6.0,6,6,true,null", - "10,null,10,10,true,aligned_test10", - "13,130000.0,130000,130000,true,aligned_unseq_test13", - "21,null,null,21,true,null", - "22,null,null,22,true,null", - "24,null,null,24,true,null", - "25,null,null,25,true,null", + "1,1.0,1,1,true,aligned_test1", + "3,30000.0,null,30000,true,aligned_unseq_test3", + "4,4.0,4,null,true,aligned_test4", + "5,5.0,5,null,true,aligned_test5", + "6,6.0,6,6,true,null", + "10,null,10,10,true,aligned_test10", + "13,130000.0,130000,130000,true,aligned_unseq_test13", + "21,null,null,21,true,null", + "22,null,null,22,true,null", + "24,null,null,24,true,null", + "25,null,null,25,true,null", }; String[] columnNames = { - "root.sg1.d1.s1", "root.sg1.d1.s2", "root.sg1.d1.s3", "root.sg1.d1.s4", "root.sg1.d1.s5" + "root.sg1.d1.s1", "root.sg1.d1.s2", "root.sg1.d1.s3", "root.sg1.d1.s4", "root.sg1.d1.s5" }; Class.forName(Config.JDBC_DRIVER_NAME); try (Connection connection = - DriverManager.getConnection( - Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); + DriverManager.getConnection( + Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); Statement statement = connection.createStatement()) { boolean hasResultSet = statement.execute("select * from root.sg1.d1 where s4 = true"); @@ -134,27 +136,28 @@ public class IoTDBRawQueryWithValueFilterIT { String[] retArray = new String[] { - "12,12.0,12,12,null,null", - "14,14.0,14,14,null,null", - "15,15.0,15,15,null,null", - "16,16.0,16,16,null,null", - "17,17.0,17,17,null,null", - "18,18.0,18,18,null,null", - "19,19.0,19,19,null,null", - "20,20.0,20,20,null,null", + "12,12.0,12,12,null,null", + "14,14.0,14,14,null,null", + "15,15.0,15,15,null,null", + "16,16.0,16,16,null,null", + "17,17.0,17,17,null,null", + "18,18.0,18,18,null,null", + "19,19.0,19,19,null,null", + "20,20.0,20,20,null,null", }; String[] columnNames = { - "root.sg1.d1.s1", "root.sg1.d1.s2", "root.sg1.d1.s3", "root.sg1.d1.s4", "root.sg1.d1.s5" + "root.sg1.d1.s1", "root.sg1.d1.s2", "root.sg1.d1.s3", "root.sg1.d1.s4", "root.sg1.d1.s5" }; Class.forName(Config.JDBC_DRIVER_NAME); try (Connection connection = - DriverManager.getConnection( - Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); + DriverManager.getConnection( + Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); Statement statement = connection.createStatement()) { - boolean hasResultSet = statement.execute("select * from root.sg1.d1 where s1 > 11 and s2 <= 33"); + boolean hasResultSet = + statement.execute("select * from root.sg1.d1 where s1 > 11 and s2 <= 33"); Assert.assertTrue(hasResultSet); try (ResultSet resultSet = statement.getResultSet()) { @@ -189,42 +192,43 @@ public class IoTDBRawQueryWithValueFilterIT { String[] retArray = new String[] { - "1,1.0,1,1,true,aligned_test1", - "2,2.0,2,2,null,aligned_test2", - "3,30000.0,null,30000,true,aligned_unseq_test3", - "4,4.0,4,null,true,aligned_test4", - "5,5.0,5,null,true,aligned_test5", - "6,6.0,6,6,true,null", - "7,7.0,7,7,false,aligned_test7", - "8,8.0,8,8,null,aligned_test8", - "9,9.0,9,9,false,aligned_test9", - "10,null,10,10,true,aligned_test10", - "11,11.0,11,11,null,null", - "12,12.0,12,12,null,null", - "13,130000.0,130000,130000,true,aligned_unseq_test13", - "14,14.0,14,14,null,null", - "15,15.0,15,15,null,null", - "16,16.0,16,16,null,null", - "17,17.0,17,17,null,null", - "18,18.0,18,18,null,null", - "19,19.0,19,19,null,null", - "20,20.0,20,20,null,null", - "23,230000.0,null,230000,false,null", - "31,null,31,null,null,aligned_test31", - "32,null,32,null,null,aligned_test32", + "1,1.0,1,1,true,aligned_test1", + "2,2.0,2,2,null,aligned_test2", + "3,30000.0,null,30000,true,aligned_unseq_test3", + "4,4.0,4,null,true,aligned_test4", + "5,5.0,5,null,true,aligned_test5", + "6,6.0,6,6,true,null", + "7,7.0,7,7,false,aligned_test7", + "8,8.0,8,8,null,aligned_test8", + "9,9.0,9,9,false,aligned_test9", + "10,null,10,10,true,aligned_test10", + "11,11.0,11,11,null,null", + "12,12.0,12,12,null,null", + "13,130000.0,130000,130000,true,aligned_unseq_test13", + "14,14.0,14,14,null,null", + "15,15.0,15,15,null,null", + "16,16.0,16,16,null,null", + "17,17.0,17,17,null,null", + "18,18.0,18,18,null,null", + "19,19.0,19,19,null,null", + "20,20.0,20,20,null,null", + "23,230000.0,null,230000,false,null", + "31,null,31,null,null,aligned_test31", + "32,null,32,null,null,aligned_test32", }; String[] columnNames = { - "root.sg1.d1.s1", "root.sg1.d1.s2", "root.sg1.d1.s3", "root.sg1.d1.s4", "root.sg1.d1.s5" + "root.sg1.d1.s1", "root.sg1.d1.s2", "root.sg1.d1.s3", "root.sg1.d1.s4", "root.sg1.d1.s5" }; Class.forName(Config.JDBC_DRIVER_NAME); try (Connection connection = - DriverManager.getConnection( - Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); + DriverManager.getConnection( + Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); Statement statement = connection.createStatement()) { - boolean hasResultSet = statement.execute("select * from root.sg1.d1 where s1 >= 13 or s2 < 33"); + boolean hasResultSet = + statement.execute("select * from root.sg1.d1 where s1 >= 13 or s2 < 33"); Assert.assertTrue(hasResultSet); try (ResultSet resultSet = statement.getResultSet()) { @@ -259,34 +263,35 @@ public class IoTDBRawQueryWithValueFilterIT { String[] retArray = new String[] { - "13,130000.0,130000,130000,true,aligned_unseq_test13,13.0,13,13,null,null", - "17,17.0,17,17,null,null,17.0,17,17,null,null", - "18,18.0,18,18,null,null,18.0,18,18,null,null", - "19,19.0,19,19,null,null,19.0,19,19,null,null", - "20,20.0,20,20,null,null,20.0,20,20,null,null", - "23,230000.0,null,230000,false,null,null,null,23,true,null", + "13,130000.0,130000,130000,true,aligned_unseq_test13,13.0,13,13,null,null", + "17,17.0,17,17,null,null,17.0,17,17,null,null", + "18,18.0,18,18,null,null,18.0,18,18,null,null", + "19,19.0,19,19,null,null,19.0,19,19,null,null", + "20,20.0,20,20,null,null,20.0,20,20,null,null", }; String[] columnNames = { - "root.sg1.d1.s1", - "root.sg1.d1.s2", - "root.sg1.d1.s3", - "root.sg1.d1.s4", - "root.sg1.d1.s5", - "root.sg1.d2.s1", - "root.sg1.d2.s2", - "root.sg1.d2.s3", - "root.sg1.d2.s4", - "root.sg1.d2.s5" + "root.sg1.d1.s1", + "root.sg1.d1.s2", + "root.sg1.d1.s3", + "root.sg1.d1.s4", + "root.sg1.d1.s5", + "root.sg1.d2.s1", + "root.sg1.d2.s2", + "root.sg1.d2.s3", + "root.sg1.d2.s4", + "root.sg1.d2.s5" }; Class.forName(Config.JDBC_DRIVER_NAME); try (Connection connection = - DriverManager.getConnection( - Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); + DriverManager.getConnection( + Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); Statement statement = connection.createStatement()) { - boolean hasResultSet = statement.execute("select * from root.sg1.* where root.sg1.d1.s2 > 16 and root.sg1.d2.s3 <= 36"); + boolean hasResultSet = + statement.execute( + "select * from root.sg1.* where root.sg1.d1.s2 > 16 and root.sg1.d2.s3 <= 36"); Assert.assertTrue(hasResultSet); try (ResultSet resultSet = statement.getResultSet()) { @@ -321,41 +326,53 @@ public class IoTDBRawQueryWithValueFilterIT { String[] retArray = new String[] { - "3,30000.0,null,30000,true,aligned_unseq_test3,3.0,null,3,false,non_aligned_test3", - "7,7.0,7,7,false,aligned_test7,7.0,7,7,false,non_aligned_test7", - "9,9.0,9,9,false,aligned_test9,9.0,9,9,false,non_aligned_test9", - "17,17.0,17,17,null,null,17.0,17,17,null,null", - "18,18.0,18,18,null,null,18.0,18,18,null,null", - "19,19.0,19,19,null,null,19.0,19,19,null,null", - "20,20.0,20,20,null,null,20.0,20,20,null,null", - "23,230000.0,null,230000,false,null,null,null,23,true,null", - "26,null,null,26,false,null,null,null,26,false,null", - "27,null,null,27,false,null,null,null,27,false,null", - "28,null,null,28,false,null,null,null,28,false,null", - "29,null,null,29,false,null,null,null,29,false,null", - "30,null,null,30,false,null,null,null,30,false,null", + "3,30000.0,null,30000,true,aligned_unseq_test3,3.0,null,3,false,non_aligned_test3", + "7,7.0,7,7,false,aligned_test7,7.0,7,7,false,non_aligned_test7", + "9,9.0,9,9,false,aligned_test9,9.0,9,9,false,non_aligned_test9", + "13,130000.0,130000,130000,true,aligned_unseq_test13,13.0,13,13,null,null", + "17,17.0,17,17,null,null,17.0,17,17,null,null", + "18,18.0,18,18,null,null,18.0,18,18,null,null", + "19,19.0,19,19,null,null,19.0,19,19,null,null", + "20,20.0,20,20,null,null,20.0,20,20,null,null", + "26,null,null,26,false,null,null,null,26,false,null", + "27,null,null,27,false,null,null,null,27,false,null", + "28,null,null,28,false,null,null,null,28,false,null", + "29,null,null,29,false,null,null,null,29,false,null", + "30,null,null,30,false,null,null,null,30,false,null", + "31,null,31,null,null,aligned_test31,null,31,null,null,non_aligned_test31", + "32,null,32,null,null,aligned_test32,null,32,null,null,non_aligned_test32", + "33,null,33,null,null,aligned_test33,null,33,null,null,non_aligned_test33", + "34,null,34,null,null,aligned_test34,null,34,null,null,non_aligned_test34", + "35,null,35,null,null,aligned_test35,null,35,null,null,non_aligned_test35", + "36,null,36,null,null,aligned_test36,null,36,null,null,non_aligned_test36", + "37,null,37,null,null,aligned_test37,null,37,null,null,non_aligned_test37", + "38,null,38,null,null,aligned_test38,null,38,null,null,non_aligned_test38", + "39,null,39,null,null,aligned_test39,null,39,null,null,non_aligned_test39", + "40,null,40,null,null,aligned_test40,null,40,null,null,non_aligned_test40", }; String[] columnNames = { - "root.sg1.d1.s1", - "root.sg1.d1.s2", - "root.sg1.d1.s3", - "root.sg1.d1.s4", - "root.sg1.d1.s5", - "root.sg1.d2.s1", - "root.sg1.d2.s2", - "root.sg1.d2.s3", - "root.sg1.d2.s4", - "root.sg1.d2.s5" + "root.sg1.d1.s1", + "root.sg1.d1.s2", + "root.sg1.d1.s3", + "root.sg1.d1.s4", + "root.sg1.d1.s5", + "root.sg1.d2.s1", + "root.sg1.d2.s2", + "root.sg1.d2.s3", + "root.sg1.d2.s4", + "root.sg1.d2.s5" }; Class.forName(Config.JDBC_DRIVER_NAME); try (Connection connection = - DriverManager.getConnection( - Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); + DriverManager.getConnection( + Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); Statement statement = connection.createStatement()) { - boolean hasResultSet = statement.execute("select * from root.sg1.* where root.sg1.d1.s2 > 16 or root.sg1.d2.s4 = false"); + boolean hasResultSet = + statement.execute( + "select * from root.sg1.* where root.sg1.d1.s2 > 16 or root.sg1.d2.s4 = false"); Assert.assertTrue(hasResultSet); try (ResultSet resultSet = statement.getResultSet()) { @@ -390,24 +407,24 @@ public class IoTDBRawQueryWithValueFilterIT { String[] retArray = new String[] { - "9,9.0,9,9,false,aligned_test9", - "11,11.0,11,11,null,null", - "12,12.0,12,12,null,null", - "14,14.0,14,14,null,null", - "15,15.0,15,15,null,null", - "16,16.0,16,16,null,null", - "17,17.0,17,17,null,null", - "18,18.0,18,18,null,null", + "9,9.0,9,9,false,aligned_test9", + "11,11.0,11,11,null,null", + "12,12.0,12,12,null,null", + "14,14.0,14,14,null,null", + "15,15.0,15,15,null,null", + "16,16.0,16,16,null,null", + "17,17.0,17,17,null,null", + "18,18.0,18,18,null,null", }; String[] columnNames = { - "root.sg1.d1.s1", "root.sg1.d1.s2", "root.sg1.d1.s3", "root.sg1.d1.s4", "root.sg1.d1.s5" + "root.sg1.d1.s1", "root.sg1.d1.s2", "root.sg1.d1.s3", "root.sg1.d1.s4", "root.sg1.d1.s5" }; Class.forName(Config.JDBC_DRIVER_NAME); try (Connection connection = - DriverManager.getConnection( - Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); + DriverManager.getConnection( + Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); Statement statement = connection.createStatement()) { boolean hasResultSet = @@ -446,47 +463,48 @@ public class IoTDBRawQueryWithValueFilterIT { String[] retArray = new String[] { - "9,9.0,9,9,false,aligned_test9", - "10,null,10,10,true,aligned_test10", - "11,11.0,11,11,null,null", - "12,12.0,12,12,null,null", - "13,130000.0,130000,130000,true,aligned_unseq_test13", - "14,14.0,14,14,null,null", - "15,15.0,15,15,null,null", - "16,16.0,16,16,null,null", - "17,17.0,17,17,null,null", - "18,18.0,18,18,null,null", - "19,19.0,19,19,null,null", - "20,20.0,20,20,null,null", - "21,null,null,21,true,null", - "22,null,null,22,true,null", - "23,230000.0,null,230000,false,null", - "24,null,null,24,true,null", - "25,null,null,25,true,null", - "26,null,null,26,false,null", - "27,null,null,27,false,null", - "28,null,null,28,false,null", - "29,null,null,29,false,null", - "30,null,null,30,false,null", - "31,null,31,null,null,aligned_test31", - "32,null,32,null,null,aligned_test32", - "33,null,33,null,null,aligned_test33", - "36,null,36,null,null,aligned_test36", - "37,null,37,null,null,aligned_test37", + "9,9.0,9,9,false,aligned_test9", + "10,null,10,10,true,aligned_test10", + "11,11.0,11,11,null,null", + "12,12.0,12,12,null,null", + "13,130000.0,130000,130000,true,aligned_unseq_test13", + "14,14.0,14,14,null,null", + "15,15.0,15,15,null,null", + "16,16.0,16,16,null,null", + "17,17.0,17,17,null,null", + "18,18.0,18,18,null,null", + "19,19.0,19,19,null,null", + "20,20.0,20,20,null,null", + "21,null,null,21,true,null", + "22,null,null,22,true,null", + "23,230000.0,null,230000,false,null", + "24,null,null,24,true,null", + "25,null,null,25,true,null", + "26,null,null,26,false,null", + "27,null,null,27,false,null", + "28,null,null,28,false,null", + "29,null,null,29,false,null", + "30,null,null,30,false,null", + "31,null,31,null,null,aligned_test31", + "32,null,32,null,null,aligned_test32", + "33,null,33,null,null,aligned_test33", + "36,null,36,null,null,aligned_test36", + "37,null,37,null,null,aligned_test37", }; String[] columnNames = { - "root.sg1.d1.s1", "root.sg1.d1.s2", "root.sg1.d1.s3", "root.sg1.d1.s4", "root.sg1.d1.s5" + "root.sg1.d1.s1", "root.sg1.d1.s2", "root.sg1.d1.s3", "root.sg1.d1.s4", "root.sg1.d1.s5" }; Class.forName(Config.JDBC_DRIVER_NAME); try (Connection connection = - DriverManager.getConnection( - Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); + DriverManager.getConnection( + Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); Statement statement = connection.createStatement()) { boolean hasResultSet = - statement.execute("select * from root.sg1.d1 where time >= 9 and time <= 33 or s5 = 'aligned_test36' or s5 = 'aligned_test37'"); + statement.execute( + "select * from root.sg1.d1 where time >= 9 and time <= 33 or s5 = 'aligned_test36' or s5 = 'aligned_test37'"); Assert.assertTrue(hasResultSet); try (ResultSet resultSet = statement.getResultSet()) { @@ -521,31 +539,33 @@ public class IoTDBRawQueryWithValueFilterIT { String[] retArray = new String[] { - "1,1.0,true,aligned_test1", - "2,2.0,null,aligned_test2", - "4,4.0,true,aligned_test4", - "5,5.0,true,aligned_test5", - "6,6.0,true,null", - "7,7.0,false,aligned_test7", - "8,8.0,null,aligned_test8", - "9,9.0,false,aligned_test9", - "11,11.0,null,null", - "12,12.0,null,null", - "14,14.0,null,null", - "15,15.0,null,null", - "16,16.0,null,null", - "34,null,null,aligned_test34", + "1,1.0,true,aligned_test1", + "2,2.0,null,aligned_test2", + "4,4.0,true,aligned_test4", + "5,5.0,true,aligned_test5", + "6,6.0,true,null", + "7,7.0,false,aligned_test7", + "8,8.0,null,aligned_test8", + "9,9.0,false,aligned_test9", + "11,11.0,null,null", + "12,12.0,null,null", + "14,14.0,null,null", + "15,15.0,null,null", + "16,16.0,null,null", + "34,null,null,aligned_test34", }; String[] columnNames = {"root.sg1.d1.s1", "root.sg1.d1.s4", "root.sg1.d1.s5"}; Class.forName(Config.JDBC_DRIVER_NAME); try (Connection connection = - DriverManager.getConnection( - Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); + DriverManager.getConnection( + Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); Statement statement = connection.createStatement()) { - boolean hasResultSet = statement.execute("select s1,s4,s5 from root.sg1.d1 where s1 < 17 or s5 = 'aligned_test34'"); + boolean hasResultSet = + statement.execute( + "select s1,s4,s5 from root.sg1.d1 where s1 < 17 or s5 = 'aligned_test34'"); Assert.assertTrue(hasResultSet); try (ResultSet resultSet = statement.getResultSet()) { @@ -580,19 +600,19 @@ public class IoTDBRawQueryWithValueFilterIT { String[] retArray = new String[] { - "7,7.0,false", - "9,9.0,false", + "7,7.0,false", "9,9.0,false", }; String[] columnNames = {"root.sg1.d1.s1", "root.sg1.d1.s4"}; Class.forName(Config.JDBC_DRIVER_NAME); try (Connection connection = - DriverManager.getConnection( - Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); + DriverManager.getConnection( + Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); Statement statement = connection.createStatement()) { - boolean hasResultSet = statement.execute("select s1,s4 from root.sg1.d1 where s1 < 19 and s4 = false"); + boolean hasResultSet = + statement.execute("select s1,s4 from root.sg1.d1 where s1 < 19 and s4 = false"); Assert.assertTrue(hasResultSet); try (ResultSet resultSet = statement.getResultSet()) { @@ -627,24 +647,25 @@ public class IoTDBRawQueryWithValueFilterIT { String[] retArray = new String[] { - "23,230000.0,false,null", - "26,null,false,null", - "27,null,false,null", - "28,null,false,null", - "29,null,false,null", - "30,null,false,null", + "23,230000.0,false,null", + "26,null,false,null", + "27,null,false,null", + "28,null,false,null", + "29,null,false,null", + "30,null,false,null", }; String[] columnNames = {"root.sg1.d1.s1", "root.sg1.d1.s4", "root.sg1.d1.s5"}; Class.forName(Config.JDBC_DRIVER_NAME); try (Connection connection = - DriverManager.getConnection( - Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); + DriverManager.getConnection( + Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); Statement statement = connection.createStatement()) { boolean hasResultSet = - statement.execute("select s1,s4,s5 from root.sg1.d1 where time >= 16 and time <= 34 and s4=false"); + statement.execute( + "select s1,s4,s5 from root.sg1.d1 where time >= 16 and time <= 34 and s4=false"); Assert.assertTrue(hasResultSet); try (ResultSet resultSet = statement.getResultSet()) { @@ -675,33 +696,34 @@ public class IoTDBRawQueryWithValueFilterIT { } @Test - public void selectSomeAlignedAndNonAlignedWithTimeAndValueFilterTest() throws ClassNotFoundException { + public void selectSomeAlignedAndNonAlignedWithTimeAndValueFilterTest() + throws ClassNotFoundException { String[] retArray = new String[] { - "18,null,null,18.0,null,null,18.0", - "19,null,null,19.0,null,null,19.0", - "20,null,null,20.0,null,null,20.0", - "21,null,true,null,null,true,null", - "22,null,true,null,null,true,null", - "23,null,false,null,null,true,230000.0", - "24,null,true,null,null,true,null", - "25,null,true,null,null,true,null", + "18,null,null,18.0,null,null,18.0", + "19,null,null,19.0,null,null,19.0", + "20,null,null,20.0,null,null,20.0", + "21,null,true,null,null,true,null", + "22,null,true,null,null,true,null", + "23,null,false,null,null,true,230000.0", + "24,null,true,null,null,true,null", + "25,null,true,null,null,true,null", }; String[] columnNames = { - "root.sg1.d2.s5", - "root.sg1.d1.s4", - "root.sg1.d2.s1", - "root.sg1.d1.s5", - "root.sg1.d2.s4", - "root.sg1.d1.s1" + "root.sg1.d2.s5", + "root.sg1.d1.s4", + "root.sg1.d2.s1", + "root.sg1.d1.s5", + "root.sg1.d2.s4", + "root.sg1.d1.s1" }; Class.forName(Config.JDBC_DRIVER_NAME); try (Connection connection = - DriverManager.getConnection( - Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); + DriverManager.getConnection( + Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); Statement statement = connection.createStatement()) { // 1 4 5 diff --git a/server/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBRawQueryWithValueFilterWithDeletion2IT.java b/server/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBRawQueryWithValueFilterWithDeletion2IT.java index 19817e6..490643a 100644 --- a/server/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBRawQueryWithValueFilterWithDeletion2IT.java +++ b/server/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBRawQueryWithValueFilterWithDeletion2IT.java @@ -18,17 +18,20 @@ */ package org.apache.iotdb.db.integration.aligned; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.Statement; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.utils.EnvironmentUtils; import org.apache.iotdb.jdbc.Config; import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; + import org.junit.AfterClass; import org.junit.BeforeClass; -public class IoTDBRawQueryWithValueFilterWithDeletion2IT extends IoTDBRawQueryWithValueFilterWithDeletionIT{ +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.Statement; + +public class IoTDBRawQueryWithValueFilterWithDeletion2IT + extends IoTDBRawQueryWithValueFilterWithDeletionIT { private static int numOfPointsPerPage; @@ -45,14 +48,14 @@ public class IoTDBRawQueryWithValueFilterWithDeletion2IT extends IoTDBRawQueryWi IoTDBDescriptor.getInstance().getConfig().isEnableCrossSpaceCompaction(); numOfPointsPerPage = TSFileDescriptor.getInstance().getConfig().getMaxNumberOfPointsInPage(); IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false); - IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false); - IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false); + IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false); + IoTDBDescriptor.getInstance().getConfig().setEnableCrossSpaceCompaction(false); TSFileDescriptor.getInstance().getConfig().setMaxNumberOfPointsInPage(3); AlignedWriteUtil.insertData(); Class.forName(Config.JDBC_DRIVER_NAME); try (Connection connection = - DriverManager.getConnection( - Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); + DriverManager.getConnection( + Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); Statement statement = connection.createStatement()) { // TODO currently aligned data in memory doesn't support deletion, so we flush all data to // disk before doing deletion @@ -69,10 +72,10 @@ public class IoTDBRawQueryWithValueFilterWithDeletion2IT extends IoTDBRawQueryWi IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(enableSeqSpaceCompaction); IoTDBDescriptor.getInstance() .getConfig() - .setEnableSeqSpaceCompaction(enableUnseqSpaceCompaction); + .setEnableUnseqSpaceCompaction(enableUnseqSpaceCompaction); IoTDBDescriptor.getInstance() .getConfig() - .setEnableSeqSpaceCompaction(enableCrossSpaceCompaction); + .setEnableCrossSpaceCompaction(enableCrossSpaceCompaction); TSFileDescriptor.getInstance().getConfig().setMaxNumberOfPointsInPage(numOfPointsPerPage); EnvironmentUtils.cleanEnv(); } diff --git a/server/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBRawQueryWithValueFilterWithDeletionIT.java b/server/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBRawQueryWithValueFilterWithDeletionIT.java index e81d967..a1ce64c 100644 --- a/server/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBRawQueryWithValueFilterWithDeletionIT.java +++ b/server/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBRawQueryWithValueFilterWithDeletionIT.java @@ -18,8 +18,14 @@ */ package org.apache.iotdb.db.integration.aligned; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import org.apache.iotdb.db.conf.IoTDBDescriptor; +import org.apache.iotdb.db.utils.EnvironmentUtils; +import org.apache.iotdb.jdbc.Config; + +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; import java.sql.Connection; import java.sql.DriverManager; @@ -29,13 +35,9 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.HashMap; import java.util.Map; -import org.apache.iotdb.db.conf.IoTDBDescriptor; -import org.apache.iotdb.db.utils.EnvironmentUtils; -import org.apache.iotdb.jdbc.Config; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; public class IoTDBRawQueryWithValueFilterWithDeletionIT { @@ -55,14 +57,14 @@ public class IoTDBRawQueryWithValueFilterWithDeletionIT { enableCrossSpaceCompaction = IoTDBDescriptor.getInstance().getConfig().isEnableCrossSpaceCompaction(); IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false); - IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false); - IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false); + IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false); + IoTDBDescriptor.getInstance().getConfig().setEnableCrossSpaceCompaction(false); AlignedWriteUtil.insertData(); Class.forName(Config.JDBC_DRIVER_NAME); try (Connection connection = - DriverManager.getConnection( - Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); + DriverManager.getConnection( + Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); Statement statement = connection.createStatement()) { // TODO currently aligned data in memory doesn't support deletion, so we flush all data to // disk before doing deletion @@ -79,10 +81,10 @@ public class IoTDBRawQueryWithValueFilterWithDeletionIT { IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(enableSeqSpaceCompaction); IoTDBDescriptor.getInstance() .getConfig() - .setEnableSeqSpaceCompaction(enableUnseqSpaceCompaction); + .setEnableUnseqSpaceCompaction(enableUnseqSpaceCompaction); IoTDBDescriptor.getInstance() .getConfig() - .setEnableSeqSpaceCompaction(enableCrossSpaceCompaction); + .setEnableCrossSpaceCompaction(enableCrossSpaceCompaction); EnvironmentUtils.cleanEnv(); } @@ -90,26 +92,26 @@ public class IoTDBRawQueryWithValueFilterWithDeletionIT { public void selectAllAlignedWithValueFilterTest1() throws ClassNotFoundException { String[] retArray = - new String[]{ - "1,null,1,true,aligned_test1", - "3,null,30000,true,aligned_unseq_test3", - "4,null,null,true,aligned_test4", - "5,null,null,true,aligned_test5", - "6,null,6,true,null", - "10,null,10,true,aligned_test10", - "13,null,130000,true,aligned_unseq_test13", - "21,null,21,true,null", - "22,null,22,true,null", - "24,null,24,true,null", - "25,null,25,true,null", + new String[] { + "1,null,1,true,aligned_test1", + "3,null,30000,true,aligned_unseq_test3", + "4,null,null,true,aligned_test4", + "5,null,null,true,aligned_test5", + "6,null,6,true,null", + "10,null,10,true,aligned_test10", + "13,null,130000,true,aligned_unseq_test13", + "21,null,21,true,null", + "22,null,22,true,null", + "24,null,24,true,null", + "25,null,25,true,null", }; String[] columnNames = {"root.sg1.d1.s1", "root.sg1.d1.s3", "root.sg1.d1.s4", "root.sg1.d1.s5"}; Class.forName(Config.JDBC_DRIVER_NAME); try (Connection connection = - DriverManager.getConnection( - Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); + DriverManager.getConnection( + Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); Statement statement = connection.createStatement()) { boolean hasResultSet = statement.execute("select * from root.sg1.d1 where s4 = true"); @@ -146,26 +148,26 @@ public class IoTDBRawQueryWithValueFilterWithDeletionIT { public void selectAllAlignedWithValueFilterTest2() throws ClassNotFoundException { String[] retArray = - new String[]{ - "7,null,7,false,aligned_test7", - "9,null,9,false,aligned_test9", - "26,null,26,false,null", - "27,null,27,false,null", - "28,null,28,false,null", - "29,null,29,false,null", - "30,null,30,false,null", + new String[] { + "7,null,7,false,aligned_test7", + "9,null,9,false,aligned_test9", + "26,null,26,false,null", + "27,null,27,false,null", + "28,null,28,false,null", + "29,null,29,false,null", + "30,null,30,false,null", }; String[] columnNames = {"root.sg1.d1.s1", "root.sg1.d1.s3", "root.sg1.d1.s4", "root.sg1.d1.s5"}; Class.forName(Config.JDBC_DRIVER_NAME); try (Connection connection = - DriverManager.getConnection( - Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); + DriverManager.getConnection( + Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); Statement statement = connection.createStatement()) { - boolean hasResultSet = statement.execute( - "select * from root.sg1.d1 where s4 = false and s3 <= 33"); + boolean hasResultSet = + statement.execute("select * from root.sg1.d1 where s4 = false and s3 <= 33"); Assert.assertTrue(hasResultSet); try (ResultSet resultSet = statement.getResultSet()) { @@ -199,46 +201,47 @@ public class IoTDBRawQueryWithValueFilterWithDeletionIT { public void selectAllAlignedWithValueFilterTest3() throws ClassNotFoundException { String[] retArray = - new String[]{ - "1,null,1,true,aligned_test1", - "2,null,2,null,aligned_test2", - "6,null,6,true,null", - "7,null,7,false,aligned_test7", - "8,null,8,null,aligned_test8", - "9,null,9,false,aligned_test9", - "10,null,10,true,aligned_test10", - "11,null,11,null,null", - "12,null,12,null,null", - "14,null,14,null,null", - "15,null,15,null,null", - "16,null,16,null,null", - "17,null,17,null,null", - "18,null,18,null,null", - "19,null,19,null,null", - "20,null,20,null,null", - "21,null,21,true,null", - "22,null,22,true,null", - "23,230000.0,230000,false,null", - "24,null,24,true,null", - "25,null,25,true,null", - "26,null,26,false,null", - "27,null,27,false,null", - "28,null,28,false,null", - "29,null,29,false,null", - "30,null,30,false,null", - "40,null,null,null,aligned_test40", + new String[] { + "1,null,1,true,aligned_test1", + "2,null,2,null,aligned_test2", + "6,null,6,true,null", + "7,null,7,false,aligned_test7", + "8,null,8,null,aligned_test8", + "9,null,9,false,aligned_test9", + "10,null,10,true,aligned_test10", + "11,null,11,null,null", + "12,null,12,null,null", + "14,null,14,null,null", + "15,null,15,null,null", + "16,null,16,null,null", + "17,null,17,null,null", + "18,null,18,null,null", + "19,null,19,null,null", + "20,null,20,null,null", + "21,null,21,true,null", + "22,null,22,true,null", + "23,230000.0,230000,false,null", + "24,null,24,true,null", + "25,null,25,true,null", + "26,null,26,false,null", + "27,null,27,false,null", + "28,null,28,false,null", + "29,null,29,false,null", + "30,null,30,false,null", + "40,null,null,null,aligned_test40", }; String[] columnNames = {"root.sg1.d1.s1", "root.sg1.d1.s3", "root.sg1.d1.s4", "root.sg1.d1.s5"}; Class.forName(Config.JDBC_DRIVER_NAME); try (Connection connection = - DriverManager.getConnection( - Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); + DriverManager.getConnection( + Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); Statement statement = connection.createStatement()) { - boolean hasResultSet = statement.execute( - "select * from root.sg1.d1 where s5 = 'aligned_test40' or s4 = false or s3 <= 33"); + boolean hasResultSet = + statement.execute( + "select * from root.sg1.d1 where s5 = 'aligned_test40' or s4 = false or s3 <= 33"); Assert.assertTrue(hasResultSet); try (ResultSet resultSet = statement.getResultSet()) { @@ -272,45 +275,46 @@ public class IoTDBRawQueryWithValueFilterWithDeletionIT { public void selectAllAlignedAndNonAlignedTest1() throws ClassNotFoundException { String[] retArray = - new String[]{ - "3,null,30000,true,aligned_unseq_test3,3.0,null,3,false,non_aligned_test3", - "13,null,130000,true,aligned_unseq_test13,13.0,13,13,null,null", - "17,null,17,null,null,17.0,17,17,null,null", - "18,null,18,null,null,18.0,18,18,null,null", - "19,null,19,null,null,19.0,19,19,null,null", - "20,null,20,null,null,20.0,20,20,null,null", - "21,null,21,true,null,null,null,21,true,null", - "22,null,22,true,null,null,null,22,true,null", - "23,230000.0,230000,false,null,null,null,23,true,null", - "24,null,24,true,null,null,null,24,true,null", - "25,null,25,true,null,null,null,25,true,null", - "26,null,26,false,null,null,null,26,false,null", - "27,null,27,false,null,null,null,27,false,null", - "28,null,28,false,null,null,null,28,false,null", - "29,null,29,false,null,null,null,29,false,null", - "30,null,30,false,null,null,null,30,false,null", + new String[] { + "3,null,30000,true,aligned_unseq_test3,3.0,null,3,false,non_aligned_test3", + "13,null,130000,true,aligned_unseq_test13,13.0,13,13,null,null", + "17,null,17,null,null,17.0,17,17,null,null", + "18,null,18,null,null,18.0,18,18,null,null", + "19,null,19,null,null,19.0,19,19,null,null", + "20,null,20,null,null,20.0,20,20,null,null", + "21,null,21,true,null,null,null,21,true,null", + "22,null,22,true,null,null,null,22,true,null", + "23,230000.0,230000,false,null,null,null,23,true,null", + "24,null,24,true,null,null,null,24,true,null", + "25,null,25,true,null,null,null,25,true,null", + "26,null,26,false,null,null,null,26,false,null", + "27,null,27,false,null,null,null,27,false,null", + "28,null,28,false,null,null,null,28,false,null", + "29,null,29,false,null,null,null,29,false,null", + "30,null,30,false,null,null,null,30,false,null", }; String[] columnNames = { - "root.sg1.d1.s1", - "root.sg1.d1.s3", - "root.sg1.d1.s4", - "root.sg1.d1.s5", - "root.sg1.d2.s1", - "root.sg1.d2.s2", - "root.sg1.d2.s3", - "root.sg1.d2.s4", - "root.sg1.d2.s5" + "root.sg1.d1.s1", + "root.sg1.d1.s3", + "root.sg1.d1.s4", + "root.sg1.d1.s5", + "root.sg1.d2.s1", + "root.sg1.d2.s2", + "root.sg1.d2.s3", + "root.sg1.d2.s4", + "root.sg1.d2.s5" }; Class.forName(Config.JDBC_DRIVER_NAME); try (Connection connection = - DriverManager.getConnection( - Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); + DriverManager.getConnection( + Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); Statement statement = connection.createStatement()) { - boolean hasResultSet = statement.execute( - "select * from root.sg1.* where root.sg1.d1.s3 > 16 and root.sg1.d2.s3 <= 36"); + boolean hasResultSet = + statement.execute( + "select * from root.sg1.* where root.sg1.d1.s3 > 16 and root.sg1.d2.s3 <= 36"); Assert.assertTrue(hasResultSet); try (ResultSet resultSet = statement.getResultSet()) { @@ -344,47 +348,48 @@ public class IoTDBRawQueryWithValueFilterWithDeletionIT { public void selectAllAlignedAndNonAlignedTest2() throws ClassNotFoundException { String[] retArray = - new String[]{ - "3,null,30000,true,aligned_unseq_test3,3.0,null,3,false,non_aligned_test3", - "7,null,7,false,aligned_test7,7.0,7,7,false,non_aligned_test7", - "9,null,9,false,aligned_test9,9.0,9,9,false,non_aligned_test9", - "13,null,130000,true,aligned_unseq_test13,13.0,13,13,null,null", - "17,null,17,null,null,17.0,17,17,null,null", - "18,null,18,null,null,18.0,18,18,null,null", - "19,null,19,null,null,19.0,19,19,null,null", - "20,null,20,null,null,20.0,20,20,null,null", - "21,null,21,true,null,null,null,21,true,null", - "22,null,22,true,null,null,null,22,true,null", - "23,230000.0,230000,false,null,null,null,23,true,null", - "24,null,24,true,null,null,null,24,true,null", - "25,null,25,true,null,null,null,25,true,null", - "26,null,26,false,null,null,null,26,false,null", - "27,null,27,false,null,null,null,27,false,null", - "28,null,28,false,null,null,null,28,false,null", - "29,null,29,false,null,null,null,29,false,null", - "30,null,30,false,null,null,null,30,false,null", + new String[] { + "3,null,30000,true,aligned_unseq_test3,3.0,null,3,false,non_aligned_test3", + "7,null,7,false,aligned_test7,7.0,7,7,false,non_aligned_test7", + "9,null,9,false,aligned_test9,9.0,9,9,false,non_aligned_test9", + "13,null,130000,true,aligned_unseq_test13,13.0,13,13,null,null", + "17,null,17,null,null,17.0,17,17,null,null", + "18,null,18,null,null,18.0,18,18,null,null", + "19,null,19,null,null,19.0,19,19,null,null", + "20,null,20,null,null,20.0,20,20,null,null", + "21,null,21,true,null,null,null,21,true,null", + "22,null,22,true,null,null,null,22,true,null", + "23,230000.0,230000,false,null,null,null,23,true,null", + "24,null,24,true,null,null,null,24,true,null", + "25,null,25,true,null,null,null,25,true,null", + "26,null,26,false,null,null,null,26,false,null", + "27,null,27,false,null,null,null,27,false,null", + "28,null,28,false,null,null,null,28,false,null", + "29,null,29,false,null,null,null,29,false,null", + "30,null,30,false,null,null,null,30,false,null", }; String[] columnNames = { - "root.sg1.d1.s1", - "root.sg1.d1.s3", - "root.sg1.d1.s4", - "root.sg1.d1.s5", - "root.sg1.d2.s1", - "root.sg1.d2.s2", - "root.sg1.d2.s3", - "root.sg1.d2.s4", - "root.sg1.d2.s5" + "root.sg1.d1.s1", + "root.sg1.d1.s3", + "root.sg1.d1.s4", + "root.sg1.d1.s5", + "root.sg1.d2.s1", + "root.sg1.d2.s2", + "root.sg1.d2.s3", + "root.sg1.d2.s4", + "root.sg1.d2.s5" }; Class.forName(Config.JDBC_DRIVER_NAME); try (Connection connection = - DriverManager.getConnection( - Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); + DriverManager.getConnection( + Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); Statement statement = connection.createStatement()) { - boolean hasResultSet = statement.execute( - "select * from root.sg1.* where root.sg1.d1.s3 > 16 or root.sg1.d2.s4 = false"); + boolean hasResultSet = + statement.execute( + "select * from root.sg1.* where root.sg1.d1.s3 > 16 or root.sg1.d2.s4 = false"); Assert.assertTrue(hasResultSet); try (ResultSet resultSet = statement.getResultSet()) { @@ -418,33 +423,33 @@ public class IoTDBRawQueryWithValueFilterWithDeletionIT { public void selectAllAlignedWithTimeAndValueFilterTest1() throws ClassNotFoundException { String[] retArray = - new String[]{ - "9,null,9,false,aligned_test9", - "10,null,10,true,aligned_test10", - "11,null,11,null,null", - "12,null,12,null,null", - "14,null,14,null,null", - "15,null,15,null,null", - "16,null,16,null,null", - "17,null,17,null,null", - "18,null,18,null,null", - "19,null,19,null,null", - "20,null,20,null,null", - "21,null,21,true,null", - "22,null,22,true,null", - "24,null,24,true,null", - "25,null,25,true,null", - "26,null,26,false,null", - "27,null,27,false,null", - "28,null,28,false,null", + new String[] { + "9,null,9,false,aligned_test9", + "10,null,10,true,aligned_test10", + "11,null,11,null,null", + "12,null,12,null,null", + "14,null,14,null,null", + "15,null,15,null,null", + "16,null,16,null,null", + "17,null,17,null,null", + "18,null,18,null,null", + "19,null,19,null,null", + "20,null,20,null,null", + "21,null,21,true,null", + "22,null,22,true,null", + "24,null,24,true,null", + "25,null,25,true,null", + "26,null,26,false,null", + "27,null,27,false,null", + "28,null,28,false,null", }; String[] columnNames = {"root.sg1.d1.s1", "root.sg1.d1.s3", "root.sg1.d1.s4", "root.sg1.d1.s5"}; Class.forName(Config.JDBC_DRIVER_NAME); try (Connection connection = - DriverManager.getConnection( - Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); + DriverManager.getConnection( + Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); Statement statement = connection.createStatement()) { boolean hasResultSet = @@ -482,42 +487,42 @@ public class IoTDBRawQueryWithValueFilterWithDeletionIT { public void selectAllAlignedWithTimeAndValueFilterTest2() throws ClassNotFoundException { String[] retArray = - new String[]{ - "9,null,9,false,aligned_test9", - "10,null,10,true,aligned_test10", - "11,null,11,null,null", - "12,null,12,null,null", - "13,null,130000,true,aligned_unseq_test13", - "14,null,14,null,null", - "15,null,15,null,null", - "16,null,16,null,null", - "17,null,17,null,null", - "18,null,18,null,null", - "19,null,19,null,null", - "20,null,20,null,null", - "21,null,21,true,null", - "22,null,22,true,null", - "23,230000.0,230000,false,null", - "24,null,24,true,null", - "25,null,25,true,null", - "26,null,26,false,null", - "27,null,27,false,null", - "28,null,28,false,null", - "29,null,29,false,null", - "30,null,30,false,null", - "31,null,null,null,aligned_test31", - "32,null,null,null,aligned_test32", - "33,null,null,null,aligned_test33", - "36,null,null,null,aligned_test36", - "37,null,null,null,aligned_test37", + new String[] { + "9,null,9,false,aligned_test9", + "10,null,10,true,aligned_test10", + "11,null,11,null,null", + "12,null,12,null,null", + "13,null,130000,true,aligned_unseq_test13", + "14,null,14,null,null", + "15,null,15,null,null", + "16,null,16,null,null", + "17,null,17,null,null", + "18,null,18,null,null", + "19,null,19,null,null", + "20,null,20,null,null", + "21,null,21,true,null", + "22,null,22,true,null", + "23,230000.0,230000,false,null", + "24,null,24,true,null", + "25,null,25,true,null", + "26,null,26,false,null", + "27,null,27,false,null", + "28,null,28,false,null", + "29,null,29,false,null", + "30,null,30,false,null", + "31,null,null,null,aligned_test31", + "32,null,null,null,aligned_test32", + "33,null,null,null,aligned_test33", + "36,null,null,null,aligned_test36", + "37,null,null,null,aligned_test37", }; String[] columnNames = {"root.sg1.d1.s1", "root.sg1.d1.s3", "root.sg1.d1.s4", "root.sg1.d1.s5"}; Class.forName(Config.JDBC_DRIVER_NAME); try (Connection connection = - DriverManager.getConnection( - Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); + DriverManager.getConnection( + Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); Statement statement = connection.createStatement()) { boolean hasResultSet = @@ -556,28 +561,29 @@ public class IoTDBRawQueryWithValueFilterWithDeletionIT { public void selectSomeAlignedWithValueFilterTest1() throws ClassNotFoundException { String[] retArray = - new String[]{ - "7,null,false,aligned_test7", - "9,null,false,aligned_test9", - "23,230000.0,false,null", - "26,null,false,null", - "27,null,false,null", - "28,null,false,null", - "29,null,false,null", - "30,null,false,null", - "34,null,null,aligned_test34", + new String[] { + "7,null,false,aligned_test7", + "9,null,false,aligned_test9", + "23,230000.0,false,null", + "26,null,false,null", + "27,null,false,null", + "28,null,false,null", + "29,null,false,null", + "30,null,false,null", + "34,null,null,aligned_test34", }; String[] columnNames = {"root.sg1.d1.s1", "root.sg1.d1.s4", "root.sg1.d1.s5"}; Class.forName(Config.JDBC_DRIVER_NAME); try (Connection connection = - DriverManager.getConnection( - Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); + DriverManager.getConnection( + Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); Statement statement = connection.createStatement()) { - boolean hasResultSet = statement.execute( - "select s1,s4,s5 from root.sg1.d1 where s4 = false or s5 = 'aligned_test34'"); + boolean hasResultSet = + statement.execute( + "select s1,s4,s5 from root.sg1.d1 where s4 = false or s5 = 'aligned_test34'"); Assert.assertTrue(hasResultSet); try (ResultSet resultSet = statement.getResultSet()) { @@ -611,20 +617,20 @@ public class IoTDBRawQueryWithValueFilterWithDeletionIT { public void selectSomeAlignedWithValueFilterTest2() throws ClassNotFoundException { String[] retArray = - new String[]{ - "23,230000.0,false", + new String[] { + "23,230000.0,false", }; String[] columnNames = {"root.sg1.d1.s1", "root.sg1.d1.s4"}; Class.forName(Config.JDBC_DRIVER_NAME); try (Connection connection = - DriverManager.getConnection( - Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); + DriverManager.getConnection( + Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); Statement statement = connection.createStatement()) { - boolean hasResultSet = statement.execute( - "select s1,s4 from root.sg1.d1 where s1 > 29 and s4 = false"); + boolean hasResultSet = + statement.execute("select s1,s4 from root.sg1.d1 where s1 > 29 and s4 = false"); Assert.assertTrue(hasResultSet); try (ResultSet resultSet = statement.getResultSet()) { @@ -658,21 +664,21 @@ public class IoTDBRawQueryWithValueFilterWithDeletionIT { public void selectSomeAlignedWithTimeAndValueFilterTest() throws ClassNotFoundException { String[] retArray = - new String[]{ - "23,230000.0,false,null", - "26,null,false,null", - "27,null,false,null", - "28,null,false,null", - "29,null,false,null", - "30,null,false,null", + new String[] { + "23,230000.0,false,null", + "26,null,false,null", + "27,null,false,null", + "28,null,false,null", + "29,null,false,null", + "30,null,false,null", }; String[] columnNames = {"root.sg1.d1.s1", "root.sg1.d1.s4", "root.sg1.d1.s5"}; Class.forName(Config.JDBC_DRIVER_NAME); try (Connection connection = - DriverManager.getConnection( - Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); + DriverManager.getConnection( + Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); Statement statement = connection.createStatement()) { boolean hasResultSet = @@ -712,31 +718,31 @@ public class IoTDBRawQueryWithValueFilterWithDeletionIT { throws ClassNotFoundException { String[] retArray = - new String[]{ - "21,null,true,null,null,true,null", - "22,null,true,null,null,true,null", - "23,null,false,null,null,true,230000.0", - "24,null,true,null,null,true,null", - "25,null,true,null,null,true,null", - "31,non_aligned_test31,null,null,aligned_test31,null,null", - "32,non_aligned_test32,null,null,aligned_test32,null,null", - "33,non_aligned_test33,null,null,aligned_test33,null,null", - "34,non_aligned_test34,null,null,aligned_test34,null,null", + new String[] { + "21,null,true,null,null,true,null", + "22,null,true,null,null,true,null", + "23,null,false,null,null,true,230000.0", + "24,null,true,null,null,true,null", + "25,null,true,null,null,true,null", + "31,non_aligned_test31,null,null,aligned_test31,null,null", + "32,non_aligned_test32,null,null,aligned_test32,null,null", + "33,non_aligned_test33,null,null,aligned_test33,null,null", + "34,non_aligned_test34,null,null,aligned_test34,null,null", }; String[] columnNames = { - "root.sg1.d2.s5", - "root.sg1.d1.s4", - "root.sg1.d2.s1", - "root.sg1.d1.s5", - "root.sg1.d2.s4", - "root.sg1.d1.s1" + "root.sg1.d2.s5", + "root.sg1.d1.s4", + "root.sg1.d2.s1", + "root.sg1.d1.s5", + "root.sg1.d2.s4", + "root.sg1.d1.s1" }; Class.forName(Config.JDBC_DRIVER_NAME); try (Connection connection = - DriverManager.getConnection( - Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); + DriverManager.getConnection( + Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root"); Statement statement = connection.createStatement()) { // 1 4 5 diff --git a/server/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBRawQueryWithoutValueFilter2IT.java b/server/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBRawQueryWithoutValueFilter2IT.java index a22b0eb..7e3f200 100644 --- a/server/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBRawQueryWithoutValueFilter2IT.java +++ b/server/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBRawQueryWithoutValueFilter2IT.java @@ -43,8 +43,8 @@ public class IoTDBRawQueryWithoutValueFilter2IT extends IoTDBRawQueryWithoutValu IoTDBDescriptor.getInstance().getConfig().isEnableCrossSpaceCompaction(); numOfPointsPerPage = TSFileDescriptor.getInstance().getConfig().getMaxNumberOfPointsInPage(); IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false); - IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false); - IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false); + IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false); + IoTDBDescriptor.getInstance().getConfig().setEnableCrossSpaceCompaction(false); TSFileDescriptor.getInstance().getConfig().setMaxNumberOfPointsInPage(3); AlignedWriteUtil.insertData(); } @@ -54,10 +54,10 @@ public class IoTDBRawQueryWithoutValueFilter2IT extends IoTDBRawQueryWithoutValu IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(enableSeqSpaceCompaction); IoTDBDescriptor.getInstance() .getConfig() - .setEnableSeqSpaceCompaction(enableUnseqSpaceCompaction); + .setEnableUnseqSpaceCompaction(enableUnseqSpaceCompaction); IoTDBDescriptor.getInstance() .getConfig() - .setEnableSeqSpaceCompaction(enableCrossSpaceCompaction); + .setEnableCrossSpaceCompaction(enableCrossSpaceCompaction); TSFileDescriptor.getInstance().getConfig().setMaxNumberOfPointsInPage(numOfPointsPerPage); EnvironmentUtils.cleanEnv(); } diff --git a/server/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBRawQueryWithoutValueFilterIT.java b/server/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBRawQueryWithoutValueFilterIT.java index 96bd8a6..80df1db 100644 --- a/server/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBRawQueryWithoutValueFilterIT.java +++ b/server/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBRawQueryWithoutValueFilterIT.java @@ -57,8 +57,8 @@ public class IoTDBRawQueryWithoutValueFilterIT { enableCrossSpaceCompaction = IoTDBDescriptor.getInstance().getConfig().isEnableCrossSpaceCompaction(); IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false); - IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false); - IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false); + IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false); + IoTDBDescriptor.getInstance().getConfig().setEnableCrossSpaceCompaction(false); AlignedWriteUtil.insertData(); } @@ -67,10 +67,10 @@ public class IoTDBRawQueryWithoutValueFilterIT { IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(enableSeqSpaceCompaction); IoTDBDescriptor.getInstance() .getConfig() - .setEnableSeqSpaceCompaction(enableUnseqSpaceCompaction); + .setEnableUnseqSpaceCompaction(enableUnseqSpaceCompaction); IoTDBDescriptor.getInstance() .getConfig() - .setEnableSeqSpaceCompaction(enableCrossSpaceCompaction); + .setEnableCrossSpaceCompaction(enableCrossSpaceCompaction); EnvironmentUtils.cleanEnv(); } diff --git a/server/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBRawQueryWithoutValueFilterWithDeletion2IT.java b/server/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBRawQueryWithoutValueFilterWithDeletion2IT.java index a485cfb..f3377d3 100644 --- a/server/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBRawQueryWithoutValueFilterWithDeletion2IT.java +++ b/server/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBRawQueryWithoutValueFilterWithDeletion2IT.java @@ -49,8 +49,8 @@ public class IoTDBRawQueryWithoutValueFilterWithDeletion2IT IoTDBDescriptor.getInstance().getConfig().isEnableCrossSpaceCompaction(); numOfPointsPerPage = TSFileDescriptor.getInstance().getConfig().getMaxNumberOfPointsInPage(); IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false); - IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false); - IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false); + IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false); + IoTDBDescriptor.getInstance().getConfig().setEnableCrossSpaceCompaction(false); TSFileDescriptor.getInstance().getConfig().setMaxNumberOfPointsInPage(3); AlignedWriteUtil.insertData(); Class.forName(Config.JDBC_DRIVER_NAME); @@ -73,10 +73,10 @@ public class IoTDBRawQueryWithoutValueFilterWithDeletion2IT IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(enableSeqSpaceCompaction); IoTDBDescriptor.getInstance() .getConfig() - .setEnableSeqSpaceCompaction(enableUnseqSpaceCompaction); + .setEnableUnseqSpaceCompaction(enableUnseqSpaceCompaction); IoTDBDescriptor.getInstance() .getConfig() - .setEnableSeqSpaceCompaction(enableCrossSpaceCompaction); + .setEnableCrossSpaceCompaction(enableCrossSpaceCompaction); TSFileDescriptor.getInstance().getConfig().setMaxNumberOfPointsInPage(numOfPointsPerPage); EnvironmentUtils.cleanEnv(); } diff --git a/server/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBRawQueryWithoutValueFilterWithDeletionIT.java b/server/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBRawQueryWithoutValueFilterWithDeletionIT.java index 113e6fd..efa1b4c 100644 --- a/server/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBRawQueryWithoutValueFilterWithDeletionIT.java +++ b/server/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBRawQueryWithoutValueFilterWithDeletionIT.java @@ -57,8 +57,8 @@ public class IoTDBRawQueryWithoutValueFilterWithDeletionIT { enableCrossSpaceCompaction = IoTDBDescriptor.getInstance().getConfig().isEnableCrossSpaceCompaction(); IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false); - IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false); - IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false); + IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false); + IoTDBDescriptor.getInstance().getConfig().setEnableCrossSpaceCompaction(false); AlignedWriteUtil.insertData(); Class.forName(Config.JDBC_DRIVER_NAME); @@ -81,10 +81,10 @@ public class IoTDBRawQueryWithoutValueFilterWithDeletionIT { IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(enableSeqSpaceCompaction); IoTDBDescriptor.getInstance() .getConfig() - .setEnableSeqSpaceCompaction(enableUnseqSpaceCompaction); + .setEnableUnseqSpaceCompaction(enableUnseqSpaceCompaction); IoTDBDescriptor.getInstance() .getConfig() - .setEnableSeqSpaceCompaction(enableCrossSpaceCompaction); + .setEnableCrossSpaceCompaction(enableCrossSpaceCompaction); EnvironmentUtils.cleanEnv(); }
