[iotdb] branch master updated: Perfect some error messages of Memorypool

[jackietien]

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 e609295edc0 Perfect some error messages of Memorypool
e609295edc0 is described below

commit e609295edc0086717c4e517362c8636bac4b9455
Author: Liao Lanyu <1435078...@qq.com>
AuthorDate: Tue Aug 8 14:45:00 2023 +0800

    Perfect some error messages of Memorypool
---
 .../iotdb/db/queryengine/execution/memory/MemoryPool.java   | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/memory/MemoryPool.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/memory/MemoryPool.java
index 211b614e99b..7aac8447610 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/memory/MemoryPool.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/memory/MemoryPool.java
@@ -33,11 +33,13 @@ import org.slf4j.LoggerFactory;
 import javax.annotation.Nullable;
 
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Collectors;
 
 /** A thread-safe memory pool. */
 public class MemoryPool {
@@ -186,7 +188,7 @@ public class MemoryPool {
       // next() of root operator returns no data)
       if (fragmentRelatedMemory != null) {
         hasPotentialMemoryLeak =
-            fragmentRelatedMemory.values().stream().anyMatch(value -> value != 
0);
+            fragmentRelatedMemory.values().stream().anyMatch(value -> value != 
0L);
       }
       synchronized (queryMemoryReservations) {
         queryRelatedMemory.remove(fragmentInstanceId);
@@ -195,8 +197,15 @@ public class MemoryPool {
         }
       }
       if (hasPotentialMemoryLeak) {
+        // hasPotentialMemoryLeak means that fragmentRelatedMemory is not null
+        List<Map.Entry<String, Long>> invalidEntryList =
+            fragmentRelatedMemory.entrySet().stream()
+                .filter(entry -> entry.getValue() != 0L)
+                .collect(Collectors.toList());
         throw new MemoryLeakException(
-            "PlanNode related memory is not zero when trying to deregister FI 
from query memory pool. QueryId is : {}, FragmentInstanceId is : {}, PlanNode 
related memory is : {}.");
+            String.format(
+                "PlanNode related memory is not zero when trying to deregister 
FI from query memory pool. QueryId is : %s, FragmentInstanceId is : %s, 
Non-zero PlanNode related memory is : %s.",
+                queryId, fragmentInstanceId, invalidEntryList));
       }
     }
   }