Drop unrelated fixes

maropu · maropu · commit 1ac512b26c27 · 2018-01-04T14:59:40.000+09:00
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/stringExpressions.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/stringExpressions.scala
@@ -58,7 +58,7 @@ case class Concat(children: Seq[Expression]) extends Expression {
     } else {
       val childTypes = children.map(_.dataType)
       if (childTypes.exists(tpe => !Seq(StringType, BinaryType).contains(tpe))) {
-        return TypeCheckResult.TypeCheckFailure(
+        TypeCheckResult.TypeCheckFailure(
           s"input to function $prettyName should have StringType or BinaryType, but it's " +
             childTypes.map(_.simpleString).mkString("[", ", ", "]"))
       }

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ case class Concat(children: Seq[Expression]) extends Expression {`
`58`	`58`	`} else {`
`59`	`59`	`val childTypes = children.map(_.dataType)`
`60`	`60`	`if (childTypes.exists(tpe => !Seq(StringType, BinaryType).contains(tpe))) {`
`61`		`- return TypeCheckResult.TypeCheckFailure(`
	`61`	`+ TypeCheckResult.TypeCheckFailure(`
`62`	`62`	`s"input to function $prettyName should have StringType or BinaryType, but it's " +`
`63`	`63`	`childTypes.map(_.simpleString).mkString("[", ", ", "]"))`
`64`	`64`	`}`