You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@iotdb.apache.org by ja...@apache.org on 2020/01/16 11:33:57 UTC

[incubator-iotdb] branch new_series_reader updated (d73bb01 -> 3b5ee81)

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

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


    from d73bb01  resolve conflicts
     add 3b5ee81  resolve conflicts

No new revisions were added by this update.

Summary of changes:
 .../groupby/GroupByWithoutValueFilterDataSet.java  | 22 +++++++--------
 .../db/query/executor/AggregateEngineExecutor.java |  4 +--
 .../query/reader/chunkRelated/MemChunkReader.java  | 20 +++++---------
 .../query/reader/chunkRelated/MenPageReader.java   | 28 +++++++++++++++++++
 .../reader/seriesRelated/IAggregateReader.java     |  8 ++++--
 .../SeriesDataReaderWithoutValueFilter.java        | 17 +++++++++---
 .../PriorityMergeReaderByTimestampTest.java        | 31 +++++++++++++---------
 .../iotdb/tsfile/read/reader/IChunkReader.java     |  3 +--
 .../iotdb/tsfile/read/reader/IPageReader.java      | 13 +++++++++
 .../tsfile/read/reader/chunk/ChunkReader.java      |  5 ++--
 .../read/reader/chunk/ChunkReaderByTimestamp.java  |  4 ++-
 .../iotdb/tsfile/read/reader/page/PageReader.java  |  5 +++-
 12 files changed, 108 insertions(+), 52 deletions(-)
 create mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/chunkRelated/MenPageReader.java
 create mode 100644 tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/IPageReader.java