Fix memory leak on empty inputs.

apache · Jul 6, 2015 · 6890863 · 6890863
1 parent d246e29
commit 6890863
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/sql/catalyst/src/main/java/org/apache/spark/sql/execution/UnsafeExternalRowSorter.java b/sql/catalyst/src/main/java/org/apache/spark/sql/execution/UnsafeExternalRowSorter.java
@@ -112,6 +112,11 @@ private void cleanupResources() {
   Iterator<InternalRow> sort() throws IOException {
     try {
       final UnsafeSorterIterator sortedIterator = sorter.getSortedIterator();
+      if (!sortedIterator.hasNext()) {
+        // Since we won't ever call next() on an empty iterator, we need to clean up resources
+        // here in order to prevent memory leaks.
+        cleanupResources();
+      }
       return new AbstractScalaRowIterator() {
 
         private final int numFields = schema.length();
@@ -141,7 +146,7 @@ public InternalRow next() {
               );
               row.backingArray = rowDataCopy;
               row.pointTo(rowDataCopy, PlatformDependent.BYTE_ARRAY_OFFSET, numFields, objPool);
-              sorter.freeMemory();
+              cleanupResources();
               return row;
             }
           } catch (IOException e) {