This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new be0ae1388cd8 [SPARK-50541][SQL][TESTS][FOLLOWUP] Use `SPARK_VERSION`
instead of hard-coded version strings
be0ae1388cd8 is described below
commit be0ae1388cd87d8264bdcb41332d18961c1b592d
Author: Dongjoon Hyun <[email protected]>
AuthorDate: Tue Jan 7 09:44:24 2025 -0800
[SPARK-50541][SQL][TESTS][FOLLOWUP] Use `SPARK_VERSION` instead of
hard-coded version strings
### What changes were proposed in this pull request?
This is a follow-up to use `SPARK_VERSION` instead of hard-coded version
strings.
- #49139
### Why are the changes needed?
Hard-coded version strings will cause unit test failures from next week
during Apache Spark 4.0.0 RC and maintenance releases like 4.0.1-SNAPSHOT.
**BEFORE**
```
$ git grep 'created_by = Some("Spark '
sql/core/src/test/scala/org/apache/spark/sql/execution/command/v1/DescribeTableSuite.scala:
created_by = Some("Spark 4.0.0-SNAPSHOT"),
sql/core/src/test/scala/org/apache/spark/sql/execution/command/v1/DescribeTableSuite.scala:
created_by = Some("Spark 4.0.0-SNAPSHOT"),
sql/core/src/test/scala/org/apache/spark/sql/execution/command/v1/DescribeTableSuite.scala:
created_by = Some("Spark 4.0.0-SNAPSHOT"),
sql/core/src/test/scala/org/apache/spark/sql/execution/command/v1/DescribeTableSuite.scala:
created_by = Some("Spark 4.0.0-SNAPSHOT"),
sql/core/src/test/scala/org/apache/spark/sql/execution/command/v1/DescribeTableSuite.scala:
created_by = Some("Spark 4.0.0-SNAPSHOT"),
```
**AFTER**
```
$ git grep 'created_by = Some("Spark '
$
```
### Does this PR introduce _any_ user-facing change?
No, this is a test-case fix.
### How was this patch tested?
Pass the CIs and check manually.
### Was this patch authored or co-authored using generative AI tooling?
No.
Closes #49401 from dongjoon-hyun/SPARK-50541.
Authored-by: Dongjoon Hyun <[email protected]>
Signed-off-by: Dongjoon Hyun <[email protected]>
---
.../spark/sql/execution/command/v1/DescribeTableSuite.scala | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git
a/sql/core/src/test/scala/org/apache/spark/sql/execution/command/v1/DescribeTableSuite.scala
b/sql/core/src/test/scala/org/apache/spark/sql/execution/command/v1/DescribeTableSuite.scala
index 4413087e886e..d5dd96f55c11 100644
---
a/sql/core/src/test/scala/org/apache/spark/sql/execution/command/v1/DescribeTableSuite.scala
+++
b/sql/core/src/test/scala/org/apache/spark/sql/execution/command/v1/DescribeTableSuite.scala
@@ -22,6 +22,7 @@ import java.util.Locale
import org.json4s._
import org.json4s.jackson.JsonMethods.parse
+import org.apache.spark.SPARK_VERSION
import org.apache.spark.sql.{AnalysisException, QueryTest, Row}
import
org.apache.spark.sql.connector.catalog.CatalogManager.SESSION_CATALOG_NAME
import org.apache.spark.sql.execution.command
@@ -346,7 +347,7 @@ class DescribeTableSuite extends DescribeTableSuiteBase
with CommandSuiteBase {
owner = Some(""),
created_time = Some(""),
last_access = Some("UNKNOWN"),
- created_by = Some("Spark 4.0.0-SNAPSHOT"),
+ created_by = Some(s"Spark $SPARK_VERSION"),
`type` = Some("MANAGED"),
provider = Some("parquet"),
bucket_columns = Some(List("employee_id")),
@@ -413,7 +414,7 @@ class DescribeTableSuite extends DescribeTableSuiteBase
with CommandSuiteBase {
TableColumn("category", Type("string"), true)
)),
last_access = Some("UNKNOWN"),
- created_by = Some("Spark 4.0.0-SNAPSHOT"),
+ created_by = Some(s"Spark $SPARK_VERSION"),
`type` = Some("MANAGED"),
provider = Some("parquet"),
bucket_columns = Some(Nil),
@@ -480,7 +481,7 @@ class DescribeTableSuite extends DescribeTableSuiteBase
with CommandSuiteBase {
TableColumn("is_active", Type("boolean"), default = Some("true"))
)),
last_access = Some("UNKNOWN"),
- created_by = Some("Spark 4.0.0-SNAPSHOT"),
+ created_by = Some(s"Spark $SPARK_VERSION"),
`type` = Some("MANAGED"),
storage_properties = None,
provider = Some("parquet"),
@@ -572,7 +573,7 @@ class DescribeTableSuite extends DescribeTableSuiteBase
with CommandSuiteBase {
outputformat =
Some("org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat"),
storage_properties = Some(Map("serialization.format" -> "1")),
last_access = Some("UNKNOWN"),
- created_by = Some("Spark 4.0.0-SNAPSHOT"),
+ created_by = Some(s"Spark $SPARK_VERSION"),
`type` = Some("VIEW"),
view_text = Some("SELECT * FROM spark_catalog.ns.table"),
view_original_text = Some("SELECT * FROM spark_catalog.ns.table"),
@@ -750,7 +751,7 @@ class DescribeTableSuite extends DescribeTableSuiteBase
with CommandSuiteBase {
"option2" -> "value2"
)),
last_access = Some("UNKNOWN"),
- created_by = Some("Spark 4.0.0-SNAPSHOT"),
+ created_by = Some(s"Spark $SPARK_VERSION"),
`type` = Some("MANAGED"),
provider = Some("parquet"),
comment = Some("A table with nested complex types"),
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
