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

Posted to commits@iotdb.apache.org by ji...@apache.org on 2020/02/25 03:57:23 UTC

[incubator-iotdb] branch cluster_new updated (6df4ca7 -> d6a2f0c)

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

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


    from 6df4ca7  fixing
     add 4b65100  fix default directories (#832)
     add c526024  [IOTDB-514] Extend aggregation (#833)
     add d6a2f0c  Merge branch 'master' into cluster_new

No new revisions were added by this update.

Summary of changes:
 .../SystemDesign/1-TsFile/3-Write.md               |   8 +-
 .../db/query/aggregation/AggregateResult.java      |   6 +
 .../db/query/aggregation/impl/AvgAggrResult.java   |   6 +
 .../db/query/aggregation/impl/CountAggrResult.java |   8 +-
 .../aggregation/impl/FirstValueAggrResult.java     |  22 ++-
 .../aggregation/impl/LastValueAggrResult.java      |  23 ++-
 .../query/aggregation/impl/MaxTimeAggrResult.java  |   8 +
 .../query/aggregation/impl/MaxValueAggrResult.java |   5 +
 .../query/aggregation/impl/MinTimeAggrResult.java  |   8 +
 .../query/aggregation/impl/MinValueAggrResult.java |   8 +
 .../db/query/aggregation/impl/SumAggrResult.java   |   6 +
 .../db/query/aggregation/AggregateResultTest.java  | 183 +++++++++++++++++++++
 .../iotdb/db/query/component/SimpleFileWriter.java |  54 ------
 .../iotdb/tsfile/write/chunk/ChunkWriterImpl.java  |  14 +-
 .../apache/iotdb/tsfile/write/page/PageWriter.java |  12 +-
 15 files changed, 290 insertions(+), 81 deletions(-)
 create mode 100644 server/src/test/java/org/apache/iotdb/db/query/aggregation/AggregateResultTest.java
 delete mode 100644 server/src/test/java/org/apache/iotdb/db/query/component/SimpleFileWriter.java