This is an automated email from the ASF dual-hosted git repository.
xiangweiwei pushed a change to branch concurrentBug
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from ecb54e02a9 merge master
new 16917f89ea Reduce the scope of lock in MemoryPool
add 659fa27eaa Update IoTDBDescriptor.java (#9420)
add 788c58dd7b [IOTDB-5715] Improve the performance of query order by time
desc
add 1b9c9eff30 [IOTDB-5716] Wrong dependency when pipeline
consumeOneByOneOperator
add 09c7fa77c4 remove aligned time series id in nonAligned measurement
iterator (#9410)
new 4ff9fb650e Merge branch 'master' into concurrentBug
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 12 +-
.../impl/ReadChunkCompactionPerformer.java | 7 +-
.../execute/utils/MultiTsFileDeviceIterator.java | 7 +
.../db/exception/runtime/MemoryLeakException.java | 7 +-
.../iotdb/db/mpp/common/FragmentInstanceId.java | 4 +
.../execution/exchange/MPPDataExchangeManager.java | 6 +
.../mpp/execution/exchange/SharedTsBlockQueue.java | 15 +-
.../mpp/execution/exchange/sink/SinkChannel.java | 8 -
.../execution/exchange/source/SourceHandle.java | 8 -
.../fragment/FragmentInstanceExecution.java | 5 +
.../iotdb/db/mpp/execution/memory/MemoryPool.java | 93 ++++----
.../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 +++++++-
18 files changed, 403 insertions(+), 139 deletions(-)
copy
service-rpc/src/main/java/org/apache/iotdb/rpc/ConfigNodeConnectionException.java
=>
server/src/main/java/org/apache/iotdb/db/exception/runtime/MemoryLeakException.java
(84%)
