From 1524ff67e0bf3c0dc2e58c063dd71853bd7b0e81 Mon Sep 17 00:00:00 2001 From: Wenchen Fan Date: Fri, 29 May 2015 13:49:02 +0800 Subject: [PATCH] fix style --- .../apache/spark/sql/catalyst/expressions/predicates.scala | 6 ++++-- .../catalyst/expressions/ExpressionTypeCheckingSuite.scala | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/predicates.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/predicates.scala index 1540e92abf838..5f29036083e34 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/predicates.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/predicates.scala @@ -338,7 +338,8 @@ case class CaseWhen(branches: Seq[Expression]) extends CaseWhenLike { if (!whenList.forall(_.dataType == BooleanType)) { TypeCheckResult.fail(s"WHEN expressions should all be boolean type") } else if (!valueTypesEqual) { - TypeCheckResult.fail("THEN and ELSE expressions should all be same type or coercible to a common type") + TypeCheckResult.fail( + "THEN and ELSE expressions should all be same type or coercible to a common type") } else { TypeCheckResult.success } @@ -387,7 +388,8 @@ case class CaseKeyWhen(key: Expression, branches: Seq[Expression]) extends CaseW override def checkInputDataTypes(): TypeCheckResult = { if (!valueTypesEqual) { - TypeCheckResult.fail("THEN and ELSE expressions should all be same type or coercible to a common type") + TypeCheckResult.fail( + "THEN and ELSE expressions should all be same type or coercible to a common type") } else { TypeCheckResult.success } diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/ExpressionTypeCheckingSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/ExpressionTypeCheckingSuite.scala index d8f3e4e4e2541..9fdefc5301b8e 100644 --- a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/ExpressionTypeCheckingSuite.scala +++ b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/ExpressionTypeCheckingSuite.scala @@ -34,7 +34,8 @@ class ExpressionTypeCheckingSuite extends FunSuite { val e = intercept[AnalysisException] { checkAnalysis(expr) } - assert(e.getMessage.contains(s"cannot resolve '${expr.prettyString}' due to data type mismatch:")) + assert(e.getMessage.contains( + s"cannot resolve '${expr.prettyString}' due to data type mismatch:")) assert(e.getMessage.contains(errorMessage)) } @@ -58,7 +59,7 @@ class ExpressionTypeCheckingSuite extends FunSuite { checkAnalysis(Multiply('a, 'b)) checkAnalysis(Divide('a, 'b)) checkAnalysis(Remainder('a, 'b)) - //checkAnalysis(BitwiseAnd('a, 'b)) + // checkAnalysis(BitwiseAnd('a, 'b)) val msg = "differing types in BinaryArithmetic, IntegerType != BooleanType" checkError(Add('a, 'c), msg)