Repository: spark Updated Branches: refs/heads/master dca6faa29 -> 8aa3cfff6
[SPARK-5514] DataFrame.collect should call executeCollect Author: Reynold Xin <r...@databricks.com> Closes #4313 from rxin/SPARK-5514 and squashes the following commits: e34e91b [Reynold Xin] [SPARK-5514] DataFrame.collect should call executeCollect Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/8aa3cfff Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/8aa3cfff Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/8aa3cfff Branch: refs/heads/master Commit: 8aa3cfff661753d6d87a8d9a87373d403436dd92 Parents: dca6faa Author: Reynold Xin <r...@databricks.com> Authored: Mon Feb 2 16:55:36 2015 -0800 Committer: Reynold Xin <r...@databricks.com> Committed: Mon Feb 2 16:55:36 2015 -0800 ---------------------------------------------------------------------- sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/8aa3cfff/sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala b/sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala index 1096e39..5d42d44 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/DataFrame.scala @@ -541,7 +541,7 @@ class DataFrame protected[sql]( /** * Returns an array that contains all of [[Row]]s in this [[DataFrame]]. */ - override def collect(): Array[Row] = rdd.collect() + override def collect(): Array[Row] = queryExecution.executedPlan.executeCollect() /** * Returns a Java list that contains all of [[Row]]s in this [[DataFrame]]. --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
