You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by li...@apache.org on 2017/12/30 12:48:48 UTC
spark git commit: [TEST][MINOR] remove redundant
`EliminateSubqueryAliases` in test code
Repository: spark
Updated Branches:
refs/heads/master 14c4a62c1 -> 234d9435d
[TEST][MINOR] remove redundant `EliminateSubqueryAliases` in test code
## What changes were proposed in this pull request?
The `analyze` method in `implicit class DslLogicalPlan` already includes `EliminateSubqueryAliases`. So there's no need to call `EliminateSubqueryAliases` again after calling `analyze` in some test code.
## How was this patch tested?
Existing tests.
Author: Zhenhua Wang <wz...@163.com>
Closes #20122 from wzhfy/redundant_code.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/234d9435
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/234d9435
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/234d9435
Branch: refs/heads/master
Commit: 234d9435d47ad9a9cfb0f349f1fd20062c25b8dd
Parents: 14c4a62
Author: Zhenhua Wang <wz...@163.com>
Authored: Sat Dec 30 20:48:39 2017 +0800
Committer: gatorsmile <ga...@gmail.com>
Committed: Sat Dec 30 20:48:39 2017 +0800
----------------------------------------------------------------------
.../sql/catalyst/optimizer/ColumnPruningSuite.scala | 4 ++--
.../sql/catalyst/optimizer/FilterPushdownSuite.scala | 14 +++++++-------
.../catalyst/optimizer/JoinOptimizationSuite.scala | 3 +--
3 files changed, 10 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/234d9435/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/ColumnPruningSuite.scala
----------------------------------------------------------------------
diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/ColumnPruningSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/ColumnPruningSuite.scala
index 9f0f7e1..3f41f4b 100644
--- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/ColumnPruningSuite.scala
+++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/ColumnPruningSuite.scala
@@ -256,7 +256,7 @@ class ColumnPruningSuite extends PlanTest {
x.select('a)
.sortBy(SortOrder('a, Ascending)).analyze
- comparePlans(optimized, analysis.EliminateSubqueryAliases(correctAnswer))
+ comparePlans(optimized, correctAnswer)
// push down invalid
val originalQuery1 = {
@@ -271,7 +271,7 @@ class ColumnPruningSuite extends PlanTest {
.sortBy(SortOrder('a, Ascending))
.select('b).analyze
- comparePlans(optimized1, analysis.EliminateSubqueryAliases(correctAnswer1))
+ comparePlans(optimized1, correctAnswer1)
}
test("Column pruning on Window with useless aggregate functions") {
http://git-wip-us.apache.org/repos/asf/spark/blob/234d9435/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/FilterPushdownSuite.scala
----------------------------------------------------------------------
diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/FilterPushdownSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/FilterPushdownSuite.scala
index 4a23179..a9c2306 100644
--- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/FilterPushdownSuite.scala
+++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/FilterPushdownSuite.scala
@@ -504,7 +504,7 @@ class FilterPushdownSuite extends PlanTest {
}
val optimized = Optimize.execute(originalQuery.analyze)
- comparePlans(analysis.EliminateSubqueryAliases(originalQuery.analyze), optimized)
+ comparePlans(originalQuery.analyze, optimized)
}
test("joins: conjunctive predicates") {
@@ -523,7 +523,7 @@ class FilterPushdownSuite extends PlanTest {
left.join(right, condition = Some("x.b".attr === "y.b".attr))
.analyze
- comparePlans(optimized, analysis.EliminateSubqueryAliases(correctAnswer))
+ comparePlans(optimized, correctAnswer)
}
test("joins: conjunctive predicates #2") {
@@ -542,7 +542,7 @@ class FilterPushdownSuite extends PlanTest {
left.join(right, condition = Some("x.b".attr === "y.b".attr))
.analyze
- comparePlans(optimized, analysis.EliminateSubqueryAliases(correctAnswer))
+ comparePlans(optimized, correctAnswer)
}
test("joins: conjunctive predicates #3") {
@@ -566,7 +566,7 @@ class FilterPushdownSuite extends PlanTest {
condition = Some("z.a".attr === "x.b".attr))
.analyze
- comparePlans(optimized, analysis.EliminateSubqueryAliases(correctAnswer))
+ comparePlans(optimized, correctAnswer)
}
test("joins: push down where clause into left anti join") {
@@ -581,7 +581,7 @@ class FilterPushdownSuite extends PlanTest {
x.where("x.a".attr > 10)
.join(y, LeftAnti, Some("x.b".attr === "y.b".attr))
.analyze
- comparePlans(optimized, analysis.EliminateSubqueryAliases(correctAnswer))
+ comparePlans(optimized, correctAnswer)
}
test("joins: only push down join conditions to the right of a left anti join") {
@@ -598,7 +598,7 @@ class FilterPushdownSuite extends PlanTest {
LeftAnti,
Some("x.b".attr === "y.b".attr && "x.a".attr > 10))
.analyze
- comparePlans(optimized, analysis.EliminateSubqueryAliases(correctAnswer))
+ comparePlans(optimized, correctAnswer)
}
test("joins: only push down join conditions to the right of an existence join") {
@@ -616,7 +616,7 @@ class FilterPushdownSuite extends PlanTest {
ExistenceJoin(fillerVal),
Some("x.a".attr > 1))
.analyze
- comparePlans(optimized, analysis.EliminateSubqueryAliases(correctAnswer))
+ comparePlans(optimized, correctAnswer)
}
val testRelationWithArrayType = LocalRelation('a.int, 'b.int, 'c_arr.array(IntegerType))
http://git-wip-us.apache.org/repos/asf/spark/blob/234d9435/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/JoinOptimizationSuite.scala
----------------------------------------------------------------------
diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/JoinOptimizationSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/JoinOptimizationSuite.scala
index 97733a75..ccd9d8d 100644
--- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/JoinOptimizationSuite.scala
+++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/JoinOptimizationSuite.scala
@@ -17,7 +17,6 @@
package org.apache.spark.sql.catalyst.optimizer
-import org.apache.spark.sql.catalyst.analysis
import org.apache.spark.sql.catalyst.analysis.EliminateSubqueryAliases
import org.apache.spark.sql.catalyst.dsl.expressions._
import org.apache.spark.sql.catalyst.dsl.plans._
@@ -118,7 +117,7 @@ class JoinOptimizationSuite extends PlanTest {
queryAnswers foreach { queryAnswerPair =>
val optimized = Optimize.execute(queryAnswerPair._1.analyze)
- comparePlans(optimized, analysis.EliminateSubqueryAliases(queryAnswerPair._2.analyze))
+ comparePlans(optimized, queryAnswerPair._2.analyze)
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org