You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2022/04/22 04:13:28 UTC
[iotdb] branch master updated (6952eed0e6 -> 1a2ea0c03a)
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 6952eed0e6 Add block cancel when GetBlockTask throws exception (#5628)
add 1a2ea0c03a Add ColumnMerger to merge multipul input columns of same sensor into one column (#5630)
No new revisions were added by this update.
Summary of changes:
checkstyle.xml | 24 ++---
.../db/mpp/operator/process/TimeJoinOperator.java | 56 ++++++----
.../mpp/operator/process/merge/ColumnMerger.java | 58 ++++++++++
.../operator/process/merge/SingleColumnMerger.java | 74 +++++++++++++
.../db/mpp/sql/planner/LocalExecutionPlanner.java | 28 ++++-
.../db/mpp/sql/planner/plan/OutputColumn.java | 14 +++
.../planner/plan/node/process/TimeJoinNode.java | 8 +-
.../iotdb/db/mpp/execution/DataDriverTest.java | 7 +-
.../iotdb/db/mpp/operator/LimitOperatorTest.java | 7 +-
.../db/mpp/operator/SingleColumnMergerTest.java | 117 ++++++++++++++++++++
.../db/mpp/operator/TimeJoinOperatorTest.java | 120 ++++++++++++++++++++-
.../iotdb/tsfile/read/common/block/TsBlock.java | 10 +-
.../common/block/column/BinaryColumnBuilder.java | 19 +---
.../common/block/column/BooleanColumnBuilder.java | 19 +---
.../read/common/block/column/ColumnBuilder.java | 17 ++-
.../common/block/column/DoubleColumnBuilder.java | 19 +---
.../common/block/column/FloatColumnBuilder.java | 15 +--
.../read/common/block/column/IntColumnBuilder.java | 19 +---
.../common/block/column/LongColumnBuilder.java | 19 +---
.../common/block/column/TimeColumnBuilder.java | 16 +--
20 files changed, 519 insertions(+), 147 deletions(-)
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/operator/process/merge/ColumnMerger.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/operator/process/merge/SingleColumnMerger.java
create mode 100644 server/src/test/java/org/apache/iotdb/db/mpp/operator/SingleColumnMergerTest.java