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

Posted to commits@iotdb.apache.org by su...@apache.org on 2020/01/15 08:08:14 UTC

[incubator-iotdb] branch new_series_reader updated (301ea5c -> d357d9a)

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

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


    from 301ea5c  Merge branch 'master' into new_series_reader
     add 861d372  fix aggregate SUM and AVG
     add d357d9a  Merge remote-tracking branch 'upstream/new_series_reader' into new_series_reader

No new revisions were added by this update.

Summary of changes:
 .../db/query/aggregation/AggregateResult.java      | 16 ++++++-------
 .../db/query/aggregation/impl/AvgAggrResult.java   |  5 ++++-
 .../db/query/aggregation/impl/SumAggrResult.java   |  4 ++--
 .../dataset/groupby/GroupByEngineDataSet.java      |  2 +-
 .../db/query/executor/AggregateEngineExecutor.java |  2 +-
 .../apache/iotdb/db/utils/TimeValuePairUtils.java  | 26 ----------------------
 6 files changed, 16 insertions(+), 39 deletions(-)