This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch new_TsFile in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 92094bd1953604522e794c657d2e4d5b3ffd3305 Merge: affde79 01487e9 Author: HTHou <[email protected]> AuthorDate: Wed Feb 26 01:12:26 2020 +0800 Merge branch 'master' of https://github.com/apache/incubator-iotdb into new_tsFile_v2 .../SystemDesign/1-TsFile/3-Write.md | 8 +- .../4-StorageEngine/1-StorageEngine.md | 30 +-- .../4-StorageEngine/5-DataPartition.md | 86 +++++++ .../4-StorageEngine/6-DataManipulation.md | 96 ++++++++ .../SystemDesign/7-Connector/3-Spark-TsFile.md | 101 ++++++++ .../SystemDesign/7-Connector/4-Spark-IOTDB.md | 89 +++++++ docs/Documentation/SystemDesign/0-Content.md | 6 +- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 12 +- .../db/query/aggregation/AggregateResult.java | 95 +++++++- .../db/query/aggregation/AggregationType.java | 100 ++++++++ .../db/query/aggregation/impl/AvgAggrResult.java | 33 ++- .../db/query/aggregation/impl/CountAggrResult.java | 21 +- .../aggregation/impl/FirstValueAggrResult.java | 38 ++- .../aggregation/impl/LastValueAggrResult.java | 38 ++- .../query/aggregation/impl/MaxTimeAggrResult.java | 24 +- .../query/aggregation/impl/MaxValueAggrResult.java | 20 +- .../query/aggregation/impl/MinTimeAggrResult.java | 25 +- .../query/aggregation/impl/MinValueAggrResult.java | 21 +- .../db/query/aggregation/impl/SumAggrResult.java | 32 ++- .../groupby/GroupByWithValueFilterDataSet.java | 14 +- .../groupby/GroupByWithoutValueFilterDataSet.java | 6 +- .../db/query/executor/AggregationExecutor.java | 8 +- ...ultFactory.java => AggregateResultFactory.java} | 42 +++- .../db/query/aggregation/AggregateResultTest.java | 263 +++++++++++++++++++++ .../iotdb/db/query/component/SimpleFileWriter.java | 54 ----- .../reader/series/SeriesAggregateReaderTest.java | 4 +- server/src/test/resources/logback.xml | 9 +- .../iotdb/tsfile/write/chunk/ChunkWriterImpl.java | 14 +- .../apache/iotdb/tsfile/write/page/PageWriter.java | 12 +- 29 files changed, 1126 insertions(+), 175 deletions(-)
