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 2023/04/20 05:59:59 UTC
[iotdb] branch rel/1.1 updated: [To rel/1.1][IOTDB-5798] Fix bug caused by acknowledgeTsBlock
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch rel/1.1
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/1.1 by this push:
new a8e4e15864 [To rel/1.1][IOTDB-5798] Fix bug caused by acknowledgeTsBlock
a8e4e15864 is described below
commit a8e4e15864643ccda21c4e4bd04b58e2ccf28c45
Author: Xiangwei Wei <34...@users.noreply.github.com>
AuthorDate: Thu Apr 20 13:59:52 2023 +0800
[To rel/1.1][IOTDB-5798] Fix bug caused by acknowledgeTsBlock
---
.../mpp/execution/exchange/sink/SinkChannel.java | 23 +++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/sink/SinkChannel.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/sink/SinkChannel.java
index da575c2c01..07587ea43b 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/sink/SinkChannel.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/sink/SinkChannel.java
@@ -333,21 +333,22 @@ public class SinkChannel implements ISinkChannel {
iterator.remove();
LOGGER.debug("[ACKTsBlock] {}.", entry.getKey());
}
+
+ // there may exist duplicate ack message in network caused by caller retrying, if so duplicate
+ // ack message's freedBytes may be zero
+ if (freedBytes > 0) {
+ localMemoryManager
+ .getQueryPool()
+ .free(
+ localFragmentInstanceId.getQueryId(),
+ fullFragmentInstanceId,
+ localPlanNodeId,
+ freedBytes);
+ }
}
if (isFinished()) {
sinkListener.onFinish(this);
}
- // there may exist duplicate ack message in network caused by caller retrying, if so duplicate
- // ack message's freedBytes may be zero
- if (freedBytes > 0) {
- localMemoryManager
- .getQueryPool()
- .free(
- localFragmentInstanceId.getQueryId(),
- fullFragmentInstanceId,
- localPlanNodeId,
- freedBytes);
- }
}
@Override