Repository: spark Updated Branches: refs/heads/master 2a55cb41b -> e63a86abe
[SPARK-6872] [SQL] add copy in external sort We need add copy before call externalsort. Author: Daoyuan Wang <[email protected]> Closes #5481 from adrian-wang/extsort and squashes the following commits: 9611586 [Daoyuan Wang] fix bug in external sort Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/e63a86ab Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/e63a86ab Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/e63a86ab Branch: refs/heads/master Commit: e63a86abe2794332cdad71d87b72a7c56327a43d Parents: 2a55cb4 Author: Daoyuan Wang <[email protected]> Authored: Mon Apr 13 16:00:58 2015 -0700 Committer: Michael Armbrust <[email protected]> Committed: Mon Apr 13 16:00:58 2015 -0700 ---------------------------------------------------------------------- .../main/scala/org/apache/spark/sql/execution/basicOperators.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/e63a86ab/sql/core/src/main/scala/org/apache/spark/sql/execution/basicOperators.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/basicOperators.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/basicOperators.scala index 6eec520..f8221f4 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/basicOperators.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/basicOperators.scala @@ -194,7 +194,7 @@ case class ExternalSort( child.execute().mapPartitions( { iterator => val ordering = newOrdering(sortOrder, child.output) val sorter = new ExternalSorter[Row, Null, Row](ordering = Some(ordering)) - sorter.insertAll(iterator.map(r => (r, null))) + sorter.insertAll(iterator.map(r => (r.copy, null))) val baseIterator = sorter.iterator.map(_._1) // TODO(marmbrus): The complex type signature below thwarts inference for no reason. CompletionIterator[Row, Iterator[Row]](baseIterator, sorter.stop()) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
