You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2020/03/03 01:00:35 UTC

[incubator-iotdb] 01/01: Merge pull request #864 from apache/optimize_series_reader

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

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

commit c00b63f398ca64035aa4759318e2e3025fd708a6
Merge: 6404d6d 9101bcf
Author: Jialin Qiao <qj...@mails.tsinghua.edu.cn>
AuthorDate: Tue Mar 3 09:00:27 2020 +0800

    Merge pull request #864 from apache/optimize_series_reader
    
    [IOTDB-527] Refactor series reader

 .../SystemDesign/5-DataQuery/2-SeriesReader.md     |  14 +-
 .../db/query/aggregation/AggregateResult.java      |   9 +-
 .../db/query/aggregation/impl/AvgAggrResult.java   |   6 +
 .../groupby/GroupByWithoutValueFilterDataSet.java  | 348 +++++++-------
 .../db/query/executor/AggregationExecutor.java     |  12 +-
 .../iotdb/db/query/reader/chunk/MemPageReader.java |  19 +-
 .../db/query/reader/series/IAggregateReader.java   |   3 +-
 .../query/reader/series/SeriesAggregateReader.java |  13 +-
 .../reader/series/SeriesRawDataBatchReader.java    |  52 +-
 .../reader/series/SeriesRawDataPointReader.java    |  43 +-
 .../iotdb/db/query/reader/series/SeriesReader.java | 522 +++++++++++++--------
 .../reader/series/SeriesReaderByTimestamp.java     |  45 +-
 .../reader/universal/PriorityMergeReader.java      |   1 -
 .../org/apache/iotdb/db/constant/TestConstant.java |  82 +++-
 .../org/apache/iotdb/db/integration/Constant.java  | 100 ----
 .../iotdb/db/integration/IOTDBGroupByIT.java       |  18 +-
 .../integration/IOTDBGroupByInnerIntervalIT.java   |   2 +-
 .../iotdb/db/integration/IoTDBAggregationIT.java   |  18 +-
 .../integration/IoTDBAggregationLargeDataIT.java   |  18 +-
 .../integration/IoTDBAggregationSmallDataIT.java   |  18 +-
 .../db/integration/IoTDBAutoCreateSchemaIT.java    |   3 +-
 .../apache/iotdb/db/integration/IoTDBCloseIT.java  |  11 +-
 .../iotdb/db/integration/IoTDBCompleteIT.java      |   3 +-
 .../apache/iotdb/db/integration/IoTDBDaemonIT.java |   2 +-
 .../db/integration/IoTDBEngineTimeGeneratorIT.java |  15 +-
 .../db/integration/IoTDBFloatPrecisionIT.java      |   2 +-
 .../iotdb/db/integration/IoTDBLargeDataIT.java     |  35 +-
 .../iotdb/db/integration/IoTDBLimitSlimitIT.java   |   4 +-
 .../iotdb/db/integration/IoTDBMultiSeriesIT.java   |  41 +-
 .../db/integration/IoTDBMultiStatementsIT.java     |   9 +-
 .../iotdb/db/integration/IoTDBNumberPathIT.java    |   3 +-
 .../iotdb/db/integration/IoTDBQuotedPathIT.java    |   2 +-
 .../iotdb/db/integration/IoTDBRecoverIT.java       |   9 +-
 .../db/integration/IoTDBSequenceDataQueryIT.java   |  43 +-
 .../iotdb/db/integration/IoTDBSeriesReaderIT.java  |  54 ++-
 .../iotdb/db/integration/IoTDBSimpleQueryTest.java |  86 ++++
 .../reader/series/SeriesAggregateReaderTest.java   |   4 +-
 .../reader/series/SeriesReaderByTimestampTest.java |   2 -
 .../apache/iotdb/db/tools/IoTDBWatermarkTest.java  |  21 +-
 .../apache/iotdb/db/utils/EnvironmentUtils.java    |   1 -
 .../file/metadata/statistics/BinaryStatistics.java |   2 +-
 .../metadata/statistics/BooleanStatistics.java     |   2 +-
 .../file/metadata/statistics/DoubleStatistics.java |   2 +-
 .../file/metadata/statistics/FloatStatistics.java  |   2 +-
 .../metadata/statistics/IntegerStatistics.java     |   2 +-
 .../file/metadata/statistics/LongStatistics.java   |   2 +-
 .../file/metadata/statistics/Statistics.java       |   5 +
 .../iotdb/tsfile/read/reader/IPageReader.java      |   3 +
 .../iotdb/tsfile/read/reader/page/PageReader.java  |   5 +
 49 files changed, 1002 insertions(+), 716 deletions(-)