This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch stable-mpp
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from cdc3846852 Return Option<TsBlock> instead of TsBlock to let caller
clearly be aware of that the method will return null
add f40ae52eb5 Fix concurrent failure of testInsertMultiTabletPlanParallel
(#5767)
add c6f9d0a085 [IOTDB-2844] Implementation of Aggregator and Accumulator
(#5757)
add 16980c20ec Handle the scenarios that there is no data for storage
group (#5782)
add 647ff9ed87 [IOTDB-3058]The implementation of ttl related sql. (#5764)
add fda55b56e2 [IOTDB-3082] Implememtation of OffsetOperator (#5779)
add d1575b9b51 resolve conflicts
No new revisions were added by this update.
Summary of changes:
.../iotdb/commons/partition/DataPartition.java | 5 +
.../apache/iotdb/commons/partition/Partition.java | 2 +
.../iotdb/commons/partition/SchemaPartition.java | 5 +
.../apache/iotdb/db/client/ConfigNodeClient.java | 16 +
.../iotdb/db/localconfignode/LocalConfigNode.java | 25 +-
.../iotdb/db/metadata/LocalSchemaProcessor.java | 16 +-
.../db/metadata/schemaregion/SchemaEngine.java | 16 +-
.../iotdb/db/mpp/aggregation/Accumulator.java | 70 +++++
.../db/mpp/aggregation/AccumulatorFactory.java | 71 +++++
.../iotdb/db/mpp/aggregation/Aggregator.java | 122 +++++++
.../iotdb/db/mpp/aggregation/AvgAccumulator.java | 180 +++++++++++
.../iotdb/db/mpp/aggregation/CountAccumulator.java | 101 ++++++
.../db/mpp/aggregation/ExtremeAccumulator.java | 296 +++++++++++++++++
.../db/mpp/aggregation/FirstValueAccumulator.java | 319 +++++++++++++++++++
.../mpp/aggregation/FirstValueDescAccumulator.java | 91 ++++++
.../db/mpp/aggregation/LastValueAccumulator.java | 305 ++++++++++++++++++
.../mpp/aggregation/LastValueDescAccumulator.java | 135 ++++++++
.../db/mpp/aggregation/MaxTimeAccumulator.java | 101 ++++++
.../db/mpp/aggregation/MaxTimeDescAccumulator.java | 57 ++++
.../db/mpp/aggregation/MaxValueAccumulator.java | 270 ++++++++++++++++
.../db/mpp/aggregation/MinTimeAccumulator.java | 105 +++++++
.../db/mpp/aggregation/MinTimeDescAccumulator.java | 30 +-
.../db/mpp/aggregation/MinValueAccumulator.java | 270 ++++++++++++++++
.../iotdb/db/mpp/aggregation/SumAccumulator.java | 172 ++++++++++
.../iotdb/db/mpp/common/header/HeaderConstant.java | 8 +
.../iotdb/db/mpp/common/schematree/SchemaTree.java | 4 +
.../operator/process/AggregateOperator.java | 17 +-
.../operator/process/DeviceViewOperator.java | 2 +-
.../execution/operator/process/OffsetOperator.java | 34 +-
.../source/SeriesAggregateScanOperator.java | 121 ++++---
.../apache/iotdb/db/mpp/plan/analyze/Analysis.java | 5 +
.../apache/iotdb/db/mpp/plan/analyze/Analyzer.java | 17 +-
.../db/mpp/plan/execution/QueryExecution.java | 12 +-
.../plan/execution/config/ConfigTaskVisitor.java | 18 ++
.../{SetStorageGroupTask.java => SetTTLTask.java} | 42 ++-
.../execution/config/ShowStorageGroupTask.java | 1 -
.../db/mpp/plan/execution/config/ShowTTLTask.java | 134 ++++++++
.../config/{IConfigTask.java => UnSetTTLTask.java} | 9 +-
.../iotdb/db/mpp/plan/parser/ASTVisitor.java | 38 +++
.../db/mpp/plan/planner/LocalExecutionPlanner.java | 12 +-
.../plan/parameter/AggregationDescriptor.java | 4 +
.../plan/planner/plan/parameter/InputLocation.java | 4 +-
.../db/mpp/plan/statement/StatementVisitor.java | 16 +
...ageGroupStatement.java => SetTTLStatement.java} | 19 +-
...geGroupStatement.java => ShowTTLStatement.java} | 36 +--
...evicesStatement.java => UnSetTTLStatement.java} | 13 +-
.../iotdb/db/mpp/aggregation/AccumulatorTest.java | 349 +++++++++++++++++++++
...inOperatorTest.java => OffsetOperatorTest.java} | 165 +++++-----
.../operator/SeriesAggregateScanOperatorTest.java | 153 +++++++--
.../iotdb/tsfile/read/common/block/TsBlock.java | 38 ++-
.../read/common/block/column/BinaryColumn.java | 9 +
.../read/common/block/column/BooleanColumn.java | 9 +
.../tsfile/read/common/block/column/Column.java | 6 +
.../read/common/block/column/DoubleColumn.java | 9 +
.../read/common/block/column/FloatColumn.java | 8 +
.../tsfile/read/common/block/column/IntColumn.java | 8 +
.../read/common/block/column/LongColumn.java | 8 +
.../block/column/RunLengthEncodedColumn.java | 8 +
.../read/common/block/column/TimeColumn.java | 8 +
.../apache/iotdb/tsfile/utils/TsPrimitiveType.java | 146 ++++++++-
.../iotdb/tsfile/common/block/TsBlockTest.java | 49 +++
.../iotdb/tsfile/read/common/ColumnTest.java | 322 +++++++++++++++++++
62 files changed, 4342 insertions(+), 299 deletions(-)
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/aggregation/Accumulator.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/aggregation/AccumulatorFactory.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/aggregation/Aggregator.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/aggregation/AvgAccumulator.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/aggregation/CountAccumulator.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/aggregation/ExtremeAccumulator.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/aggregation/FirstValueAccumulator.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/aggregation/FirstValueDescAccumulator.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/aggregation/LastValueAccumulator.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/aggregation/LastValueDescAccumulator.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/aggregation/MaxTimeAccumulator.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/aggregation/MaxTimeDescAccumulator.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/aggregation/MaxValueAccumulator.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/aggregation/MinTimeAccumulator.java
copy
metrics/dropwizard-metrics/src/main/java/org/apache/iotdb/metrics/dropwizard/type/DropwizardCounter.java
=>
server/src/main/java/org/apache/iotdb/db/mpp/aggregation/MinTimeDescAccumulator.java
(59%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/aggregation/MinValueAccumulator.java
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/aggregation/SumAccumulator.java
copy
server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/{SetStorageGroupTask.java
=> SetTTLTask.java} (65%)
create mode 100644
server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/ShowTTLTask.java
copy
server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/{IConfigTask.java
=> UnSetTTLTask.java} (77%)
copy
server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/{SetStorageGroupStatement.java
=> SetTTLStatement.java} (83%)
copy
server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/{ShowStorageGroupStatement.java
=> ShowTTLStatement.java} (70%)
copy
server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/{CountDevicesStatement.java
=> UnSetTTLStatement.java} (78%)
create mode 100644
server/src/test/java/org/apache/iotdb/db/mpp/aggregation/AccumulatorTest.java
copy
server/src/test/java/org/apache/iotdb/db/mpp/execution/operator/{TimeJoinOperatorTest.java
=> OffsetOperatorTest.java} (78%)
create mode 100644
tsfile/src/test/java/org/apache/iotdb/tsfile/read/common/ColumnTest.java
