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 d3c530a2adad7058728ce9f95885b5a6e10e8fb2 Author: JackieTien97 <[email protected]> AuthorDate: Thu Mar 11 19:10:01 2021 +0800 format code --- .../chunk/metadata/DiskChunkMetadataLoader.java | 3 +- .../iotdb/db/query/reader/series/SeriesReader.java | 21 ++++++----- .../org/apache/iotdb/db/utils/FileLoaderUtils.java | 13 ++++--- .../java/org/apache/iotdb/db/utils/QueryUtils.java | 3 +- .../iotdb/tsfile/file/metadata/IChunkMetadata.java | 3 +- .../tsfile/file/metadata/VectorChunkMetadata.java | 11 +++--- .../file/metadata/VectorTimeSeriesMetadata.java | 6 +-- .../iotdb/tsfile/read/TsFileSequenceReader.java | 44 +++++++++++----------- .../read/controller/IChunkMetadataLoader.java | 5 ++- .../tsfile/read/controller/IMetadataQuerier.java | 7 ++-- .../read/controller/MetadataQuerierByFileImpl.java | 19 +++++----- .../tsfile/v2/read/TsFileSequenceReaderForV2.java | 25 ++++++------ 12 files changed, 85 insertions(+), 75 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/query/reader/chunk/metadata/DiskChunkMetadataLoader.java b/server/src/main/java/org/apache/iotdb/db/query/reader/chunk/metadata/DiskChunkMetadataLoader.java index e3dc79e..3a6fc2a 100644 --- a/server/src/main/java/org/apache/iotdb/db/query/reader/chunk/metadata/DiskChunkMetadataLoader.java +++ b/server/src/main/java/org/apache/iotdb/db/query/reader/chunk/metadata/DiskChunkMetadataLoader.java @@ -18,7 +18,6 @@ */ package org.apache.iotdb.db.query.reader.chunk.metadata; -import java.util.List; import org.apache.iotdb.db.engine.modification.Modification; import org.apache.iotdb.db.engine.storagegroup.TsFileResource; import org.apache.iotdb.db.metadata.PartialPath; @@ -30,6 +29,8 @@ import org.apache.iotdb.tsfile.file.metadata.ITimeSeriesMetadata; import org.apache.iotdb.tsfile.read.controller.IChunkMetadataLoader; import org.apache.iotdb.tsfile.read.filter.basic.Filter; +import java.util.List; + public class DiskChunkMetadataLoader implements IChunkMetadataLoader { private final TsFileResource resource; 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 27a3e3f..5350993 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/utils/FileLoaderUtils.java b/server/src/main/java/org/apache/iotdb/db/utils/FileLoaderUtils.java index c241d2f..0a87b75 100644 --- a/server/src/main/java/org/apache/iotdb/db/utils/FileLoaderUtils.java +++ b/server/src/main/java/org/apache/iotdb/db/utils/FileLoaderUtils.java @@ -18,10 +18,6 @@ */ package org.apache.iotdb.db.utils; -import java.io.IOException; -import java.util.List; -import java.util.Map.Entry; -import java.util.Set; import org.apache.iotdb.db.engine.cache.TimeSeriesMetadataCache; import org.apache.iotdb.db.engine.modification.Modification; import org.apache.iotdb.db.engine.storagegroup.TsFileResource; @@ -47,6 +43,11 @@ import org.apache.iotdb.tsfile.read.reader.IPageReader; import org.apache.iotdb.tsfile.read.reader.chunk.ChunkReader; import org.apache.iotdb.tsfile.read.reader.chunk.VectorChunkReader; +import java.io.IOException; +import java.util.List; +import java.util.Map.Entry; +import java.util.Set; + public class FileLoaderUtils { private FileLoaderUtils() {} @@ -153,8 +154,8 @@ public class FileLoaderUtils { * @param chunkMetaData the corresponding chunk metadata * @param timeFilter it should be a TimeFilter instead of a ValueFilter */ - public static List<IPageReader> loadPageReaderList(IChunkMetadata chunkMetaData, Filter timeFilter) - throws IOException { + public static List<IPageReader> loadPageReaderList( + IChunkMetadata chunkMetaData, Filter timeFilter) throws IOException { // TODO memory Vector chunk metadata if (chunkMetaData == null) { throw new IOException("Can't init null chunkMeta"); diff --git a/server/src/main/java/org/apache/iotdb/db/utils/QueryUtils.java b/server/src/main/java/org/apache/iotdb/db/utils/QueryUtils.java index 194def7..b958b93 100644 --- a/server/src/main/java/org/apache/iotdb/db/utils/QueryUtils.java +++ b/server/src/main/java/org/apache/iotdb/db/utils/QueryUtils.java @@ -19,7 +19,6 @@ package org.apache.iotdb.db.utils; -import java.util.List; import org.apache.iotdb.db.engine.modification.Deletion; import org.apache.iotdb.db.engine.modification.Modification; import org.apache.iotdb.db.engine.querycontext.QueryDataSource; @@ -28,6 +27,8 @@ import org.apache.iotdb.db.query.filter.TsFileFilter; import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata; import org.apache.iotdb.tsfile.read.common.TimeRange; +import java.util.List; + public class QueryUtils { private QueryUtils() { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/IChunkMetadata.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/IChunkMetadata.java index 95569db..4e880e0 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/IChunkMetadata.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/IChunkMetadata.java @@ -18,12 +18,13 @@ */ package org.apache.iotdb.tsfile.file.metadata; -import java.util.List; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; import org.apache.iotdb.tsfile.read.common.TimeRange; import org.apache.iotdb.tsfile.read.controller.IChunkLoader; +import java.util.List; + public interface IChunkMetadata { Statistics getStatistics(); diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/VectorChunkMetadata.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/VectorChunkMetadata.java index 321197e..551938c 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/VectorChunkMetadata.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/VectorChunkMetadata.java @@ -18,22 +18,23 @@ */ package org.apache.iotdb.tsfile.file.metadata; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; import org.apache.iotdb.tsfile.read.common.Chunk; import org.apache.iotdb.tsfile.read.common.TimeRange; import org.apache.iotdb.tsfile.read.controller.IChunkLoader; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + public class VectorChunkMetadata implements IChunkMetadata { private final IChunkMetadata timeChunkMetadata; private final List<IChunkMetadata> valueChunkMetadataList; - public VectorChunkMetadata(IChunkMetadata timeChunkMetadata, - List<IChunkMetadata> valueChunkMetadataList) { + public VectorChunkMetadata( + IChunkMetadata timeChunkMetadata, List<IChunkMetadata> valueChunkMetadataList) { this.timeChunkMetadata = timeChunkMetadata; this.valueChunkMetadataList = valueChunkMetadataList; } diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/VectorTimeSeriesMetadata.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/VectorTimeSeriesMetadata.java index 82aad19..20a25df 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/VectorTimeSeriesMetadata.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/file/metadata/VectorTimeSeriesMetadata.java @@ -18,10 +18,10 @@ */ package org.apache.iotdb.tsfile.file.metadata; -import java.util.ArrayList; import org.apache.iotdb.tsfile.file.metadata.statistics.Statistics; import java.io.IOException; +import java.util.ArrayList; import java.util.List; public class VectorTimeSeriesMetadata implements ITimeSeriesMetadata { @@ -29,10 +29,8 @@ public class VectorTimeSeriesMetadata implements ITimeSeriesMetadata { private final TimeseriesMetadata timeseriesMetadata; private final List<TimeseriesMetadata> valueTimeseriesMetadataList; - public VectorTimeSeriesMetadata( - TimeseriesMetadata timeseriesMetadata, - List<TimeseriesMetadata> valueTimeseriesMetadataList) { + TimeseriesMetadata timeseriesMetadata, List<TimeseriesMetadata> valueTimeseriesMetadataList) { this.timeseriesMetadata = timeseriesMetadata; this.valueTimeseriesMetadataList = valueTimeseriesMetadataList; } diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReader.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReader.java index 434d10b..ab3460d 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReader.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReader.java @@ -18,27 +18,6 @@ */ package org.apache.iotdb.tsfile.read; -import java.io.File; -import java.io.IOException; -import java.nio.BufferOverflowException; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.NoSuchElementException; -import java.util.Queue; -import java.util.Set; -import java.util.TreeMap; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.locks.ReadWriteLock; -import java.util.concurrent.locks.ReentrantReadWriteLock; -import java.util.stream.Collectors; import org.apache.iotdb.tsfile.common.conf.TSFileConfig; import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor; import org.apache.iotdb.tsfile.compress.IUnCompressor; @@ -71,9 +50,32 @@ import org.apache.iotdb.tsfile.utils.BloomFilter; import org.apache.iotdb.tsfile.utils.Pair; import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; import org.apache.iotdb.tsfile.write.schema.MeasurementSchema; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.File; +import java.io.IOException; +import java.nio.BufferOverflowException; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Queue; +import java.util.Set; +import java.util.TreeMap; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.locks.ReadWriteLock; +import java.util.concurrent.locks.ReentrantReadWriteLock; +import java.util.stream.Collectors; + public class TsFileSequenceReader implements AutoCloseable { private static final Logger logger = LoggerFactory.getLogger(TsFileSequenceReader.class); diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/IChunkMetadataLoader.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/IChunkMetadataLoader.java index 7268b12..093219d 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/IChunkMetadataLoader.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/IChunkMetadataLoader.java @@ -18,11 +18,12 @@ */ package org.apache.iotdb.tsfile.read.controller; -import java.io.IOException; -import java.util.List; import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata; import org.apache.iotdb.tsfile.file.metadata.ITimeSeriesMetadata; +import java.io.IOException; +import java.util.List; + public interface IChunkMetadataLoader { /** read all chunk metadata of one time series in one file. */ diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/IMetadataQuerier.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/IMetadataQuerier.java index 5ce61bb..77eb09d 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/IMetadataQuerier.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/IMetadataQuerier.java @@ -18,9 +18,6 @@ */ package org.apache.iotdb.tsfile.read.controller; -import java.io.IOException; -import java.util.List; -import java.util.Map; import org.apache.iotdb.tsfile.exception.write.NoMeasurementException; import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata; import org.apache.iotdb.tsfile.file.metadata.TsFileMetadata; @@ -28,6 +25,10 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.read.common.Path; import org.apache.iotdb.tsfile.read.common.TimeRange; +import java.io.IOException; +import java.util.List; +import java.util.Map; + public interface IMetadataQuerier { List<IChunkMetadata> getChunkMetaDataList(Path path) throws IOException; diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/MetadataQuerierByFileImpl.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/MetadataQuerierByFileImpl.java index 3204c2f..3215eff 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/MetadataQuerierByFileImpl.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/MetadataQuerierByFileImpl.java @@ -18,6 +18,16 @@ */ package org.apache.iotdb.tsfile.read.controller; +import org.apache.iotdb.tsfile.common.cache.LRUCache; +import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata; +import org.apache.iotdb.tsfile.file.metadata.TimeseriesMetadata; +import org.apache.iotdb.tsfile.file.metadata.TsFileMetadata; +import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; +import org.apache.iotdb.tsfile.read.TsFileSequenceReader; +import org.apache.iotdb.tsfile.read.TsFileSequenceReader.LocateStatus; +import org.apache.iotdb.tsfile.read.common.Path; +import org.apache.iotdb.tsfile.read.common.TimeRange; + import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -29,15 +39,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; import java.util.TreeMap; -import org.apache.iotdb.tsfile.common.cache.LRUCache; -import org.apache.iotdb.tsfile.file.metadata.IChunkMetadata; -import org.apache.iotdb.tsfile.file.metadata.TimeseriesMetadata; -import org.apache.iotdb.tsfile.file.metadata.TsFileMetadata; -import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; -import org.apache.iotdb.tsfile.read.TsFileSequenceReader; -import org.apache.iotdb.tsfile.read.TsFileSequenceReader.LocateStatus; -import org.apache.iotdb.tsfile.read.common.Path; -import org.apache.iotdb.tsfile.read.common.TimeRange; public class MetadataQuerierByFileImpl implements IMetadataQuerier { diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/v2/read/TsFileSequenceReaderForV2.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/v2/read/TsFileSequenceReaderForV2.java index cf10567..dc584cd 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/v2/read/TsFileSequenceReaderForV2.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/v2/read/TsFileSequenceReaderForV2.java @@ -18,18 +18,6 @@ */ package org.apache.iotdb.tsfile.v2.read; -import java.io.IOException; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import java.util.TreeMap; -import java.util.stream.Collectors; import org.apache.iotdb.tsfile.common.conf.TSFileConfig; import org.apache.iotdb.tsfile.file.header.ChunkGroupHeader; import org.apache.iotdb.tsfile.file.header.ChunkHeader; @@ -56,6 +44,19 @@ import org.apache.iotdb.tsfile.v2.file.metadata.MetadataIndexNodeV2; import org.apache.iotdb.tsfile.v2.file.metadata.TimeseriesMetadataV2; import org.apache.iotdb.tsfile.v2.file.metadata.TsFileMetadataV2; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import java.util.TreeMap; +import java.util.stream.Collectors; + public class TsFileSequenceReaderForV2 extends TsFileSequenceReader implements AutoCloseable { private List<Pair<Long, Long>> versionInfo;
