This is an automated email from the ASF dual-hosted git repository.
wenchen pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new 7af0544 [SPARK-38266][3.2][FOLLOW-UP] Fix broken test failure in 3.2
build
7af0544 is described below
commit 7af054470bd964d4633eb91b33fd04d927154af0
Author: yi.wu <yi...@databricks.com>
AuthorDate: Tue Feb 22 13:39:34 2022 +0800
[SPARK-38266][3.2][FOLLOW-UP] Fix broken test failure in 3.2 build
### What changes were proposed in this pull request?
Fix test failure of branch-3.2 build.
### Why are the changes needed?
The error message in 3.2 hasn't been improved. So the unit test failed due
to the mismatched error message.
```
[info] - SPARK-35937: GetDateFieldOperations should skip unresolved nodes
*** FAILED *** (20 milliseconds)
[info] "cannot resolve 'df1.timeStr' given input columns: [df3.timeStr,
df1.tsStr]" did not contain "Column 'df1.timeStr' does not exist."
(DataFrameSelfJoinSuite.scala:484)
[info] org.scalatest.exceptions.TestFailedException:
[info] at
org.scalatest.Assertions.newAssertionFailedException(Assertions.scala:472)
[info] at
org.scalatest.Assertions.newAssertionFailedException$(Assertions.scala:471)
[info] at
org.scalatest.Assertions$.newAssertionFailedException(Assertions.scala:1231)
[info] at
org.scalatest.Assertions$AssertionsHelper.macroAssert(Assertions.scala:1295)
[info] at
org.apache.spark.sql.DataFrameSelfJoinSuite.$anonfun$new$108(DataFrameSelfJoinSuite.scala:484)
[info] at
org.apache.spark.sql.catalyst.plans.SQLHelper.withSQLConf(SQLHelper.scala:54)
[info] at
org.apache.spark.sql.catalyst.plans.SQLHelper.withSQLConf$(SQLHelper.scala:38)
[info] at
org.apache.spark.sql.DataFrameSelfJoinSuite.org$apache$spark$sql$test$SQLTestUtilsBase$$super$withSQLConf(DataFrameSelfJoinSuite.scala:30)
[info] at
org.apache.spark.sql.test.SQLTestUtilsBase.withSQLConf(SQLTestUtils.scala:246)
[info] at
org.apache.spark.sql.test.SQLTestUtilsBase.withSQLConf$(SQLTestUtils.scala:244)
[info] at
org.apache.spark.sql.DataFrameSelfJoinSuite.withSQLConf(DataFrameSelfJoinSuite.scala:30)
[info] at
org.apache.spark.sql.DataFrameSelfJoinSuite.$anonfun$new$107(DataFrameSelfJoinSuite.scala:472)
[info] at
scala.runtime.java8.JFunction0$mcV$sp.apply(JFunction0$mcV$sp.java:23)
[info] at org.scalatest.OutcomeOf.outcomeOf(OutcomeOf.scala:85)
...
```
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Tested locally.
Closes #35601 from Ngone51/SPARK-38266-followup.
Authored-by: yi.wu <yi...@databricks.com>
Signed-off-by: Wenchen Fan <wenc...@databricks.com>
---
.../src/test/scala/org/apache/spark/sql/DataFrameSelfJoinSuite.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/sql/core/src/test/scala/org/apache/spark/sql/DataFrameSelfJoinSuite.scala
b/sql/core/src/test/scala/org/apache/spark/sql/DataFrameSelfJoinSuite.scala
index 4d0dd46..e520cbe 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/DataFrameSelfJoinSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/DataFrameSelfJoinSuite.scala
@@ -481,7 +481,7 @@ class DataFrameSelfJoinSuite extends QueryTest with
SharedSparkSession {
val ex = intercept[AnalysisException](
df3.join(df1, year($"df1.timeStr") === year($"df3.tsStr"))
)
- assert(ex.message.contains("Column 'df1.timeStr' does not exist."))
+ assert(ex.message.contains("cannot resolve 'df1.timeStr'"))
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
