This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch TYQuery in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 2617771109efa81ec48b1be4217fb5d9a3552402 Merge: b7fe308 932a408 Author: JackieTien97 <[email protected]> AuthorDate: Mon Mar 15 09:18:50 2021 +0800 fix conflicts and format code .github/workflows/client.yml | 30 +- .github/workflows/sonar-coveralls.yml | 14 +- antlr/pom.xml | 19 + .../antlr4/org/apache/iotdb/db/qp/sql/SqlBase.g4 | 2 +- client-cpp/README.md | 6 +- .../resources/conf/iotdb-cluster.properties | 10 +- .../java/org/apache/iotdb/cluster/ClusterMain.java | 7 + .../cluster/client/async/AsyncClientPool.java | 10 +- .../iotdb/cluster/client/sync/SyncClientPool.java | 10 +- .../apache/iotdb/cluster/config/ClusterConfig.java | 15 + .../iotdb/cluster/config/ClusterDescriptor.java | 11 + .../iotdb/cluster/coordinator/Coordinator.java | 27 +- .../apache/iotdb/cluster/metadata/CMManager.java | 40 +- .../cluster/query/ClusterPhysicalGenerator.java | 20 +- .../iotdb/cluster/query/ClusterPlanExecutor.java | 4 + docs/UserGuide/Operation Manual/Kill Query.md | 2 +- .../Operation Manual/UDF User Defined Function.md | 2 +- docs/UserGuide/Server/Cluster Setup.md | 4 +- docs/zh/UserGuide/Operation Manual/Kill Query.md | 2 +- .../Operation Manual/UDF User Defined Function.md | 2 +- docs/zh/UserGuide/Server/Cluster Setup.md | 4 +- example/client-cpp-example/README.md | 2 +- .../apache/iotdb/hadoop/tsfile/TsFileHelper.java | 3 +- hive-connector/pom.xml | 12 +- .../resources/conf/iotdb-engine.properties | 2 +- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 10 +- .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 4 +- .../org/apache/iotdb/db/engine/StorageEngine.java | 3 +- .../db/engine/compaction/TsFileManagement.java | 8 + .../level/LevelCompactionTsFileManagement.java | 31 ++ .../engine/compaction/utils/CompactionUtils.java | 3 + .../iotdb/db/engine/flush/MemTableFlushTask.java | 59 ++- .../iotdb/db/engine/memtable/AbstractMemTable.java | 41 +- .../apache/iotdb/db/engine/memtable/IMemTable.java | 3 +- .../db/engine/memtable/IWritableMemChunk.java | 4 + .../db/engine/memtable/PrimitiveMemTable.java | 5 + .../iotdb/db/engine/memtable/WritableMemChunk.java | 17 + .../db/engine/querycontext/QueryDataSource.java | 7 +- .../engine/storagegroup/StorageGroupProcessor.java | 73 ++- .../db/engine/storagegroup/TsFileProcessor.java | 157 +++--- .../db/engine/storagegroup/TsFileResource.java | 30 +- .../metadata/AlignedTimeseriesException.java | 31 ++ .../org/apache/iotdb/db/metadata/MManager.java | 355 +++++++++++--- .../java/org/apache/iotdb/db/metadata/MTree.java | 301 ++++++++++-- .../org/apache/iotdb/db/metadata/MetaUtils.java | 16 + .../iotdb/db/metadata/logfile/MLogWriter.java | 10 + .../org/apache/iotdb/db/metadata/mnode/MNode.java | 12 + .../iotdb/db/metadata/template/Template.java | 95 ++++ .../apache/iotdb/db/qp/executor/PlanExecutor.java | 29 +- .../org/apache/iotdb/db/qp/logical/Operator.java | 4 +- .../apache/iotdb/db/qp/physical/PhysicalPlan.java | 14 +- .../db/qp/physical/crud/CreateTemplatePlan.java | 239 +++++++++ .../db/qp/physical/crud/InsertTabletPlan.java | 6 +- .../db/qp/physical/crud/SetDeviceTemplatePlan.java | 93 ++++ .../physical/sys/CreateAlignedTimeSeriesPlan.java | 3 - .../iotdb/db/query/context/QueryContext.java | 9 +- .../iotdb/db/query/control/QueryTimeManager.java | 2 +- .../iotdb/db/rescon/PrimitiveArrayManager.java | 8 + .../apache/iotdb/db/rescon/TVListAllocator.java | 13 +- .../org/apache/iotdb/db/service/TSServiceImpl.java | 79 ++- .../iotdb/db/utils/datastructure/TVList.java | 27 ++ .../iotdb/db/utils/datastructure/VectorTVList.java | 539 +++++++++++++++++++++ .../db/engine/memtable/MemTableFlushTaskTest.java | 32 +- .../db/engine/memtable/MemTableTestUtils.java | 58 +++ .../db/engine/memtable/PrimitiveMemTableTest.java | 73 +++ .../storagegroup/StorageGroupProcessorTest.java | 7 +- .../iotdb/db/engine/storagegroup/TTLTest.java | 28 +- .../engine/storagegroup/TsFileProcessorTest.java | 90 +++- .../iotdb/db/integration/IoTDBQueryDemoIT.java | 8 +- .../iotdb/db/metadata/MManagerBasicTest.java | 163 ++++++- .../iotdb/db/metadata/MManagerImproveTest.java | 2 +- .../iotdb/db/qp/physical/InsertTabletPlanTest.java | 166 +++++++ .../db/qp/physical/PhysicalPlanSerializeTest.java | 20 +- .../reader/series/SeriesAggregateReaderTest.java | 20 +- .../reader/series/SeriesReaderByTimestampTest.java | 5 +- .../db/utils/datastructure/VectorTVListTest.java | 105 ++++ .../java/org/apache/iotdb/rpc/TSStatusCode.java | 1 + .../java/org/apache/iotdb/session/Session.java | 54 +++ .../apache/iotdb/session/SessionConnection.java | 40 ++ .../java/org/apache/iotdb/session/SessionUT.java | 47 ++ thrift/pom.xml | 19 + thrift/src/main/thrift/rpc.thrift | 19 + .../tsfile/file/metadata/enums/TSDataType.java | 3 +- .../file/metadata/statistics/Statistics.java | 2 + .../iotdb/tsfile/read/TsFileSequenceReader.java | 15 +- .../apache/iotdb/tsfile/utils/TsPrimitiveType.java | 4 +- .../tsfile/write/chunk/ChunkGroupWriterImpl.java | 3 +- .../apache/iotdb/tsfile/write/record/Tablet.java | 26 +- .../write/schema/VectorMeasurementSchema.java | 9 +- ...easurementChunkMetadataListMapIteratorTest.java | 65 ++- .../zeppelin/iotdb/IoTDBInterpreterTest.java | 2 +- 91 files changed, 3234 insertions(+), 452 deletions(-) diff --cc server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java index 2b5cd02,b774e52..d2568db --- a/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java +++ b/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java @@@ -665,8 -665,10 +665,9 @@@ public class StorageEngine implements I throws StorageEngineException, QueryProcessException { PartialPath fullPath = (PartialPath) seriesExpression.getSeriesPath(); PartialPath deviceId = fullPath.getDevicePath(); - String measurementId = seriesExpression.getSeriesPath().getMeasurement(); StorageGroupProcessor storageGroupProcessor = getProcessor(deviceId); - return storageGroupProcessor.query(fullPath, context, filePathsManager, seriesExpression.getFilter()); + return storageGroupProcessor.query( - deviceId, measurementId, context, filePathsManager, seriesExpression.getFilter()); ++ fullPath, context, filePathsManager, seriesExpression.getFilter()); } /** diff --cc server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java index ff9659b,cb76ce6..ef7f545 --- a/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java +++ b/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java @@@ -274,19 -292,6 +292,18 @@@ public abstract class AbstractMemTable measurement, dataType, encoding, chunkCopy, props, curSize, deletionList); } - + // TODO BY HAONAN HOU + @Override + public ReadOnlyMemChunk query( + String deviceId, + String measurement, + IMeasurementSchema schema, + long timeLowerBound, + List<TimeRange> deletionList) + throws IOException, QueryProcessException, MetadataException { + return null; + } + @Override public void delete( PartialPath originalPath, PartialPath devicePath, long startTimestamp, long endTimestamp) { diff --cc server/src/main/java/org/apache/iotdb/db/engine/memtable/IMemTable.java index e9e9c33,c933dba..389cbde --- a/server/src/main/java/org/apache/iotdb/db/engine/memtable/IMemTable.java +++ b/server/src/main/java/org/apache/iotdb/db/engine/memtable/IMemTable.java @@@ -94,15 -96,6 +96,14 @@@ public interface IMemTable List<TimeRange> deletionList) throws IOException, QueryProcessException, MetadataException; - + ReadOnlyMemChunk query( + String deviceId, + String measurement, + IMeasurementSchema schema, + long timeLowerBound, + List<TimeRange> deletionList) + throws IOException, QueryProcessException, MetadataException; + /** putBack all the memory resources. */ void clear(); diff --cc server/src/main/java/org/apache/iotdb/db/engine/querycontext/QueryDataSource.java index a3fc963,b3dfb98..60a6de5 --- a/server/src/main/java/org/apache/iotdb/db/engine/querycontext/QueryDataSource.java +++ b/server/src/main/java/org/apache/iotdb/db/engine/querycontext/QueryDataSource.java @@@ -19,22 -19,27 +19,21 @@@ package org.apache.iotdb.db.engine.querycontext; - import java.util.List; import org.apache.iotdb.db.engine.storagegroup.TsFileResource; -import org.apache.iotdb.db.metadata.PartialPath; import org.apache.iotdb.tsfile.read.filter.TimeFilter; import org.apache.iotdb.tsfile.read.filter.basic.Filter; import org.apache.iotdb.tsfile.read.filter.operator.AndFilter; + import java.util.List; + public class QueryDataSource { - private PartialPath seriesPath; private List<TsFileResource> seqResources; private List<TsFileResource> unseqResources; /** data older than currentTime - dataTTL should be ignored. */ private long dataTTL = Long.MAX_VALUE; -- public QueryDataSource( - PartialPath seriesPath, -- List<TsFileResource> seqResources, -- List<TsFileResource> unseqResources) { - this.seriesPath = seriesPath; ++ public QueryDataSource(List<TsFileResource> seqResources, List<TsFileResource> unseqResources) { this.seqResources = seqResources; this.unseqResources = unseqResources; } diff --cc server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java index e67b691,1f9d80e..db185fd --- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java +++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java @@@ -1635,12 -1640,14 +1637,7 @@@ public class StorageGroupProcessor } else { tsFileResource .getUnsealedFileProcessor() -- .query( - deviceId, - fullPath.getMeasurement(), - schema, - deviceId.getFullPath(), - measurementId, - schema.getType(), - schema.getEncodingType(), - schema.getProps(), -- context, -- tsfileResourcesForQuery); ++ .query(deviceId, fullPath.getMeasurement(), schema, context, tsfileResourcesForQuery); } } catch (IOException e) { throw new MetadataException(e); diff --cc server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java index 773e5dd,1c0ff40..376779d --- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java +++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java @@@ -73,12 -61,25 +63,24 @@@ import org.apache.iotdb.tsfile.file.met import org.apache.iotdb.tsfile.read.common.TimeRange; import org.apache.iotdb.tsfile.utils.Binary; import org.apache.iotdb.tsfile.utils.Pair; +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.File; + import java.io.IOException; + import java.util.ArrayList; + import java.util.Collection; + import java.util.Iterator; + import java.util.List; -import java.util.Map; + import java.util.Set; + import java.util.concurrent.ConcurrentLinkedDeque; + import java.util.concurrent.locks.ReadWriteLock; + import java.util.concurrent.locks.ReentrantReadWriteLock; + @SuppressWarnings("java:S1135") // ignore todos public class TsFileProcessor { @@@ -1051,8 -1107,10 +1108,8 @@@ * memtables and then compact them into one TimeValuePairSorter). Then get the related * ChunkMetadata of data on disk. * - * @param deviceId device id + * @param deviceId device id * @param measurementId measurements id - * @param dataType data type - * @param encoding encoding */ @SuppressWarnings("squid:S3776") // Suppress high Cognitive Complexity warning public void query( @@@ -1080,11 -1140,13 +1137,7 @@@ flushingMemTable, deviceId, measurementId, context.getQueryTimeLowerBound()); ReadOnlyMemChunk memChunk = flushingMemTable.query( -- deviceId, -- measurementId, - schema, - dataType, - encoding, - props, -- context.getQueryTimeLowerBound(), -- deletionList); ++ deviceId, measurementId, schema, context.getQueryTimeLowerBound(), deletionList); if (memChunk != null) { readOnlyMemChunks.add(memChunk); } @@@ -1092,11 -1154,13 +1145,7 @@@ if (workMemTable != null) { ReadOnlyMemChunk memChunk = workMemTable.query( -- deviceId, -- measurementId, - schema, - dataType, - encoding, - props, -- context.getQueryTimeLowerBound(), -- null); ++ deviceId, measurementId, schema, context.getQueryTimeLowerBound(), null); if (memChunk != null) { readOnlyMemChunks.add(memChunk); } @@@ -1108,33 -1172,8 +1157,33 @@@ modificationFile, new PartialPath(deviceId + IoTDBConstant.PATH_SEPARATOR + measurementId)); - List<ChunkMetadata> chunkMetadataList = - writer.getVisibleMetadataList(deviceId, measurementId, dataType); + List<IChunkMetadata> chunkMetadataList = new ArrayList<>(); + if (schema instanceof VectorMeasurementSchema) { + List<ChunkMetadata> timeChunkMetadataList = + writer.getVisibleMetadataList(deviceId, measurementId, schema.getType()); + List<List<ChunkMetadata>> valueChunkMetadataList = new ArrayList<>(); + List<String> valueMeasurementIdList = schema.getValueMeasurementIdList(); + List<TSDataType> valueDataTypeList = schema.getValueTSDataTypeList(); + for (int i = 0; i < valueMeasurementIdList.size(); i++) { - valueChunkMetadataList.add(writer - .getVisibleMetadataList(deviceId, valueMeasurementIdList.get(i), - valueDataTypeList.get(i))); ++ valueChunkMetadataList.add( ++ writer.getVisibleMetadataList( ++ deviceId, valueMeasurementIdList.get(i), valueDataTypeList.get(i))); + } + - + for (int i = 0; i < timeChunkMetadataList.size(); i++) { + List<IChunkMetadata> valueChunkMetadata = new ArrayList<>(); + for (List<ChunkMetadata> chunkMetadata : valueChunkMetadataList) { + valueChunkMetadata.add(chunkMetadata.get(i)); + } - chunkMetadataList - .add(new VectorChunkMetadata(timeChunkMetadataList.get(i), valueChunkMetadata)); ++ chunkMetadataList.add( ++ new VectorChunkMetadata(timeChunkMetadataList.get(i), valueChunkMetadata)); + } + } else { + chunkMetadataList = - new ArrayList<>(writer.getVisibleMetadataList(deviceId, measurementId, schema.getType())); ++ new ArrayList<>( ++ writer.getVisibleMetadataList(deviceId, measurementId, schema.getType())); + } + QueryUtils.modifyChunkMetaData(chunkMetadataList, modifications); chunkMetadataList.removeIf(context::chunkNotSatisfy); diff --cc server/src/main/java/org/apache/iotdb/db/metadata/MManager.java index f6c6974,3fc3160..d9f19cc --- a/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java +++ b/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java @@@ -1013,17 -1093,6 +1093,16 @@@ public class MManager return null; } + // TODO BY ZESONG SUN - public IMeasurementSchema getSeriesSchema(PartialPath fullPath) - throws MetadataException { ++ public IMeasurementSchema getSeriesSchema(PartialPath fullPath) throws MetadataException { + MNode node = mtree.getNodeByPath(fullPath.getDevicePath()); + MNode leaf = node.getChild(fullPath.getMeasurement()); + if (leaf != null) { + return ((MeasurementMNode) leaf).getSchema(); + } + return null; + } + /** * Get child node path in the next level of the given path. * diff --cc server/src/main/java/org/apache/iotdb/db/query/context/QueryContext.java index 0c53d08,3febfa9..a8c2198 --- a/server/src/main/java/org/apache/iotdb/db/query/context/QueryContext.java +++ b/server/src/main/java/org/apache/iotdb/db/query/context/QueryContext.java @@@ -19,6 -19,11 +19,11 @@@ package org.apache.iotdb.db.query.context; + import org.apache.iotdb.db.engine.modification.Modification; + import org.apache.iotdb.db.engine.modification.ModificationFile; + import org.apache.iotdb.db.metadata.PartialPath; -import org.apache.iotdb.tsfile.file.metadata.ChunkMetadata; ++import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --cc server/src/test/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessorTest.java index 6b64b13,e68c4af..4767a36 --- a/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessorTest.java +++ b/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessorTest.java @@@ -126,7 -125,9 +126,12 @@@ public class StorageGroupProcessorTest tsfileProcessor.query( deviceId, measurementId, - new MeasurementSchema(measurementId, TSDataType.INT32, TSEncoding.RLE, CompressionType.UNCOMPRESSED, Collections.emptyMap()), - TSDataType.INT32, - TSEncoding.RLE, - Collections.emptyMap(), ++ new MeasurementSchema( ++ measurementId, ++ TSDataType.INT32, ++ TSEncoding.RLE, ++ CompressionType.UNCOMPRESSED, ++ Collections.emptyMap()), new QueryContext(), tsfileResourcesForQuery); } diff --cc server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessorTest.java index 276cacd,f972a83..5f43331 --- a/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessorTest.java +++ b/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessorTest.java @@@ -46,8 -36,8 +37,9 @@@ import org.apache.iotdb.tsfile.read.Tim import org.apache.iotdb.tsfile.read.reader.IPointReader; import org.apache.iotdb.tsfile.write.record.TSRecord; import org.apache.iotdb.tsfile.write.record.datapoint.DataPoint; +import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; import org.apache.iotdb.tsfile.write.writer.RestorableTsFileIOWriter; + import org.junit.After; import org.junit.Before; import org.junit.Test; @@@ -104,7 -104,7 +106,12 @@@ public class TsFileProcessorTest SystemInfo.getInstance().reportStorageGroupStatus(sgInfo); List<TsFileResource> tsfileResourcesForQuery = new ArrayList<>(); processor.query( - deviceId, measurementId, new MeasurementSchema(measurementId, dataType, encoding, CompressionType.UNCOMPRESSED, props), context, tsfileResourcesForQuery); - deviceId, measurementId, dataType, encoding, props, context, tsfileResourcesForQuery); ++ deviceId, ++ measurementId, ++ new MeasurementSchema( ++ measurementId, dataType, encoding, CompressionType.UNCOMPRESSED, props), ++ context, ++ tsfileResourcesForQuery); assertTrue(tsfileResourcesForQuery.isEmpty()); for (int i = 1; i <= 100; i++) { @@@ -116,7 -116,7 +123,12 @@@ // query data in memory tsfileResourcesForQuery.clear(); processor.query( - deviceId, measurementId, new MeasurementSchema(measurementId, dataType, encoding, CompressionType.UNCOMPRESSED, props), context, tsfileResourcesForQuery); - deviceId, measurementId, dataType, encoding, props, context, tsfileResourcesForQuery); ++ deviceId, ++ measurementId, ++ new MeasurementSchema( ++ measurementId, dataType, encoding, CompressionType.UNCOMPRESSED, props), ++ context, ++ tsfileResourcesForQuery); assertFalse(tsfileResourcesForQuery.get(0).getReadOnlyMemChunk().isEmpty()); List<ReadOnlyMemChunk> memChunks = tsfileResourcesForQuery.get(0).getReadOnlyMemChunk(); for (ReadOnlyMemChunk chunk : memChunks) { @@@ -134,7 -134,7 +146,12 @@@ tsfileResourcesForQuery.clear(); processor.query( - deviceId, measurementId, new MeasurementSchema(measurementId, dataType, encoding, CompressionType.UNCOMPRESSED, props), context, tsfileResourcesForQuery); - deviceId, measurementId, dataType, encoding, props, context, tsfileResourcesForQuery); ++ deviceId, ++ measurementId, ++ new MeasurementSchema( ++ measurementId, dataType, encoding, CompressionType.UNCOMPRESSED, props), ++ context, ++ tsfileResourcesForQuery); assertTrue(tsfileResourcesForQuery.get(0).getReadOnlyMemChunk().isEmpty()); assertEquals(1, tsfileResourcesForQuery.get(0).getChunkMetadataList().size()); assertEquals( @@@ -166,7 -166,7 +183,12 @@@ SystemInfo.getInstance().reportStorageGroupStatus(sgInfo); List<TsFileResource> tsfileResourcesForQuery = new ArrayList<>(); processor.query( - deviceId, measurementId, new MeasurementSchema(measurementId, dataType, encoding, CompressionType.UNCOMPRESSED, props), context, tsfileResourcesForQuery); - deviceId, measurementId, dataType, encoding, props, context, tsfileResourcesForQuery); ++ deviceId, ++ measurementId, ++ new MeasurementSchema( ++ measurementId, dataType, encoding, CompressionType.UNCOMPRESSED, props), ++ context, ++ tsfileResourcesForQuery); assertTrue(tsfileResourcesForQuery.isEmpty()); for (int i = 1; i <= 100; i++) { @@@ -178,7 -178,7 +200,12 @@@ // query data in memory tsfileResourcesForQuery.clear(); processor.query( - deviceId, measurementId, new MeasurementSchema(measurementId, dataType, encoding, CompressionType.UNCOMPRESSED, props), context, tsfileResourcesForQuery); - deviceId, measurementId, dataType, encoding, props, context, tsfileResourcesForQuery); ++ deviceId, ++ measurementId, ++ new MeasurementSchema( ++ measurementId, dataType, encoding, CompressionType.UNCOMPRESSED, props), ++ context, ++ tsfileResourcesForQuery); assertFalse(tsfileResourcesForQuery.get(0).getReadOnlyMemChunk().isEmpty()); int num = 1; List<ReadOnlyMemChunk> memChunks = tsfileResourcesForQuery.get(0).getReadOnlyMemChunk(); @@@ -197,7 -197,7 +224,12 @@@ tsfileResourcesForQuery.clear(); processor.query( - deviceId, measurementId, new MeasurementSchema(measurementId, dataType, encoding, CompressionType.UNCOMPRESSED, props), context, tsfileResourcesForQuery); - deviceId, measurementId, dataType, encoding, props, context, tsfileResourcesForQuery); ++ deviceId, ++ measurementId, ++ new MeasurementSchema( ++ measurementId, dataType, encoding, CompressionType.UNCOMPRESSED, props), ++ context, ++ tsfileResourcesForQuery); assertTrue(tsfileResourcesForQuery.get(0).getReadOnlyMemChunk().isEmpty()); assertEquals(1, tsfileResourcesForQuery.get(0).getChunkMetadataList().size()); assertEquals( @@@ -254,7 -254,7 +286,12 @@@ SystemInfo.getInstance().reportStorageGroupStatus(sgInfo); List<TsFileResource> tsfileResourcesForQuery = new ArrayList<>(); processor.query( - deviceId, measurementId, new MeasurementSchema(measurementId, dataType, encoding, CompressionType.UNCOMPRESSED, props), context, tsfileResourcesForQuery); - deviceId, measurementId, dataType, encoding, props, context, tsfileResourcesForQuery); ++ deviceId, ++ measurementId, ++ new MeasurementSchema( ++ measurementId, dataType, encoding, CompressionType.UNCOMPRESSED, props), ++ context, ++ tsfileResourcesForQuery); assertTrue(tsfileResourcesForQuery.isEmpty()); for (int flushId = 0; flushId < 10; flushId++) { @@@ -269,7 -269,7 +306,12 @@@ tsfileResourcesForQuery.clear(); processor.query( - deviceId, measurementId, new MeasurementSchema(measurementId, dataType, encoding, CompressionType.UNCOMPRESSED, props), context, tsfileResourcesForQuery); - deviceId, measurementId, dataType, encoding, props, context, tsfileResourcesForQuery); ++ deviceId, ++ measurementId, ++ new MeasurementSchema( ++ measurementId, dataType, encoding, CompressionType.UNCOMPRESSED, props), ++ context, ++ tsfileResourcesForQuery); assertFalse(tsfileResourcesForQuery.isEmpty()); assertTrue(tsfileResourcesForQuery.get(0).getReadOnlyMemChunk().isEmpty()); assertEquals(10, tsfileResourcesForQuery.get(0).getChunkMetadataList().size()); @@@ -302,7 -302,7 +344,12 @@@ List<TsFileResource> tsfileResourcesForQuery = new ArrayList<>(); processor.query( - deviceId, measurementId, new MeasurementSchema(measurementId, dataType, encoding, CompressionType.UNCOMPRESSED, props), context, tsfileResourcesForQuery); - deviceId, measurementId, dataType, encoding, props, context, tsfileResourcesForQuery); ++ deviceId, ++ measurementId, ++ new MeasurementSchema( ++ measurementId, dataType, encoding, CompressionType.UNCOMPRESSED, props), ++ context, ++ tsfileResourcesForQuery); assertTrue(tsfileResourcesForQuery.isEmpty()); for (int i = 1; i <= 100; i++) { @@@ -314,7 -314,7 +361,12 @@@ // query data in memory tsfileResourcesForQuery.clear(); processor.query( - deviceId, measurementId, new MeasurementSchema(measurementId, dataType, encoding, CompressionType.UNCOMPRESSED, props), context, tsfileResourcesForQuery); - deviceId, measurementId, dataType, encoding, props, context, tsfileResourcesForQuery); ++ deviceId, ++ measurementId, ++ new MeasurementSchema( ++ measurementId, dataType, encoding, CompressionType.UNCOMPRESSED, props), ++ context, ++ tsfileResourcesForQuery); assertFalse(tsfileResourcesForQuery.isEmpty()); assertFalse(tsfileResourcesForQuery.get(0).getReadOnlyMemChunk().isEmpty()); List<ReadOnlyMemChunk> memChunks = tsfileResourcesForQuery.get(0).getReadOnlyMemChunk(); diff --cc server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesAggregateReaderTest.java index a713157,55eea5c..a77d592 --- a/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesAggregateReaderTest.java +++ b/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesAggregateReaderTest.java @@@ -46,6 -38,14 +38,16 @@@ import org.junit.After import org.junit.Before; import org.junit.Test; + import java.io.IOException; + import java.util.ArrayList; + import java.util.HashSet; + import java.util.List; + import java.util.Set; + -import static org.junit.Assert.*; ++import static org.junit.Assert.assertEquals; ++import static org.junit.Assert.assertTrue; ++import static org.junit.Assert.fail; + public class SeriesAggregateReaderTest { private static final String SERIES_READER_TEST_SG = "root.seriesReaderTest"; diff --cc server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderByTimestampTest.java index 129f18d,4e71afa..7834017 --- a/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderByTimestampTest.java +++ b/server/src/test/java/org/apache/iotdb/db/query/reader/series/SeriesReaderByTimestampTest.java @@@ -61,10 -61,11 +61,7 @@@ public class SeriesReaderByTimestampTes @Test public void test() throws IOException, IllegalPathException { -- QueryDataSource dataSource = -- new QueryDataSource( - new PartialPath(SERIES_READER_TEST_SG + ".device0.sensor0"), -- seqResources, -- unseqResources); ++ QueryDataSource dataSource = new QueryDataSource(seqResources, unseqResources); Set<String> allSensors = new HashSet<>(); allSensors.add("sensor0");
