DRILL-8479: Merge Join Memory Leak Depleting Incoming Batches Throw E…

…xception (#2878)
apache · Apr 14, 2024 · 7ea9a1e · 7ea9a1e
1 parent a0c255f
commit 7ea9a1e
Showing 1 changed file with 8 additions and 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
@@ -297,7 +297,14 @@ public void close() {
       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();
   }