[incubator-iotdb] branch new_series_reader updated (ba80f38 -> 3092715)

[qi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a change to branch new_series_reader
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.


    from ba80f38  Merge branch 'master' into new_series_reader
     add 3092715  [IOTDB-418] add some impl of NewSeriesReaderWithoutValueFilter (#692)

No new revisions were added by this update.

Summary of changes:
 .../iotdb/db/engine/memtable/AbstractMemTable.java |   5 +-
 .../db/engine/querycontext/ReadOnlyMemChunk.java   |  49 +-
 .../engine/storagegroup/StorageGroupProcessor.java |  68 +--
 .../db/engine/storagegroup/TsFileProcessor.java    |  21 +-
 .../db/query/aggregation/AggregateFunction.java    | 122 -----
 .../db/query/aggregation/AggregateResult.java      |  91 ++++
 .../db/query/aggregation/impl/AvgAggrFunc.java     |  71 +--
 .../db/query/aggregation/impl/CountAggrFunc.java   |  85 +---
 .../query/aggregation/impl/FirstValueAggrFunc.java |  72 +--
 .../query/aggregation/impl/LastValueAggrFunc.java  |  64 +--
 .../db/query/aggregation/impl/MaxTimeAggrFunc.java |  58 +--
 .../query/aggregation/impl/MaxValueAggrFunc.java   |  97 +---
 .../db/query/aggregation/impl/MinTimeAggrFunc.java |  82 +---
 .../query/aggregation/impl/MinValueAggrFunc.java   |  91 +---
 .../db/query/dataset/DeviceIterateDataSet.java     |   4 +-
 .../NewEngineDataSetWithoutValueFilter.java        |  68 +--
 .../dataset/groupby/GroupByEngineDataSet.java      |   9 +-
 .../groupby/GroupByWithValueFilterDataSet.java     |  11 +-
 .../groupby/GroupByWithoutValueFilterDataSet.java  | 262 +++--------
 .../iotdb/db/query/executor/EngineExecutor.java    |  13 +-
 .../iotdb/db/query/executor/EngineQueryRouter.java |   4 +-
 ...ecutor.java => NewAggregateEngineExecutor.java} | 213 +++------
 .../iotdb/db/query/factory/AggreFuncFactory.java   |   4 +-
 .../java/org/apache/iotdb/db/query/fill/IFill.java |   7 +-
 .../org/apache/iotdb/db/query/fill/LinearFill.java |  11 +-
 .../apache/iotdb/db/query/fill/PreviousFill.java   |  11 +-
 .../iotdb/db/query/reader/ManagedSeriesReader.java |   6 +-
 .../iotdb/db/query/reader/MemChunkLoader.java      |  41 +-
 ...DiskChunkReader.java => ChunkDataIterator.java} |  19 +-
 .../query/reader/chunkRelated/ChunkReaderWrap.java |   2 +-
 .../query/reader/chunkRelated/MemChunkReader.java  |  26 +-
 .../fileRelated/UnSealedTsFileIterateReader.java   | 130 ------
 .../resourceRelated/SeqResourceIterateReader.java  | 157 -------
 .../reader/seriesRelated/AbstractDataReader.java   | 515 +++++++++++++++++++++
 .../reader/seriesRelated/IAggregateReader.java     |  23 +-
 .../query/reader/seriesRelated/IRawDataReader.java |   5 +-
 .../NewSeriesReaderWithoutValueFilter.java         | 278 -----------
 .../RawDataReaderWithoutValueFilter.java           |  66 +++
 ...r.java => SeriesDataReaderWithValueFilter.java} |  66 ++-
 .../SeriesDataReaderWithoutValueFilter.java        | 120 +++++
 .../SeriesReaderWithoutValueFilter.java            | 261 -----------
 .../db/query/reader/universal/IterateReader.java   |  90 ----
 .../reader/universal/PriorityMergeReader.java      |  11 +-
 .../db/query/timegenerator/EngineLeafNode.java     |  19 +-
 .../query/timegenerator/EngineNodeConstructor.java |   5 +-
 .../iotdb/db/engine/merge/MergeOverLapTest.java    |  27 +-
 .../iotdb/db/engine/merge/MergeTaskTest.java       | 105 +++--
 .../iotdb/db/engine/storagegroup/TTLTest.java      |   8 +-
 .../iotdb/db/integration/IOTDBGroupByIT.java       |  19 +-
 .../iotdb/db/integration/IoTDBSeriesReaderIT.java  |   2 -
 .../query/executor/GroupByEngineDataSetTest.java   |   4 +-
 .../fileRelated/UnSealedTsFileReaderTest.java      | 105 -----
 .../resourceRelated/SeqResourceReaderTest.java     | 113 -----
 .../SeriesReaderWithValueFilterTest.java           |  59 ---
 .../SeriesReaderWithoutValueFilterTest.java        |  74 ---
 .../writelog/recover/UnseqTsFileRecoverTest.java   |   4 +-
 .../iotdb/tsfile/file/metadata/ChunkMetaData.java  | 430 ++++++++---------
 .../{IAggregateReader.java => IChunkReader.java}   |  19 +-
 .../tsfile/read/reader/chunk/ChunkReader.java      |   9 +-
 .../reader/series/AbstractFileSeriesReader.java    |  17 +-
 60 files changed, 1633 insertions(+), 2795 deletions(-)
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/AggregateFunction.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/AggregateResult.java
 rename server/src/main/java/org/apache/iotdb/db/query/executor/{AggregateEngineExecutor.java => NewAggregateEngineExecutor.java} (51%)
 copy tsfile/src/main/java/org/apache/iotdb/tsfile/read/controller/IChunkLoader.java => server/src/main/java/org/apache/iotdb/db/query/reader/MemChunkLoader.java (60%)
 rename server/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/{DiskChunkReader.java => ChunkDataIterator.java} (86%)
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/fileRelated/UnSealedTsFileIterateReader.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/resourceRelated/SeqResourceIterateReader.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/AbstractDataReader.java
 copy tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/IBatchReader.java => server/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/IAggregateReader.java (66%)
 copy tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/IBatchReader.java => server/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/IRawDataReader.java (89%)
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/NewSeriesReaderWithoutValueFilter.java
 create mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/RawDataReaderWithoutValueFilter.java
 rename server/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/{SeriesReaderWithValueFilter.java => SeriesDataReaderWithValueFilter.java} (59%)
 create mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesDataReaderWithoutValueFilter.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithoutValueFilter.java
 delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/universal/IterateReader.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/query/reader/fileRelated/UnSealedTsFileReaderTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/query/reader/resourceRelated/SeqResourceReaderTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithValueFilterTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/query/reader/seriesRelated/SeriesReaderWithoutValueFilterTest.java
 rename tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/{IAggregateReader.java => IChunkReader.java} (74%)