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 b8b94774434ae62a11b79e2532ab12394ed67ab5 Author: JackieTien97 <[email protected]> AuthorDate: Fri Mar 12 21:19:18 2021 +0800 format code --- .../cluster/query/reader/ClusterReaderFactory.java | 25 ++++--- .../query/reader/series/SeriesAggregateReader.java | 14 +++- .../reader/series/SeriesRawDataBatchReader.java | 28 ++++++-- .../iotdb/db/query/reader/series/SeriesReader.java | 21 +++--- .../reader/series/SeriesReaderByTimestamp.java | 19 ++++-- .../query/reader/series/SeriesReaderFactory.java | 66 ++++++++++++++---- .../db/query/reader/series/VectorSeriesReader.java | 79 ++++++++++++++-------- 7 files changed, 178 insertions(+), 74 deletions(-) diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/ClusterReaderFactory.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/ClusterReaderFactory.java index 2d29033..1ddf5c8 100644 --- a/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/ClusterReaderFactory.java +++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/ClusterReaderFactory.java @@ -208,7 +208,7 @@ public class ClusterReaderFactory { * each group a series reader will be created, and finally all such readers will be merged into * one. * - * @param timeFilter nullable, when null, all data groups will be queried + * @param timeFilter nullable, when null, all data groups will be queried * @param valueFilter nullable */ public ManagedSeriesReader getSeriesReader( @@ -254,7 +254,7 @@ public class ClusterReaderFactory { * "partitionGroup" contains the local node, a local reader will be returned. Otherwise a remote * reader will be returned. * - * @param timeFilter nullable + * @param timeFilter nullable * @param valueFilter nullable */ private IPointReader getSeriesReader( @@ -314,7 +314,7 @@ public class ClusterReaderFactory { * * @param path * @param dataType - * @param timeFilter nullable + * @param timeFilter nullable * @param valueFilter nullable * @param context * @return @@ -354,7 +354,7 @@ public class ClusterReaderFactory { * * @param path * @param dataType - * @param timeFilter nullable + * @param timeFilter nullable * @param valueFilter nullable * @param context * @return @@ -375,9 +375,16 @@ public class ClusterReaderFactory { ((SlotPartitionTable) metaGroupMember.getPartitionTable()).getNodeSlots(header); QueryDataSource queryDataSource = QueryResourceManager.getInstance().getQueryDataSource(path, context, timeFilter); - return SeriesReaderFactory - .createSeriesReader(path, allSensors, dataType, context, queryDataSource, timeFilter, - valueFilter, new SlotTsFileFilter(nodeSlots), ascending); + return SeriesReaderFactory.createSeriesReader( + path, + allSensors, + dataType, + context, + queryDataSource, + timeFilter, + valueFilter, + new SlotTsFileFilter(nodeSlots), + ascending); } /** @@ -386,7 +393,7 @@ public class ClusterReaderFactory { * the id of the reader will be returned so that we can fetch data from that node using the reader * id. * - * @param timeFilter nullable + * @param timeFilter nullable * @param valueFilter nullable */ private IPointReader getRemoteSeriesPointReader( @@ -665,7 +672,7 @@ public class ClusterReaderFactory { * * @param path * @param dataType - * @param timeFilter nullable + * @param timeFilter nullable * @param valueFilter nullable * @param context * @return an IBatchReader or null if there is no satisfying data diff --git a/server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesAggregateReader.java b/server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesAggregateReader.java index d87aa26..a76327d 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesAggregateReader.java +++ b/server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesAggregateReader.java @@ -44,9 +44,17 @@ public class SeriesAggregateReader implements IAggregateReader { Filter valueFilter, TsFileFilter fileFilter, boolean ascending) { - this.seriesReader = SeriesReaderFactory - .createSeriesReader(seriesPath, allSensors, dataType, context, dataSource, timeFilter, - valueFilter, fileFilter, ascending); + this.seriesReader = + SeriesReaderFactory.createSeriesReader( + seriesPath, + allSensors, + dataType, + context, + dataSource, + timeFilter, + valueFilter, + fileFilter, + ascending); } @Override diff --git a/server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesRawDataBatchReader.java b/server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesRawDataBatchReader.java index 7be1fb2..d53db04 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesRawDataBatchReader.java +++ b/server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesRawDataBatchReader.java @@ -57,9 +57,17 @@ public class SeriesRawDataBatchReader implements ManagedSeriesReader { Filter valueFilter, TsFileFilter fileFilter, boolean ascending) { - this.seriesReader = SeriesReaderFactory - .createSeriesReader(seriesPath, allSensors, dataType, context, dataSource, timeFilter, - valueFilter, fileFilter, ascending); + this.seriesReader = + SeriesReaderFactory.createSeriesReader( + seriesPath, + allSensors, + dataType, + context, + dataSource, + timeFilter, + valueFilter, + fileFilter, + ascending); } @TestOnly @@ -75,9 +83,17 @@ public class SeriesRawDataBatchReader implements ManagedSeriesReader { boolean ascending) { Set<String> allSensors = new HashSet<>(); allSensors.add(seriesPath.getMeasurement()); - this.seriesReader = SeriesReaderFactory - .createSeriesReader(seriesPath, allSensors, dataType, context, seqFileResource, - unseqFileResource, timeFilter, valueFilter, ascending); + this.seriesReader = + SeriesReaderFactory.createSeriesReader( + seriesPath, + allSensors, + dataType, + context, + seqFileResource, + unseqFileResource, + timeFilter, + valueFilter, + ascending); } /** 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 1051a24..080e2ab 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.conf.IoTDBDescriptor; import org.apache.iotdb.db.engine.querycontext.QueryDataSource; import org.apache.iotdb.db.engine.storagegroup.TsFileResource; @@ -54,6 +44,17 @@ import org.apache.iotdb.tsfile.read.filter.basic.Filter; import org.apache.iotdb.tsfile.read.filter.basic.UnaryFilter; import org.apache.iotdb.tsfile.read.reader.IPageReader; +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/main/java/org/apache/iotdb/db/query/reader/series/SeriesReaderByTimestamp.java b/server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesReaderByTimestamp.java index 2063e71..053ffa3 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesReaderByTimestamp.java +++ b/server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesReaderByTimestamp.java @@ -18,8 +18,6 @@ */ package org.apache.iotdb.db.query.reader.series; -import java.io.IOException; -import java.util.Set; import org.apache.iotdb.db.engine.querycontext.QueryDataSource; import org.apache.iotdb.db.metadata.PartialPath; import org.apache.iotdb.db.query.context.QueryContext; @@ -30,6 +28,9 @@ import org.apache.iotdb.tsfile.read.common.BatchData; import org.apache.iotdb.tsfile.read.filter.TimeFilter; import org.apache.iotdb.tsfile.read.filter.basic.UnaryFilter; +import java.io.IOException; +import java.util.Set; + public class SeriesReaderByTimestamp implements IReaderByTimestamp { private SeriesReader seriesReader; @@ -46,9 +47,17 @@ public class SeriesReaderByTimestamp implements IReaderByTimestamp { boolean ascending) { UnaryFilter timeFilter = ascending ? TimeFilter.gtEq(Long.MIN_VALUE) : TimeFilter.ltEq(Long.MAX_VALUE); - this.seriesReader = SeriesReaderFactory - .createSeriesReader(seriesPath, allSensors, dataType, context, dataSource, timeFilter, null, - fileFilter, ascending); + this.seriesReader = + SeriesReaderFactory.createSeriesReader( + seriesPath, + allSensors, + dataType, + context, + dataSource, + timeFilter, + null, + fileFilter, + ascending); this.ascending = ascending; } diff --git a/server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesReaderFactory.java b/server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesReaderFactory.java index 562cb2d..f0a1a47 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesReaderFactory.java +++ b/server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesReaderFactory.java @@ -18,8 +18,6 @@ */ package org.apache.iotdb.db.query.reader.series; -import java.util.List; -import java.util.Set; import org.apache.iotdb.db.engine.querycontext.QueryDataSource; import org.apache.iotdb.db.engine.storagegroup.TsFileResource; import org.apache.iotdb.db.metadata.PartialPath; @@ -29,25 +27,65 @@ import org.apache.iotdb.db.query.filter.TsFileFilter; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.read.filter.basic.Filter; +import java.util.List; +import java.util.Set; + public class SeriesReaderFactory { - public static SeriesReader createSeriesReader(PartialPath seriesPath, Set<String> allSensors, - TSDataType dataType, QueryContext context, QueryDataSource dataSource, Filter timeFilter, - Filter valueFilter, TsFileFilter fileFilter, boolean ascending) { + public static SeriesReader createSeriesReader( + PartialPath seriesPath, + Set<String> allSensors, + TSDataType dataType, + QueryContext context, + QueryDataSource dataSource, + Filter timeFilter, + Filter valueFilter, + TsFileFilter fileFilter, + boolean ascending) { if (seriesPath instanceof VectorPartialPath) { - return new VectorSeriesReader(seriesPath, allSensors, dataType, context, dataSource, - timeFilter, valueFilter, fileFilter, ascending); + return new VectorSeriesReader( + seriesPath, + allSensors, + dataType, + context, + dataSource, + timeFilter, + valueFilter, + fileFilter, + ascending); } else { - return new SeriesReader(seriesPath, allSensors, dataType, context, dataSource, timeFilter, - valueFilter, fileFilter, ascending); + return new SeriesReader( + seriesPath, + allSensors, + dataType, + context, + dataSource, + timeFilter, + valueFilter, + fileFilter, + ascending); } } - public static SeriesReader createSeriesReader(PartialPath seriesPath, Set<String> allSensors, - TSDataType dataType, QueryContext context, List<TsFileResource> seqFileResource, - List<TsFileResource> unseqFileResource, Filter timeFilter, Filter valueFilter, + public static SeriesReader createSeriesReader( + PartialPath seriesPath, + Set<String> allSensors, + TSDataType dataType, + QueryContext context, + List<TsFileResource> seqFileResource, + List<TsFileResource> unseqFileResource, + Filter timeFilter, + Filter valueFilter, boolean ascending) { - return new SeriesReader(seriesPath, allSensors, dataType, context, seqFileResource, - unseqFileResource, timeFilter, valueFilter, ascending); + return new SeriesReader( + seriesPath, + allSensors, + dataType, + context, + seqFileResource, + unseqFileResource, + timeFilter, + valueFilter, + ascending); } } diff --git a/server/src/main/java/org/apache/iotdb/db/query/reader/series/VectorSeriesReader.java b/server/src/main/java/org/apache/iotdb/db/query/reader/series/VectorSeriesReader.java index 29e7d13..265bb5e 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/reader/series/VectorSeriesReader.java +++ b/server/src/main/java/org/apache/iotdb/db/query/reader/series/VectorSeriesReader.java @@ -18,11 +18,6 @@ */ package org.apache.iotdb.db.query.reader.series; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Set; import org.apache.iotdb.db.engine.querycontext.QueryDataSource; import org.apache.iotdb.db.engine.storagegroup.TsFileResource; import org.apache.iotdb.db.metadata.PartialPath; @@ -36,70 +31,100 @@ import org.apache.iotdb.tsfile.file.metadata.VectorTimeSeriesMetadata; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.read.filter.basic.Filter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Set; + public class VectorSeriesReader extends SeriesReader { private final VectorPartialPath vectorPartialPath; - public VectorSeriesReader(PartialPath seriesPath, + public VectorSeriesReader( + PartialPath seriesPath, Set<String> allSensors, TSDataType dataType, QueryContext context, QueryDataSource dataSource, Filter timeFilter, Filter valueFilter, - TsFileFilter fileFilter, boolean ascending) { - super(seriesPath, allSensors, dataType, context, dataSource, timeFilter, valueFilter, + TsFileFilter fileFilter, + boolean ascending) { + super( + seriesPath, + allSensors, + dataType, + context, + dataSource, + timeFilter, + valueFilter, fileFilter, ascending); this.vectorPartialPath = (VectorPartialPath) seriesPath; } @TestOnly - VectorSeriesReader(PartialPath seriesPath, Set<String> allSensors, - TSDataType dataType, QueryContext context, + VectorSeriesReader( + PartialPath seriesPath, + Set<String> allSensors, + TSDataType dataType, + QueryContext context, List<TsFileResource> seqFileResource, List<TsFileResource> unseqFileResource, - Filter timeFilter, Filter valueFilter, boolean ascending) { - super(seriesPath, allSensors, dataType, context, seqFileResource, unseqFileResource, timeFilter, - valueFilter, ascending); + Filter timeFilter, + Filter valueFilter, + boolean ascending) { + super( + seriesPath, + allSensors, + dataType, + context, + seqFileResource, + unseqFileResource, + timeFilter, + valueFilter, + ascending); this.vectorPartialPath = (VectorPartialPath) seriesPath; } protected void unpackSeqTsFileResource() throws IOException { TsFileResource resource = orderUtils.getNextSeqFileResource(seqFileResource, true); - TimeseriesMetadata timeseriesMetadata = FileLoaderUtils - .loadTimeSeriesMetadata(resource, vectorPartialPath, context, getAnyFilter(), allSensors); + TimeseriesMetadata timeseriesMetadata = + FileLoaderUtils.loadTimeSeriesMetadata( + resource, vectorPartialPath, context, getAnyFilter(), allSensors); if (timeseriesMetadata != null) { timeseriesMetadata.setSeq(true); List<TimeseriesMetadata> valueTimeseriesMetadataList = new ArrayList<>(); for (PartialPath subSensor : vectorPartialPath.getSubSensorsPathList()) { - TimeseriesMetadata valueTimeSeriesMetadata = FileLoaderUtils - .loadTimeSeriesMetadata(resource, subSensor, context, getAnyFilter(), - Collections.emptySet()); + TimeseriesMetadata valueTimeSeriesMetadata = + FileLoaderUtils.loadTimeSeriesMetadata( + resource, subSensor, context, getAnyFilter(), Collections.emptySet()); if (valueTimeSeriesMetadata == null) { throw new IOException("File contains value"); } valueTimeSeriesMetadata.setSeq(true); valueTimeseriesMetadataList.add(valueTimeSeriesMetadata); } - VectorTimeSeriesMetadata vectorTimeSeriesMetadata = new VectorTimeSeriesMetadata( - timeseriesMetadata, valueTimeseriesMetadataList); + VectorTimeSeriesMetadata vectorTimeSeriesMetadata = + new VectorTimeSeriesMetadata(timeseriesMetadata, valueTimeseriesMetadataList); seqTimeSeriesMetadata.add(vectorTimeSeriesMetadata); } } protected void unpackUnseqTsFileResource() throws IOException { TsFileResource resource = unseqFileResource.remove(0); - TimeseriesMetadata timeseriesMetadata = FileLoaderUtils - .loadTimeSeriesMetadata(resource, vectorPartialPath, context, getAnyFilter(), allSensors); + TimeseriesMetadata timeseriesMetadata = + FileLoaderUtils.loadTimeSeriesMetadata( + resource, vectorPartialPath, context, getAnyFilter(), allSensors); if (timeseriesMetadata != null) { timeseriesMetadata.setModified(true); timeseriesMetadata.setSeq(false); List<TimeseriesMetadata> valueTimeseriesMetadataList = new ArrayList<>(); for (PartialPath subSensor : vectorPartialPath.getSubSensorsPathList()) { - TimeseriesMetadata valueTimeSeriesMetadata = FileLoaderUtils - .loadTimeSeriesMetadata(resource, subSensor, context, getAnyFilter(), - Collections.emptySet()); + TimeseriesMetadata valueTimeSeriesMetadata = + FileLoaderUtils.loadTimeSeriesMetadata( + resource, subSensor, context, getAnyFilter(), Collections.emptySet()); if (valueTimeSeriesMetadata == null) { throw new IOException("File contains value"); } @@ -107,8 +132,8 @@ public class VectorSeriesReader extends SeriesReader { valueTimeSeriesMetadata.setSeq(false); valueTimeseriesMetadataList.add(valueTimeSeriesMetadata); } - VectorTimeSeriesMetadata vectorTimeSeriesMetadata = new VectorTimeSeriesMetadata( - timeseriesMetadata, valueTimeseriesMetadataList); + VectorTimeSeriesMetadata vectorTimeSeriesMetadata = + new VectorTimeSeriesMetadata(timeseriesMetadata, valueTimeseriesMetadataList); unSeqTimeSeriesMetadata.add(vectorTimeSeriesMetadata); } }
