[iotdb] branch aggregator updated (8f5f1538d5 -> a8d14c6d48)

[xi...@apache.org]

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

xiangweiwei pushed a change to branch aggregator
in repository https://gitbox.apache.org/repos/asf/iotdb.git


    from 8f5f1538d5 Fix conflicts
     add a8d14c6d48 rename package

No new revisions were added by this update.

Summary of changes:
 .../{operator => }/aggregation/Accumulator.java    |  2 +-
 .../aggregation/AccumulatorFactory.java            |  2 +-
 .../mpp/{operator => }/aggregation/Aggregator.java |  2 +-
 .../{operator => }/aggregation/AvgAccumulator.java |  2 +-
 .../aggregation/CountAccumulator.java              |  2 +-
 .../aggregation/ExtremeAccumulator.java            |  2 +-
 .../aggregation/FirstValueAccumulator.java         |  2 +-
 .../aggregation/FirstValueDescAccumulator.java     |  3 +--
 .../aggregation/LastValueAccumulator.java          |  3 +--
 .../aggregation/LastValueDescAccumulator.java      |  2 +-
 .../aggregation/MaxTimeAccumulator.java            |  2 +-
 .../aggregation/MaxTimeDescAccumulator.java        |  2 +-
 .../aggregation/MaxValueAccumulator.java           | 22 +++++++++++-----------
 .../aggregation/MinTimeAccumulator.java            |  2 +-
 .../aggregation/MinTimeDescAccumulator.java        |  2 +-
 .../aggregation/MinValueAccumulator.java           | 22 +++++++++++-----------
 .../{operator => }/aggregation/SumAccumulator.java |  2 +-
 .../operator/process/AggregateOperator.java        |  2 +-
 .../source/SeriesAggregateScanOperator.java        |  2 +-
 .../aggregation/AccumulatorTest.java               |  2 +-
 .../operator/SeriesAggregateScanOperatorTest.java  |  4 ++--
 21 files changed, 42 insertions(+), 44 deletions(-)
 rename server/src/main/java/org/apache/iotdb/db/mpp/{operator => }/aggregation/Accumulator.java (97%)
 rename server/src/main/java/org/apache/iotdb/db/mpp/{operator => }/aggregation/AccumulatorFactory.java (98%)
 rename server/src/main/java/org/apache/iotdb/db/mpp/{operator => }/aggregation/Aggregator.java (98%)
 rename server/src/main/java/org/apache/iotdb/db/mpp/{operator => }/aggregation/AvgAccumulator.java (99%)
 rename server/src/main/java/org/apache/iotdb/db/mpp/{operator => }/aggregation/CountAccumulator.java (98%)
 rename server/src/main/java/org/apache/iotdb/db/mpp/{operator => }/aggregation/ExtremeAccumulator.java (99%)
 rename server/src/main/java/org/apache/iotdb/db/mpp/{operator => }/aggregation/FirstValueAccumulator.java (99%)
 rename server/src/main/java/org/apache/iotdb/db/mpp/{operator => }/aggregation/FirstValueDescAccumulator.java (98%)
 rename server/src/main/java/org/apache/iotdb/db/mpp/{operator => }/aggregation/LastValueAccumulator.java (99%)
 rename server/src/main/java/org/apache/iotdb/db/mpp/{operator => }/aggregation/LastValueDescAccumulator.java (97%)
 rename server/src/main/java/org/apache/iotdb/db/mpp/{operator => }/aggregation/MaxTimeAccumulator.java (98%)
 rename server/src/main/java/org/apache/iotdb/db/mpp/{operator => }/aggregation/MaxTimeDescAccumulator.java (95%)
 rename server/src/main/java/org/apache/iotdb/db/mpp/{operator => }/aggregation/MaxValueAccumulator.java (93%)
 rename server/src/main/java/org/apache/iotdb/db/mpp/{operator => }/aggregation/MinTimeAccumulator.java (98%)
 rename server/src/main/java/org/apache/iotdb/db/mpp/{operator => }/aggregation/MinTimeDescAccumulator.java (96%)
 rename server/src/main/java/org/apache/iotdb/db/mpp/{operator => }/aggregation/MinValueAccumulator.java (93%)
 rename server/src/main/java/org/apache/iotdb/db/mpp/{operator => }/aggregation/SumAccumulator.java (99%)
 rename server/src/test/java/org/apache/iotdb/db/mpp/{operator => }/aggregation/AccumulatorTest.java (99%)