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/26 01:57:22 UTC

[incubator-iotdb] branch cluster_new updated (3a0dd09 -> 41cb534)

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 3a0dd09  commit before merge
     add 3eb01b2  [IOTDB-514] Fix avg calculation (#834)
     add d9484a2  Update StorageEngine and Spark connectors design doc (#826)
     add 01487e9  make AggregateResult serializable (#836)
     add d52c177  format CountAggrResult
     add 41cb534  Merge branch 'master' into cluster_new

No new revisions were added by this update.

Summary of changes:
 .../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 +-
 .../db/query/aggregation/AggregateResult.java      |  89 ++++++++--
 .../db/query/aggregation/AggregationType.java      | 100 +++++++++++
 .../db/query/aggregation/impl/AvgAggrResult.java   |  29 +++-
 .../db/query/aggregation/impl/CountAggrResult.java |  15 +-
 .../aggregation/impl/FirstValueAggrResult.java     |  20 ++-
 .../aggregation/impl/LastValueAggrResult.java      |  23 ++-
 .../query/aggregation/impl/MaxTimeAggrResult.java  |  16 +-
 .../query/aggregation/impl/MaxValueAggrResult.java |  15 +-
 .../query/aggregation/impl/MinTimeAggrResult.java  |  17 +-
 .../query/aggregation/impl/MinValueAggrResult.java |  13 +-
 .../db/query/aggregation/impl/SumAggrResult.java   |  26 ++-
 .../groupby/GroupByWithValueFilterDataSet.java     |  14 +-
 .../groupby/GroupByWithoutValueFilterDataSet.java  |   6 +-
 .../db/query/executor/AggregationExecutor.java     |  10 +-
 ...ultFactory.java => AggregateResultFactory.java} |  42 ++++-
 .../db/query/aggregation/AggregateResultTest.java  | 190 +++++++++++++++------
 .../reader/series/SeriesAggregateReaderTest.java   |   4 +-
 23 files changed, 890 insertions(+), 147 deletions(-)
 create mode 100644 docs/Documentation-CHN/SystemDesign/4-StorageEngine/5-DataPartition.md
 create mode 100644 docs/Documentation-CHN/SystemDesign/4-StorageEngine/6-DataManipulation.md
 create mode 100644 docs/Documentation-CHN/SystemDesign/7-Connector/3-Spark-TsFile.md
 create mode 100644 docs/Documentation-CHN/SystemDesign/7-Connector/4-Spark-IOTDB.md
 create mode 100644 server/src/main/java/org/apache/iotdb/db/query/aggregation/AggregationType.java
 rename server/src/main/java/org/apache/iotdb/db/query/factory/{AggreResultFactory.java => AggregateResultFactory.java} (69%)