Added test case for SPARK-4487

apache · Nov 19, 2014 · cb5b7e9 · cb5b7e9
1 parent 282d529
commit cb5b7e9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/SqlParser.scala
@@ -263,8 +263,7 @@ class SqlParser extends AbstractSparkSQLParser {
 
   protected lazy val productExpression: Parser[Expression] =
     baseExpression *
-      ( "||" ^^^ { e1: Expression, e2: Expression) => Concat(e1, e2) }
-      | "*" ^^^ { (e1: Expression, e2: Expression) => Multiply(e1, e2) }
+      ( "*" ^^^ { (e1: Expression, e2: Expression) => Multiply(e1, e2) }
       | "/" ^^^ { (e1: Expression, e2: Expression) => Divide(e1, e2) }
       | "%" ^^^ { (e1: Expression, e2: Expression) => Remainder(e1, e2) }
       | "&" ^^^ { (e1: Expression, e2: Expression) => BitwiseAnd(e1, e2) }

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
@@ -154,8 +154,6 @@ case class Lower(child: Expression) extends UnaryExpression with CaseConversionE
   override def toString() = s"Lower($child)"
 }
 
-case class Concat(child: Expresson) extends BinaryExpression
-
 /** A base trait for functions that compare two strings, returning a boolean. */
 trait StringComparison {
   self: BinaryExpression =>

diff --git a/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala
@@ -973,4 +973,11 @@ class SQLQuerySuite extends QueryTest with BeforeAndAfterAll {
     checkAnswer(sql("SELECT a.b + 1 FROM data GROUP BY a.b + 1"), 2)
     dropTempTable("data")
   }
+
+  test("SPARK-4432 Fix attribute reference resolution error when using ORDER BY") {
+    checkAnswer(
+      sql("SELECT a + b FROM testData2 ORDER BY a"),
+      Seq(2, 3, 3 ,4 ,4 ,5).map(Seq(_))
+    )
+  }
 }