commit abf462a7ddab11a44610827b0cd69510c099d9b6
author Ulrich Kramer <u.kramer@sap.com> Wed Feb 07 14:10:26 2024 +0100
committer Ruben Quesada Lopez <rubenql@gmail.com> Mon Feb 12 08:30:40 2024 +0000
tree f7e2f3de4bc6d386df0c89ae11c044c347f6ce17
parent ec0dc3c886ef06020294dc80971c29ec3b90fa44

[CALCITE-6251] InnerEnumerator in EnumerableDefaults::correlateBatchJoin is not closed

linq4j/src/main/java/org/apache/calcite/linq4j/EnumerableDefaults.java

diff --git a/linq4j/src/main/java/org/apache/calcite/linq4j/EnumerableDefaults.java b/linq4j/src/main/java/org/apache/calcite/linq4j/EnumerableDefaults.java
index 3d2c141..3481955 100644
--- a/linq4j/src/main/java/org/apache/calcite/linq4j/EnumerableDefaults.java
+++ b/linq4j/src/main/java/org/apache/calcite/linq4j/EnumerableDefaults.java
@@ -1717,6 +1717,8 @@
                 if (innerEnumerable == null) {
                   innerEnumerable = Linq4j.emptyEnumerable();
                 }
+                closeInner();
+                Enumerable<TInner> innerEnumerable = requireNonNull(this.innerEnumerable);
                 innerEnumerator = innerEnumerable.enumerator();
                 innerEnumHasNext = innerEnumerator.moveNext();
 
@@ -1799,11 +1801,16 @@
             i = -1;
           }
 
-          @Override public void close() {
-            outerEnumerator.close();
+          private void closeInner() {
             if (innerEnumerator != null) {
               innerEnumerator.close();
+              innerEnumerator = null;
             }
+          }
+
+          @Override public void close() {
+            outerEnumerator.close();
+            closeInner();
             outerValue = null;
             innerValue = null;
           }