You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2022/04/20 07:03:27 UTC
[iotdb] 01/01: Merge branch 'master' into xingtanzjr/mpp_issues
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a commit to branch xingtanzjr/mpp_issues
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit d78216d302c1476588150b9200b613a813c37b8c
Merge: 755237895b a019934b42
Author: Jinrui.Zhang <xi...@gmail.com>
AuthorDate: Wed Apr 20 15:03:12 2022 +0800
Merge branch 'master' into xingtanzjr/mpp_issues
.../statemachine/PartitionRegionStateMachine.java | 17 +
.../iotdb/consensus/common/SnapshotMeta.java | 41 +-
.../consensus/standalone/StandAloneServerImpl.java | 18 +
.../consensus/statemachine/EmptyStateMachine.java | 18 +
.../consensus/statemachine/IStateMachine.java | 49 +++
.../iotdb/consensus/ratis/RatisConsensusTest.java | 15 +
.../standalone/StandAloneConsensusTest.java | 15 +
.../statemachine/DataRegionStateMachine.java | 17 +
.../statemachine/SchemaRegionStateMachine.java | 18 +
.../engine/compaction/CompactionTaskManager.java | 6 +-
.../apache/iotdb/db/mpp/execution/DataDriver.java | 4 +
.../iotdb/db/mpp/execution/DataDriverContext.java | 1 +
.../iotdb/db/mpp/execution/SchemaDriver.java | 1 +
.../db/mpp/execution/SchemaDriverContext.java | 1 +
.../db/mpp/execution/config/ConfigExecution.java | 1 +
.../mpp/execution/scheduler/ClusterScheduler.java | 1 +
.../source/SeriesAggregateScanOperator.java | 420 ++++++++++++++++++++-
.../db/mpp/operator/source/SeriesScanUtil.java | 10 +-
.../db/mpp/sql/planner/LocalExecutionPlanner.java | 28 +-
.../iotdb/db/mpp/sql/planner/QueryPlanBuilder.java | 5 +
.../db/mpp/sql/planner/plan/FragmentInstance.java | 1 +
.../plan/node/source/SeriesAggregateScanNode.java | 45 ++-
.../statement/component/GroupByTimeComponent.java | 73 ++++
.../query/dataset/groupby/GroupByFillDataSet.java | 8 +-
.../query/dataset/groupby/GroupByTimeDataSet.java | 30 +-
.../dataset/groupby/GroupByTimeEngineDataSet.java | 24 +-
.../groupby/GroupByWithValueFilterDataSet.java | 6 +-
.../groupby/GroupByWithoutValueFilterDataSet.java | 9 +-
.../iotdb/db/query/reader/series/SeriesReader.java | 3 +
.../timerangeiterator/AggrWindowIterator.java | 38 +-
.../timerangeiterator/ITimeRangeIterator.java | 8 +-
.../timerangeiterator/PreAggrWindowIterator.java | 38 +-
.../PreAggrWindowWithNaturalMonthIterator.java | 50 ++-
.../SingleTimeWindowIterator.java | 65 ++++
.../org/apache/iotdb/db/wal/buffer/WALBuffer.java | 128 ++++---
.../java/org/apache/iotdb/db/wal/node/WALNode.java | 6 +-
.../db/mpp/execution/ConfigExecutionTest.java | 45 ++-
.../operator/SeriesAggregateScanOperatorTest.java | 373 ++++++++++++++++++
.../db/mpp/operator/SeriesScanOperatorTest.java | 6 +-
.../db/mpp/sql/plan/QueryLogicalPlanUtil.java | 8 +
.../source/SeriesAggregateScanNodeSerdeTest.java | 7 +-
.../dataset/groupby/GroupByTimeDataSetTest.java | 74 ++--
.../query/reader/series/SeriesReaderTestUtil.java | 8 +
.../iotdb/db/utils/TimeRangeIteratorTest.java | 230 +++++++----
.../iotdb/tsfile/read/common/block/TsBlock.java | 22 +-
.../tsfile/read/common/block/TsBlockBuilder.java | 5 +
.../common/block/column/BinaryColumnBuilder.java | 11 +
.../common/block/column/BooleanColumnBuilder.java | 11 +
.../read/common/block/column/ColumnBuilder.java | 5 +
.../common/block/column/DoubleColumnBuilder.java | 11 +
.../common/block/column/FloatColumnBuilder.java | 11 +
.../read/common/block/column/IntColumnBuilder.java | 11 +
.../common/block/column/LongColumnBuilder.java | 11 +
.../read/common/block/column/TimeColumn.java | 4 +
.../common/block/column/TimeColumnBuilder.java | 11 +
55 files changed, 1772 insertions(+), 310 deletions(-)