This is an automated email from the ASF dual-hosted git repository. lancelly pushed a commit to branch 1.2finishCanAdd in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit c0352d48addfc4bc0c33dae6a643d813f4a52af0 Author: lancelly <[email protected]> AuthorDate: Tue Sep 26 17:03:39 2023 +0800 fix --- .../db/queryengine/execution/exchange/SharedTsBlockQueue.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/exchange/SharedTsBlockQueue.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/exchange/SharedTsBlockQueue.java index 8ed23f325b1..edec930c985 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/exchange/SharedTsBlockQueue.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/exchange/SharedTsBlockQueue.java @@ -269,6 +269,9 @@ public class SharedTsBlockQueue { if (!blocked.isDone()) { blocked.set(null); } + if(!canAddTsBlock.isDone()){ + canAddTsBlock.set(null); + } if (blockedOnMemory != null) { bufferRetainedSizeInBytes -= localMemoryManager.getQueryPool().tryCancel(blockedOnMemory); } @@ -305,6 +308,9 @@ public class SharedTsBlockQueue { if (!blocked.isDone()) { blocked.cancel(true); } + if(!canAddTsBlock.isDone()){ + canAddTsBlock.set(null); + } if (blockedOnMemory != null) { bufferRetainedSizeInBytes -= localMemoryManager.getQueryPool().tryCancel(blockedOnMemory); } @@ -330,6 +336,9 @@ public class SharedTsBlockQueue { if (!blocked.isDone()) { blocked.setException(t); } + if(!canAddTsBlock.isDone()){ + canAddTsBlock.set(null); + } if (blockedOnMemory != null) { bufferRetainedSizeInBytes -= localMemoryManager.getQueryPool().tryCancel(blockedOnMemory); }
