Add test result file and fix error message margin.

apache · Aug 17, 2017 · 38631bb · 38631bb
1 parent f5d8ebb
commit 38631bb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 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
@@ -174,20 +174,18 @@ case class In(value: Expression, list: Seq[Expression]) extends Predicate {
              |Left side columns:
              |[${valExprs.map(_.sql).mkString(", ")}].
              |Right side columns:
-             |[${sub.output.map(_.sql).mkString(", ")}].
-           """.stripMargin
+             |[${sub.output.map(_.sql).mkString(", ")}].""".stripMargin
 
         if (valExprs.length > sub.output.length) {
           TypeCheckResult.TypeCheckFailure(basicErrorMessage)
         } else if (subqueryOutputNotInCondition.nonEmpty) {
           val finalErrorMessage = basicErrorMessage +
             s"""
-               | The additional output in subquery aren't used in the condition of subquery.
-               | Additional output:
-               | [${subqueryOutputNotInCondition.map(_.sql).mkString(", ")}].
-               | Condition:
-               | [${children.map(_.sql).mkString(", ")}].
-             """.stripMargin
+               |The additional output in subquery aren't used in the condition of subquery.
+               |Additional output:
+               |[${subqueryOutputNotInCondition.map(_.sql).mkString(", ")}].
+               |Condition:
+               |[${children.map(_.sql).mkString(", ")}].""".stripMargin
           TypeCheckResult.TypeCheckFailure(finalErrorMessage)
         } else {
           val mismatchedColumns = valExprs.zip(sub.output.take(valExprs.length)).flatMap {

diff --git a/...src/test/resources/sql-tests/results/subquery/negative-cases/subq-input-typecheck.sql.out b/...src/test/resources/sql-tests/results/subquery/negative-cases/subq-input-typecheck.sql.out
@@ -81,7 +81,11 @@ Left side columns:
 [t1.`t1a`].
 Right side columns:
 [t2.`t2a`, t2.`t2b`].
-             ;
+The additional output in subquery aren't used in the condition of subquery.
+Additional output:
+[t2.`t2b`].
+Condition:
+[t1.`t1a`].;
 
 
 -- !query 6
@@ -102,5 +106,4 @@ number of columns in the output of subquery.
 Left side columns:
 [t1.`t1a`, t1.`t1b`].
 Right side columns:
-[t2.`t2a`].
-             ;
+[t2.`t2a`].;