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 2023/03/23 05:04:47 UTC

[iotdb] 02/02: Merge branch 'master' into concurrentBug

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

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

commit 4ff9fb650efec47b5b5b2ae5cc2340465db28779
Merge: 16917f89ea 09c7fa77c4
Author: Alima777 <wx...@gmail.com>
AuthorDate: Thu Mar 23 13:04:28 2023 +0800

    Merge branch 'master' into concurrentBug

 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |  12 +-
 .../impl/ReadChunkCompactionPerformer.java         |   7 +-
 .../execute/utils/MultiTsFileDeviceIterator.java   |   7 +
 .../process/join/RowBasedTimeJoinOperator.java     |   2 +-
 .../process/join/merge/AscTimeComparator.java      |   5 +
 .../process/join/merge/DescTimeComparator.java     |   5 +
 .../process/join/merge/TimeComparator.java         |   3 +
 .../db/mpp/execution/schedule/DriverScheduler.java |   2 +-
 .../utils/MultiTsFileDeviceIteratorTest.java       | 257 +++++++++++++++++----
 .../db/mpp/plan/plan/PipelineBuilderTest.java      |  96 +++++++-
 10 files changed, 334 insertions(+), 62 deletions(-)