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/12 09:29:05 UTC
[iotdb] branch rel/1.1 updated: [To rel/1.1] Fix MemoryPool free NPE
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 3387424bbc [To rel/1.1] Fix MemoryPool free NPE
3387424bbc is described below
commit 3387424bbc60274322cd3ced4481b7c61c1784fc
Author: Jackie Tien <ja...@gmail.com>
AuthorDate: Wed Apr 12 17:28:57 2023 +0800
[To rel/1.1] Fix MemoryPool free NPE
---
.../org/apache/iotdb/db/mpp/execution/exchange/sink/SinkChannel.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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 356bfff296..af52f610fa 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
@@ -138,7 +138,7 @@ public class SinkChannel implements ISinkChannel {
localFragmentInstanceId.queryId,
localFragmentInstanceId.fragmentId,
localFragmentInstanceId.instanceId);
- this.bufferRetainedSizeInBytes = DEFAULT_MAX_TSBLOCK_SIZE_IN_BYTES;
+ this.bufferRetainedSizeInBytes = 0;
this.currentTsBlockSize = DEFAULT_MAX_TSBLOCK_SIZE_IN_BYTES;
}
@@ -389,6 +389,7 @@ public class SinkChannel implements ISinkChannel {
// the handle is created, so we use DEFAULT here. It is ok to use DEFAULT here because
// at first this SinkChannel has not reserved memory.
.left;
+ this.bufferRetainedSizeInBytes = DEFAULT_MAX_TSBLOCK_SIZE_IN_BYTES;
}
@Override