dejankrak-db commented on code in PR #48608:
URL: https://github.com/apache/spark/pull/48608#discussion_r1815904321
##########
sql/core/src/test/scala/org/apache/spark/sql/CollationSQLExpressionsSuite.scala:
##########
@@ -2435,829 +2448,878 @@ class CollationSQLExpressionsSuite
}
test("min_by supports collation") {
- val collation = "UNICODE"
- val query = s"SELECT min_by(x, y) FROM VALUES ('a', 10), ('b', 50), ('c',
20) AS tab(x, y);"
- withSQLConf(SqlApiConf.DEFAULT_COLLATION -> collation) {
- checkAnswer(
- sql(query),
- Seq(
- Row("a")
+ testAdditionalCollations.foreach(collation => {
+ val query = s"SELECT min_by(x, y) FROM VALUES ('a', 10), ('b', 50),
('c', 20) AS tab(x, y);"
+ withSQLConf(SqlApiConf.DEFAULT_COLLATION -> collation) {
+ checkAnswer(
+ sql(query),
+ Seq(
+ Row("a")
+ )
)
- )
- // check result row data type
- val dataType = StringType(collation)
- assert(sql(query).schema.head.dataType == dataType)
- }
+ // check result row data type
+ val dataType = StringType(collation)
+ assert(sql(query).schema.head.dataType == dataType)
+ }
+ })
}
test("max_by supports collation") {
- val collation = "UNICODE"
- val query = s"SELECT max_by(x, y) FROM VALUES ('a', 10), ('b', 50), ('c',
20) AS tab(x, y);"
- withSQLConf(SqlApiConf.DEFAULT_COLLATION -> collation) {
- checkAnswer(
- sql(query),
- Seq(
- Row("b")
+ testAdditionalCollations.foreach(collation => {
+ val query = s"SELECT max_by(x, y) FROM VALUES ('a', 10), ('b', 50),
('c', 20) AS tab(x, y);"
+ withSQLConf(SqlApiConf.DEFAULT_COLLATION -> collation) {
+ checkAnswer(
+ sql(query),
+ Seq(
+ Row("b")
+ )
)
- )
- // check result row data type
- val dataType = StringType(collation)
- assert(sql(query).schema.head.dataType == dataType)
- }
+ // check result row data type
+ val dataType = StringType(collation)
+ assert(sql(query).schema.head.dataType == dataType)
+ }
+ })
}
test("array supports collation") {
- val collation = "UNICODE"
- val query = s"SELECT array('a', 'b', 'c');"
- withSQLConf(SqlApiConf.DEFAULT_COLLATION -> collation) {
- checkAnswer(
- sql(query),
- Seq(
- Row(Seq("a", "b", "c"))
+ testAdditionalCollations.foreach(collation => {
+ val query = s"SELECT array('a', 'b', 'c');"
+ withSQLConf(SqlApiConf.DEFAULT_COLLATION -> collation) {
+ checkAnswer(
+ sql(query),
+ Seq(
+ Row(Seq("a", "b", "c"))
+ )
)
- )
- // check result row data type
- val dataType = ArrayType(StringType(collation), false)
- assert(sql(query).schema.head.dataType == dataType)
- }
+ // check result row data type
+ val dataType = ArrayType(StringType(collation), false)
+ assert(sql(query).schema.head.dataType == dataType)
+ }
+ })
}
test("array_agg supports collation") {
Review Comment:
I made a slightly different refactoring, still removing code duplication
across all similar tests as you pointed out. The method
testCollationSqlExpressionCommon() now does the common part, whereas I
preferred to keep all the tests separately as troubleshooting is easier that
way (e.g. if a specific test fails, test name immediately indicates which one
it is) as opposed to putting all the test cases under a single test.
Please let me know if you have any additional suggestions/concerns, thnx!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
