comments

Author: shizy818

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/FakedMemoryReservationManager.java

@@ -37,10 +37,10 @@ public void releaseAllReservedMemory() {}
 
   @Override
   public Pair<Long, Long> releaseMemoryVirtually(final long size) {
-    return null;
+    return new Pair<>(0L, 0L);
   }
 
   @Override
   public void reserveMemoryVirtually(
-      final long releasedBytesInReserved, final long releasedBytesInTotal) {}
+      final long bytesToBeReserved, final long bytesAlreadyReserved) {}
 }

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/MemoryReservationManager.java

@@ -54,6 +54,11 @@ public interface MemoryReservationManager {
    * <p>NOTE: When calling this method, it should be guaranteed that bytesToBeReserved +
    * reservedBytesInTotal >= size to ensure proper memory accounting and prevent negative
    * reservation values.
+   *
+   * @param size the size of memory to release virtually
+   * @return a Pair where the left element is the amount of memory released from the pending
+   *     reservation queue (bytesToBeReserved), and the right element is the amount of memory that
+   *     has already been reserved
    */
   Pair<Long, Long> releaseMemoryVirtually(final long size);
 
@@ -62,6 +67,9 @@ public interface MemoryReservationManager {
    * memory ownership from one FragmentInstances to another by reserving the memory that was
    * previously released virtually. It updates the internal reservation state without changing the
    * actual memory allocation.
+   *
+   * @param bytesToBeReserved the amount of memory that needs to be reserved cumulatively.
+   * @param bytesAlreadyReserved the amount of memory that has already been reserved
    */
-  void reserveMemoryVirtually(final long releasedBytesInReserved, final long releasedBytesInTotal);
+  void reserveMemoryVirtually(final long bytesToBeReserved, final long bytesAlreadyReserved);
 }

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/NotThreadSafeMemoryReservationManager.java

@@ -110,8 +110,8 @@ public Pair<Long, Long> releaseMemoryVirtually(final long size) {
 
   @Override
   public void reserveMemoryVirtually(
-      final long releasedBytesInReserved, final long releasedBytesInTotal) {
-    bytesToBeReserved += releasedBytesInReserved;
-    reservedBytesInTotal += releasedBytesInTotal;
+      final long bytesToBeReserved, final long bytesAlreadyReserved) {
+    reservedBytesInTotal += bytesAlreadyReserved;
+    reserveMemoryCumulatively(bytesToBeReserved);
   }
 }

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/memory/ThreadSafeMemoryReservationManager.java

@@ -58,7 +58,7 @@ public Pair<Long, Long> releaseMemoryVirtually(final long size) {
 
   @Override
   public void reserveMemoryVirtually(
-      final long releasedBytesInReserved, final long releasedBytesInTotal) {
-    super.reserveMemoryVirtually(releasedBytesInReserved, releasedBytesInTotal);
+      final long bytesToBeReserved, final long bytesAlreadyReserved) {
+    super.reserveMemoryVirtually(bytesToBeReserved, bytesAlreadyReserved);
   }
 }