[common] fix the problem that RecordReader may not be closed in async…

…hronous compact thread.
liming30 · Nov 13, 2023 · e442515 · e442515
1 parent da35cbe
commit e442515
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/paimon-common/src/main/java/org/apache/paimon/reader/RecordReaderIterator.java b/paimon-common/src/main/java/org/apache/paimon/reader/RecordReaderIterator.java
@@ -76,6 +76,10 @@ private void advanceIfNeeded() {
                     break;
                 } else {
                     currentIterator.releaseBatch();
+                    // reset currentIterator, because reader#readBatch will be affected by
+                    // interrupt, which will cause currentIterator#releaseBatch to be executed
+                    // twice.
+                    currentIterator = null;
                     currentIterator = reader.readBatch();
                     if (currentIterator == null) {
                         break;
@@ -89,9 +93,12 @@ private void advanceIfNeeded() {
 
     @Override
     public void close() throws Exception {
-        if (currentIterator != null) {
-            currentIterator.releaseBatch();
+        try {
+            if (currentIterator != null) {
+                currentIterator.releaseBatch();
+            }
+        } finally {
+            reader.close();
         }
-        reader.close();
     }
 }