aboutsummaryrefslogtreecommitdiff
path: root/sql/hive
diff options
context:
space:
mode:
authorMichael Armbrust <michael@databricks.com>2015-03-24 13:22:46 -0700
committerMichael Armbrust <michael@databricks.com>2015-03-24 13:22:46 -0700
commit046c1e2aa459147bf592371bb9fb7a65edb182e7 (patch)
tree9891f84ac18ce4ca15d2f1b448c53ee2e338174c /sql/hive
parent3fa3d121dfec60f9768d3859e8450ee482b2d4e8 (diff)
downloadspark-046c1e2aa459147bf592371bb9fb7a65edb182e7.tar.gz
spark-046c1e2aa459147bf592371bb9fb7a65edb182e7.tar.bz2
spark-046c1e2aa459147bf592371bb9fb7a65edb182e7.zip
[SPARK-6375][SQL] Fix formatting of error messages.
Author: Michael Armbrust <michael@databricks.com> Closes #5155 from marmbrus/errorMessages and squashes the following commits: b898188 [Michael Armbrust] Fix formatting of error messages.
Diffstat (limited to 'sql/hive')
-rw-r--r--sql/hive/src/test/scala/org/apache/spark/sql/hive/ErrorPositionSuite.scala25
1 files changed, 23 insertions, 2 deletions
diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/ErrorPositionSuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/ErrorPositionSuite.scala
index f04437c595..968557c9c4 100644
--- a/sql/hive/src/test/scala/org/apache/spark/sql/hive/ErrorPositionSuite.scala
+++ b/sql/hive/src/test/scala/org/apache/spark/sql/hive/ErrorPositionSuite.scala
@@ -19,12 +19,29 @@ package org.apache.spark.sql.hive
import java.io.{OutputStream, PrintStream}
+import scala.util.Try
+
+import org.scalatest.BeforeAndAfter
+
import org.apache.spark.sql.hive.test.TestHive._
+import org.apache.spark.sql.hive.test.TestHive.implicits._
import org.apache.spark.sql.{AnalysisException, QueryTest}
-import scala.util.Try
-class ErrorPositionSuite extends QueryTest {
+class ErrorPositionSuite extends QueryTest with BeforeAndAfter {
+
+ before {
+ Seq((1, 1, 1)).toDF("a", "a", "b").registerTempTable("dupAttributes")
+ }
+
+ positionTest("ambiguous attribute reference 1",
+ "SELECT a from dupAttributes", "a")
+
+ positionTest("ambiguous attribute reference 2",
+ "SELECT a, b from dupAttributes", "a")
+
+ positionTest("ambiguous attribute reference 3",
+ "SELECT b, a from dupAttributes", "a")
positionTest("unresolved attribute 1",
"SELECT x FROM src", "x")
@@ -127,6 +144,10 @@ class ErrorPositionSuite extends QueryTest {
val error = intercept[AnalysisException] {
quietly(sql(query))
}
+
+ assert(!error.getMessage.contains("Seq("))
+ assert(!error.getMessage.contains("List("))
+
val (line, expectedLineNum) = query.split("\n").zipWithIndex.collect {
case (l, i) if l.contains(token) => (l, i + 1)
}.headOption.getOrElse(sys.error(s"Invalid test. Token $token not in $query"))