Skip to content

[SPARK-13523] [SQL] Reuse exchanges in a query #11403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
davies wants to merge 6 commits into from
Closed

[SPARK-13523] [SQL] Reuse exchanges in a query #11403

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
57866c2
WIP: reuse exchanges in a query
Feb 26, 2016
f6a7f5c
fix style
Mar 4, 2016
3cc23f3
fix flakyness of sameResult
Mar 4, 2016
679d669
Merge branch 'master' of github.com:apache/spark into dedup
Mar 8, 2016
7df43ca
address comments
Mar 8, 2016
7cd6844
address comments
Mar 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
address comments
  • Loading branch information
Davies Liu committed Mar 9, 2016
commit 7cd6844bb405bfe66285a60b58cd583f86f1a2cb
14 changes: 7 additions & 7 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/QueryPlan.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,12 +257,12 @@ abstract class QueryPlan[PlanType <: QueryPlan[PlanType]] extends TreeNode[PlanT
* can do better should override this function.
*/
def sameResult(plan: PlanType): Boolean = {
val cleanLeft = this.canonicalized
val cleanRight = plan.canonicalized
cleanLeft.getClass == cleanRight.getClass &&
cleanLeft.children.size == cleanRight.children.size &&
cleanLeft.cleanArgs == cleanRight.cleanArgs &&
(cleanLeft.children, cleanRight.children).zipped.forall(_ sameResult _)
val canonicalizedLeft = this.canonicalized
val canonicalizedRight = plan.canonicalized
canonicalizedLeft.getClass == canonicalizedRight.getClass &&
canonicalizedLeft.children.size == canonicalizedRight.children.size &&
canonicalizedLeft.cleanArgs == canonicalizedRight.cleanArgs &&
(canonicalizedLeft.children, canonicalizedRight.children).zipped.forall(_ sameResult _)
}

/**
Expand Down Expand Up @@ -291,7 +291,7 @@ abstract class QueryPlan[PlanType <: QueryPlan[PlanType]] extends TreeNode[PlanT
productIterator.map {
// Children are checked using sameResult above.
case tn: TreeNode[_] if containsChild(tn) => null
case e: Expression => cleanExpression(e)
case e: Expression => cleanArg(e)
case s: Option[_] => s.map(cleanArg)
case s: Seq[_] => s.map(cleanArg)
case m: Map[_, _] => m.mapValues(cleanArg)
Expand Down
9 changes: 7 additions & 2 deletions sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1337,12 +1337,17 @@ class DataFrameSuite extends QueryTest with SharedSQLContext {
}
}

test("same result on aggregate") {
test("sameResult() on aggregate") {
val df = sqlContext.range(100)
val agg1 = df.groupBy().count()
val agg2 = df.groupBy().count()
// two aggregates with different ExprId within them should have same result
agg1.queryExecution.executedPlan.sameResult(agg2.queryExecution.executedPlan)
assert(agg1.queryExecution.executedPlan.sameResult(agg2.queryExecution.executedPlan))
val agg3 = df.groupBy().sum()
assert(!agg1.queryExecution.executedPlan.sameResult(agg3.queryExecution.executedPlan))
val df2 = sqlContext.range(101)
val agg4 = df2.groupBy().count()
assert(!agg1.queryExecution.executedPlan.sameResult(agg4.queryExecution.executedPlan))
}

test("SPARK-12512: support `.` in column name for withColumn()") {
Expand Down