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 00:37:18 UTC
[iotdb] branch master updated: Fix NPE when deregister fragmentInstance
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 4128525dd6 Fix NPE when deregister fragmentInstance
4128525dd6 is described below
commit 4128525dd6a4e79b9070917b93a9fcf87fde3a2e
Author: Xiangwei Wei <34...@users.noreply.github.com>
AuthorDate: Wed Apr 12 08:37:10 2023 +0800
Fix NPE when deregister fragmentInstance
---
.../iotdb/db/mpp/execution/memory/MemoryPool.java | 25 +++++++++++-----------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/memory/MemoryPool.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/memory/MemoryPool.java
index f72d935514..24e145a1e3 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/memory/MemoryPool.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/memory/MemoryPool.java
@@ -172,19 +172,20 @@ public class MemoryPool {
*/
public void deRegisterFragmentInstanceToQueryMemoryMap(
String queryId, String fragmentInstanceId) {
- Map<String, Long> planNodeRelatedMemory =
- queryMemoryReservations.get(queryId).get(fragmentInstanceId);
- for (Long memoryReserved : planNodeRelatedMemory.values()) {
- if (memoryReserved != 0) {
- throw new MemoryLeakException(
- "PlanNode related memory is not zero when deregister fragment instance from query memory pool.");
+ Map<String, Map<String, Long>> queryRelatedMemory = queryMemoryReservations.get(queryId);
+ if (queryRelatedMemory != null) {
+ Map<String, Long> fragmentRelatedMemory = queryRelatedMemory.get(fragmentInstanceId);
+ for (Long memoryReserved : fragmentRelatedMemory.values()) {
+ if (memoryReserved != 0) {
+ throw new MemoryLeakException(
+ "PlanNode related memory is not zero when deregister fragment instance from query memory pool.");
+ }
}
- }
- synchronized (queryMemoryReservations) {
- Map<String, Map<String, Long>> queryRelatedMemory = queryMemoryReservations.get(queryId);
- queryRelatedMemory.remove(fragmentInstanceId);
- if (queryRelatedMemory.isEmpty()) {
- queryMemoryReservations.remove(queryId);
+ synchronized (queryMemoryReservations) {
+ queryRelatedMemory.remove(fragmentInstanceId);
+ if (queryRelatedMemory.isEmpty()) {
+ queryMemoryReservations.remove(queryId);
+ }
}
}
}