[core] fix the issue that BinaryExternalMerger spill files may be lea…

…ked. (apache#3975)
herefree · Aug 16, 2024 · 018341e · 018341e
1 parent b7939c3
commit 018341e
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/paimon-core/src/main/java/org/apache/paimon/sort/AbstractBinaryExternalMerger.java b/paimon-core/src/main/java/org/apache/paimon/sort/AbstractBinaryExternalMerger.java
@@ -173,7 +173,6 @@ private ChannelWithMeta mergeChannels(List<ChannelWithMeta> channelIDs) throws I
         channelManager.addChannel(mergedChannelID);
         ChannelWriterOutputView output = null;
 
-        int numBytesInLastBlock;
         int numBlocksWritten;
         try {
             output =
@@ -191,14 +190,14 @@ private ChannelWithMeta mergeChannels(List<ChannelWithMeta> channelIDs) throws I
                 output.getChannel().deleteChannel();
             }
             throw e;
-        }
-
-        // remove, close and delete channels
-        for (FileIOChannel channel : openChannels) {
-            channelManager.removeChannel(channel.getChannelID());
-            try {
-                channel.closeAndDelete();
-            } catch (Throwable ignored) {
+        } finally {
+            // remove, close and delete channels
+            for (FileIOChannel channel : openChannels) {
+                channelManager.removeChannel(channel.getChannelID());
+                try {
+                    channel.closeAndDelete();
+                } catch (Throwable ignored) {
+                }
             }
         }