From f512c5f9219d38c2445e4e776aa739ae6310bb60 Mon Sep 17 00:00:00 2001 From: Tarek Auel Date: Tue, 21 Jul 2015 11:57:27 -0700 Subject: [PATCH] [SPARK-9154][SQL] build fix --- .../sql/catalyst/expressions/stringOperations.scala | 2 +- .../org/apache/spark/sql/StringFunctionsSuite.scala | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/stringOperations.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/stringOperations.scala index 08b17420d6cbe..bb2a5124baa7f 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/stringOperations.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/stringOperations.scala @@ -487,7 +487,7 @@ case class StringFormat(children: Expression*) extends Expression with ImplicitC private def args: Seq[Expression] = children.tail override def inputTypes: Seq[AbstractDataType] = - children.zipWithIndex.map(x => if (x._2 == 0) StringType else AnyDataType) + StringType :: List.fill(children.size - 1)(AnyDataType) override def eval(input: InternalRow): Any = { diff --git a/sql/core/src/test/scala/org/apache/spark/sql/StringFunctionsSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/StringFunctionsSuite.scala index 274ec8f4675e8..fe4de8d8b855f 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/StringFunctionsSuite.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/StringFunctionsSuite.scala @@ -120,16 +120,6 @@ class StringFunctionsSuite extends QueryTest { checkAnswer( df.selectExpr("printf(a, b, c)"), Row("aa123cc")) - - val df2 = Seq(("aa%d%s".getBytes, 123, "cc")).toDF("a", "b", "c") - - checkAnswer( - df2.select(formatString($"a", $"b", $"c"), formatString("aa%d%s", "b", "c")), - Row("aa123cc", "aa123cc")) - - checkAnswer( - df2.selectExpr("printf(a, b, c)"), - Row("aa123cc")) } test("string instr function") {