Merge pull request #17 from wheezil/master

cowtowncoder · web-flow · commit b959a61f6a39 · 2019-09-17T20:04:45.000-07:00
Issue #16: delete temp files after two-phase merge
diff --git a/src/main/java/com/fasterxml/sort/IteratingSorter.java b/src/main/java/com/fasterxml/sort/IteratingSorter.java
@@ -94,8 +94,8 @@ public Iterator<T> sort(DataReader<T> inputReader)
                     close();
                     return null;
                 }
-                _mergerInputs = presorted;
-                _merger = _createMergeReader(merge(presorted));
+                _mergerInputs = merge(presorted);
+                _merger = _createMergeReader(_mergerInputs);
                 iterator = new MergerIterator<T>(_merger);
             }
         } finally {

Original file line number	Diff line number	Diff line change
`@@ -94,8 +94,8 @@ public Iterator<T> sort(DataReader<T> inputReader)`
`94`	`94`	`close();`
`95`	`95`	`return null;`
`96`	`96`	`}`
`97`		`- _mergerInputs = presorted;`
`98`		`- _merger = _createMergeReader(merge(presorted));`
	`97`	`+ _mergerInputs = merge(presorted);`
	`98`	`+ _merger = _createMergeReader(_mergerInputs);`
`99`	`99`	`iterator = new MergerIterator<T>(_merger);`
`100`	`100`	`}`
`101`	`101`	`} finally {`