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 2016/04/03 08:05:41 UTC
spark git commit: [HOTFIX] Fix Scala 2.10 compilation
Repository: spark
Updated Branches:
refs/heads/master c2f25b1a1 -> 7be462050
[HOTFIX] Fix Scala 2.10 compilation
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/7be46205
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/7be46205
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/7be46205
Branch: refs/heads/master
Commit: 7be46205083fc688249ee619ac7758904f7aa55d
Parents: c2f25b1
Author: Reynold Xin <rx...@databricks.com>
Authored: Sat Apr 2 23:05:23 2016 -0700
Committer: Reynold Xin <rx...@databricks.com>
Committed: Sat Apr 2 23:05:23 2016 -0700
----------------------------------------------------------------------
.../spark/sql/catalyst/optimizer/SimplifyConditionalSuite.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/7be46205/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/SimplifyConditionalSuite.scala
----------------------------------------------------------------------
diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/SimplifyConditionalSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/SimplifyConditionalSuite.scala
index 33239c0..c02fec3 100644
--- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/SimplifyConditionalSuite.scala
+++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/SimplifyConditionalSuite.scala
@@ -41,7 +41,7 @@ class SimplifyConditionalSuite extends PlanTest with PredicateHelper {
private val trueBranch = (TrueLiteral, Literal(5))
private val normalBranch = (NonFoldableLiteral(true), Literal(10))
private val unreachableBranch = (FalseLiteral, Literal(20))
- private val nullBranch = (Literal(null, NullType), Literal(30))
+ private val nullBranch = (Literal.create(null, NullType), Literal(30))
test("simplify if") {
assertEquivalent(
@@ -53,7 +53,7 @@ class SimplifyConditionalSuite extends PlanTest with PredicateHelper {
Literal(20))
assertEquivalent(
- If(Literal(null, NullType), Literal(10), Literal(20)),
+ If(Literal.create(null, NullType), Literal(10), Literal(20)),
Literal(20))
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org