You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2015/05/14 19:25:28 UTC
spark git commit: [SQL][minor] rename apply for QueryPlanner
Repository: spark
Updated Branches:
refs/heads/master 7fb715de6 -> f2cd00be3
[SQL][minor] rename apply for QueryPlanner
A follow-up of https://github.com/apache/spark/pull/5624
Author: Wenchen Fan <cl...@outlook.com>
Closes #6142 from cloud-fan/tmp and squashes the following commits:
971a92b [Wenchen Fan] use plan instead of execute
24c5ffe [Wenchen Fan] rename apply
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/f2cd00be
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/f2cd00be
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/f2cd00be
Branch: refs/heads/master
Commit: f2cd00be350fdba3acfbfdf155701182d1c404fd
Parents: 7fb715d
Author: Wenchen Fan <cl...@outlook.com>
Authored: Thu May 14 10:25:18 2015 -0700
Committer: Reynold Xin <rx...@databricks.com>
Committed: Thu May 14 10:25:18 2015 -0700
----------------------------------------------------------------------
.../org/apache/spark/sql/catalyst/planning/QueryPlanner.scala | 4 ++--
sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/f2cd00be/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/planning/QueryPlanner.scala
----------------------------------------------------------------------
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/planning/QueryPlanner.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/planning/QueryPlanner.scala
index 51b5699..73a2188 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/planning/QueryPlanner.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/planning/QueryPlanner.scala
@@ -51,9 +51,9 @@ abstract class QueryPlanner[PhysicalPlan <: TreeNode[PhysicalPlan]] {
* filled in automatically by the QueryPlanner using the other execution strategies that are
* available.
*/
- protected def planLater(plan: LogicalPlan) = apply(plan).next()
+ protected def planLater(plan: LogicalPlan) = this.plan(plan).next()
- def apply(plan: LogicalPlan): Iterator[PhysicalPlan] = {
+ def plan(plan: LogicalPlan): Iterator[PhysicalPlan] = {
// Obviously a lot to do here still...
val iter = strategies.view.flatMap(_(plan)).toIterator
assert(iter.hasNext, s"No plan for $plan")
http://git-wip-us.apache.org/repos/asf/spark/blob/f2cd00be/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala
----------------------------------------------------------------------
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala b/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala
index 521f3dc..b33a700 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala
@@ -1321,7 +1321,7 @@ class SQLContext(@transient val sparkContext: SparkContext)
// TODO: Don't just pick the first one...
lazy val sparkPlan: SparkPlan = {
SparkPlan.currentContext.set(self)
- planner(optimizedPlan).next()
+ planner.plan(optimizedPlan).next()
}
// executedPlan should not be used to initialize any SparkPlan. It should be
// only used for execution.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org