(drill) branch 1.21 updated: DRILL-8479: Merge Join Memory Leak Depleting Incoming Batches Throw Exception (#2878)

[dzamo]

This is an automated email from the ASF dual-hosted git repository.

dzamo pushed a commit to branch 1.21
in repository https://gitbox.apache.org/repos/asf/drill.git


The following commit(s) were added to refs/heads/1.21 by this push:
     new 7ea9a1e4f0 DRILL-8479: Merge Join Memory Leak Depleting Incoming 
Batches Throw Exception (#2878)
7ea9a1e4f0 is described below

commit 7ea9a1e4f0c5f37f0956a448c75a40cede6dcf9d
Author: shfshihuafeng <shfshihuaf...@163.com>
AuthorDate: Wed Mar 6 12:00:30 2024 +0800

    DRILL-8479: Merge Join Memory Leak Depleting Incoming Batches Throw 
Exception (#2878)
---
 .../org/apache/drill/exec/physical/impl/join/MergeJoinBatch.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git 
a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/MergeJoinBatch.java
 
b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/MergeJoinBatch.java
index 5e032647c5..bf3c57e864 100644
--- 
a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/MergeJoinBatch.java
+++ 
b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/MergeJoinBatch.java
@@ -297,7 +297,14 @@ public class MergeJoinBatch extends 
AbstractBinaryRecordBatch<MergeJoinPOP> {
       batchMemoryManager.getAvgOutputRowWidth(), 
batchMemoryManager.getTotalOutputRecords());
 
     super.close();
-    leftIterator.close();
+    try {
+      leftIterator.close();
+    } catch (Exception e) {
+      rightIterator.close();
+      throw UserException.executionError(e)
+          .message("Failed to close Iterator.")
+          .build(logger);
+    }
     rightIterator.close();
   }