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/22 06:16:57 UTC
[iotdb] branch xingtanzjr/fix_coordinator_cleanup updated (44d1106861 -> 32555dc400)
This is an automated email from the ASF dual-hosted git repository.
xingtanzjr pushed a change to branch xingtanzjr/fix_coordinator_cleanup
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 44d1106861 fix another issue which is led by last change
add 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)
add 25983540e7 Fix CI (#5639)
add 7a500adb6e [IOTDB-2880] Fix NPE occured in ci test (#5634)
add f037de3705 fix concurrent bug of CachedMNodeContainer.putIfAbsent (#5632)
add 32555dc400 Merge branch 'master' into xingtanzjr/fix_coordinator_cleanup
No new revisions were added by this update.
Summary of changes:
checkstyle.xml | 24 ++--
.../apache/iotdb/procedure/ProcedureExecutor.java | 6 +-
.../apache/iotdb/procedure/TestProcedureBase.java | 2 +-
.../iotdb/procedure/store/TestProcedureStore.java | 9 +-
.../mtree/store/disk/CachedMNodeContainer.java | 15 +++
.../apache/iotdb/db/mpp/buffer/SourceHandle.java | 6 +
.../iotdb/db/mpp/execution/QueryExecution.java | 3 +-
.../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 | 125 ++++++++++++++++++++-
.../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 ++-
26 files changed, 560 insertions(+), 152 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