You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by "stefankandic (via GitHub)" <gi...@apache.org> on 2024/02/14 17:34:06 UTC
[PR] [SPARK-47009][Collation] Enable create table support for collation [spark]
stefankandic opened a new pull request, #45105:
URL: https://github.com/apache/spark/pull/45105
<!--
Thanks for sending a pull request! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines: https://spark.apache.org/contributing.html
2. Ensure you have added or run the appropriate tests for your PR: https://spark.apache.org/developer-tools.html
3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][SPARK-XXXX] Your PR title ...'.
4. Be sure to keep the PR description updated to reflect all changes.
5. Please write your PR title to summarize what this PR proposes.
6. If possible, provide a concise example to reproduce the issue for a faster review.
7. If you want to add a new configuration, please read the guideline first for naming configurations in
'core/src/main/scala/org/apache/spark/internal/config/ConfigEntry.scala'.
8. If you want to add or modify an error type or message, please read the guideline first in
'common/utils/src/main/resources/error/README.md'.
-->
### What changes were proposed in this pull request?
<!--
Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue.
If possible, please consider writing useful notes for better and faster reviews in your PR. See the examples below.
1. If you refactor some codes with changing classes, showing the class hierarchy will help reviewers.
2. If you fix some SQL features, you can provide some references of other DBMSes.
3. If there is design documentation, please add the link.
4. If there is a discussion in the mailing list, please add the link.
-->
Adding support for create table with collated columns using parquet
### Why are the changes needed?
<!--
Please clarify why the changes are needed. For instance,
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
-->
In order to support basic DDL operations for collations
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as the documentation fix.
If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description and/or an example to show the behavior difference if possible.
If possible, please also clarify if this is a user-facing change compared to the released Spark versions or within the unreleased branches such as master.
If no, write 'No'.
-->
Yes, users are now able to create tables with collated columns
### How was this patch tested?
<!--
If tests were added, say they were added here. Please make sure to add some test cases that check the changes thoroughly including negative and positive cases if possible.
If it was tested in a way different from regular unit tests, please clarify how you tested step by step, ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future.
If tests were not added, please describe why they were not added and/or why it was difficult to add.
If benchmark tests were added, please run the benchmarks in GitHub Actions for the consistent environment, and the instructions could accord to: https://spark.apache.org/developer-tools.html#github-workflow-benchmarks.
-->
With UTs
### Was this patch authored or co-authored using generative AI tooling?
<!--
If generative AI tooling has been used in the process of authoring this patch, please include the
phrase: 'Generated-by: ' followed by the name of the tool and its version.
If no, write 'No'.
Please refer to the [ASF Generative Tooling Guidance](https://www.apache.org/legal/generative-tooling.html) for details.
-->
No
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47009][SQL] Enable create table support for collation [spark]
Posted by "stefankandic (via GitHub)" <gi...@apache.org>.
stefankandic commented on code in PR #45105:
URL: https://github.com/apache/spark/pull/45105#discussion_r1496018589
##########
sql/core/src/test/scala/org/apache/spark/sql/CollationSuite.scala:
##########
@@ -174,4 +176,89 @@ class CollationSuite extends QueryTest with SharedSparkSession {
Row(expected))
}
}
+
+ test("create table with collation") {
+ val tableName = "parquet_dummy_tbl"
+ val collationName = "UCS_BASIC_LCASE"
+ val collationId = CollationFactory.collationNameToId(collationName)
+
+ withTable(tableName) {
+ sql(
+ s"""
+ |CREATE TABLE $tableName (c1 STRING COLLATE '$collationName')
+ |USING PARQUET
+ |""".stripMargin)
+
+ sql(s"INSERT INTO $tableName VALUES ('aaa')")
+ sql(s"INSERT INTO $tableName VALUES ('AAA')")
+
+ checkAnswer(sql(s"SELECT DISTINCT COLLATION(c1) FROM $tableName"), Seq(Row(collationName)))
+ assert(sql(s"select c1 FROM $tableName").schema.head.dataType == StringType(collationId))
+ val dd = sql(s"SELECT c1 FROM $tableName").toDF("c2")
+ dd.write.mode(SaveMode.Overwrite).parquet("/tmp/stefan_tbl")
+ }
+ }
+
+ test("create table with collations inside a struct") {
+ val tableName = "struct_collation_tbl"
+ val collationName = "UCS_BASIC_LCASE"
+ val collationId = CollationFactory.collationNameToId(collationName)
+
+ withTable(tableName) {
+ sql(
+ s"""
+ |CREATE TABLE $tableName
+ |(c1 STRUCT<name: STRING COLLATE '$collationName', age: INT>)
+ |USING PARQUET
+ |""".stripMargin)
+
+ sql(s"INSERT INTO $tableName VALUES (named_struct('name', 'aaa', 'id', 1))")
+ sql(s"INSERT INTO $tableName VALUES (named_struct('name', 'AAA', 'id', 2))")
+
+ checkAnswer(sql(s"SELECT DISTINCT collation(c1.name) FROM $tableName"),
+ Seq(Row(collationName)))
+ assert(sql(s"SELECT c1.name FROM $tableName").schema.head.dataType == StringType(collationId))
+ }
+ }
+
+ test("add collated column with alter table") {
+ val tableName = "alter_column_tbl"
+ val defaultCollation = "UCS_BASIC"
+ val collationName = "UCS_BASIC_LCASE"
+ val collationId = CollationFactory.collationNameToId(collationName)
+
+ withTable(tableName) {
+ sql(
+ s"""
+ |CREATE TABLE $tableName (c1 STRING)
+ |USING PARQUET
Review Comment:
does it make sense to extend `DatasourceV2SQLBase` in `CollationSuite` or add tests directly to `DataSourceV2SQLSuite `
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47009][SQL] Enable create table support for collation [spark]
Posted by "dbatomic (via GitHub)" <gi...@apache.org>.
dbatomic commented on code in PR #45105:
URL: https://github.com/apache/spark/pull/45105#discussion_r1495181485
##########
sql/api/src/main/scala/org/apache/spark/sql/catalyst/parser/DataTypeAstBuilder.scala:
##########
@@ -58,8 +59,8 @@ class DataTypeAstBuilder extends SqlBaseParserBaseVisitor[AnyRef] {
* Resolve/create a primitive type.
*/
override def visitPrimitiveDataType(ctx: PrimitiveDataTypeContext): DataType = withOrigin(ctx) {
- val typeName = ctx.`type`.start.getType
- (typeName, ctx.INTEGER_VALUE().asScala.toList) match {
+ val typeCtx = ctx.`type`
+ (typeCtx.start.getType, ctx.INTEGER_VALUE().asScala.toList) match {
Review Comment:
adding @hvanhovell
We will have a meeting with Herman on Thursday to discuss how collations play with Spark Connect.
I just gave it a quick spin and seems like we lack collation support in spark connect even without this PR. e.g.
```
sql("select 'abc' collate 'UCS_BASIC_LCASE'")
```
gets us:
pyspark.errors.exceptions.connect.SparkConnectGrpcException: (org.apache.spark.sql.connect.common.InvalidPlanInput) Does not support convert string(UCS_BASIC_LCASE) to connect proto types.
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47009][SQL] Enable create table support for collation [spark]
Posted by "stefankandic (via GitHub)" <gi...@apache.org>.
stefankandic commented on code in PR #45105:
URL: https://github.com/apache/spark/pull/45105#discussion_r1497269272
##########
sql/core/src/test/scala/org/apache/spark/sql/connector/DataSourceV2SQLSuite.scala:
##########
@@ -292,6 +292,37 @@ class DataSourceV2SQLSuiteV1Filter
}
}
+ test("create v2 table with collation column") {
Review Comment:
sure, no problem
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47009][SQL] Enable create table support for collation [spark]
Posted by "stefankandic (via GitHub)" <gi...@apache.org>.
stefankandic commented on code in PR #45105:
URL: https://github.com/apache/spark/pull/45105#discussion_r1497982234
##########
sql/core/src/test/scala/org/apache/spark/sql/connector/DataSourceV2SQLSuite.scala:
##########
@@ -292,6 +292,37 @@ class DataSourceV2SQLSuiteV1Filter
}
}
+ test("create v2 table with collation column") {
Review Comment:
extending `DatasourceV2SQLBase` worked without issues in my IDE using maven, but has a very weird failure when using sbt which is why the PR check keeps failing. Is this a known thing perhaps?
`[info] - add collated column with alter table *** FAILED *** (237 milliseconds)
[info] org.apache.spark.SparkException: Job aborted due to stage failure: Task 0 in stage 140.0 failed 1 times, most recent failure: Lost task 0.0 in stage 140.0 (TID 134) (192.168.15.240 executor driver): java.lang.AssertionError: index (1) should < 1
[info] at org.apache.spark.sql.catalyst.expressions.UnsafeRow.assertIndexIsValid(UnsafeRow.java:120)`
cc: @dbatomic
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47009][Collation] Enable create table support for collation [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #45105:
URL: https://github.com/apache/spark/pull/45105#discussion_r1490415076
##########
sql/api/src/main/scala/org/apache/spark/sql/catalyst/parser/DataTypeAstBuilder.scala:
##########
@@ -58,8 +59,8 @@ class DataTypeAstBuilder extends SqlBaseParserBaseVisitor[AnyRef] {
* Resolve/create a primitive type.
*/
override def visitPrimitiveDataType(ctx: PrimitiveDataTypeContext): DataType = withOrigin(ctx) {
- val typeName = ctx.`type`.start.getType
- (typeName, ctx.INTEGER_VALUE().asScala.toList) match {
+ val typeCtx = ctx.`type`
+ (typeCtx.start.getType, ctx.INTEGER_VALUE().asScala.toList) match {
Review Comment:
cc @hvanhovell @HyukjinKwon , since we put the SQL parser in the Spark Connect Scala client component, adding new data types means a client version upgrade.
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47009][SQL] Enable create table support for collation [spark]
Posted by "stefankandic (via GitHub)" <gi...@apache.org>.
stefankandic commented on PR #45105:
URL: https://github.com/apache/spark/pull/45105#issuecomment-1952866361
@cloud-fan added the info on min/max stats and pushdown, not sure about what you mean with the corresponding parquet type for string with collation, AFAIK there is no such thing
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47009][Collation] Enable create table support for collation [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #45105:
URL: https://github.com/apache/spark/pull/45105#discussion_r1490413649
##########
sql/api/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBaseParser.g4:
##########
@@ -1095,6 +1095,10 @@ colPosition
: position=FIRST | position=AFTER afterCol=errorCapturingIdentifier
;
+collateExpression
Review Comment:
maybe `collateClause`? This is not really an expression.
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47009][SQL] Enable create table support for collation [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on PR #45105:
URL: https://github.com/apache/spark/pull/45105#issuecomment-1952939546
> AFAIK there is no such thing
Yes, and we should mention it in the PR description. We still map string with collation to parquet string type. This means we don't support cross-engine compatibility (collation is ignored when reading parquet files with other engines like Presto). It's OK, but we need to call it out.
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47009][SQL] Enable create table support for collation [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan closed pull request #45105: [SPARK-47009][SQL] Enable create table support for collation
URL: https://github.com/apache/spark/pull/45105
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47009][SQL] Enable create table support for collation [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on PR #45105:
URL: https://github.com/apache/spark/pull/45105#issuecomment-1945424385
We should put more high-level information: what's the corresponding parquet type for string with collation? and how do we fix the parquet max/min column stats?
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47009][SQL] Enable create table support for collation [spark]
Posted by "stefankandic (via GitHub)" <gi...@apache.org>.
stefankandic commented on code in PR #45105:
URL: https://github.com/apache/spark/pull/45105#discussion_r1495890972
##########
sql/core/src/test/scala/org/apache/spark/sql/CollationSuite.scala:
##########
@@ -174,4 +176,89 @@ class CollationSuite extends QueryTest with SharedSparkSession {
Row(expected))
}
}
+
+ test("create table with collation") {
+ val tableName = "parquet_dummy_tbl"
+ val collationName = "UCS_BASIC_LCASE"
+ val collationId = CollationFactory.collationNameToId(collationName)
+
+ withTable(tableName) {
+ sql(
+ s"""
+ |CREATE TABLE $tableName (c1 STRING COLLATE '$collationName')
+ |USING PARQUET
+ |""".stripMargin)
+
+ sql(s"INSERT INTO $tableName VALUES ('aaa')")
+ sql(s"INSERT INTO $tableName VALUES ('AAA')")
+
+ checkAnswer(sql(s"SELECT DISTINCT COLLATION(c1) FROM $tableName"), Seq(Row(collationName)))
+ assert(sql(s"select c1 FROM $tableName").schema.head.dataType == StringType(collationId))
+ val dd = sql(s"SELECT c1 FROM $tableName").toDF("c2")
+ dd.write.mode(SaveMode.Overwrite).parquet("/tmp/stefan_tbl")
Review Comment:
whoops, I was supposed to delete that
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47009][SQL] Enable create table support for collation [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on PR #45105:
URL: https://github.com/apache/spark/pull/45105#issuecomment-1964169203
thanks, merging to master!
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47009][SQL] Enable create table support for collation [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #45105:
URL: https://github.com/apache/spark/pull/45105#discussion_r1495888981
##########
sql/core/src/test/scala/org/apache/spark/sql/CollationSuite.scala:
##########
@@ -174,4 +176,89 @@ class CollationSuite extends QueryTest with SharedSparkSession {
Row(expected))
}
}
+
+ test("create table with collation") {
+ val tableName = "parquet_dummy_tbl"
+ val collationName = "UCS_BASIC_LCASE"
+ val collationId = CollationFactory.collationNameToId(collationName)
+
+ withTable(tableName) {
+ sql(
+ s"""
+ |CREATE TABLE $tableName (c1 STRING COLLATE '$collationName')
+ |USING PARQUET
+ |""".stripMargin)
+
+ sql(s"INSERT INTO $tableName VALUES ('aaa')")
+ sql(s"INSERT INTO $tableName VALUES ('AAA')")
+
+ checkAnswer(sql(s"SELECT DISTINCT COLLATION(c1) FROM $tableName"), Seq(Row(collationName)))
+ assert(sql(s"select c1 FROM $tableName").schema.head.dataType == StringType(collationId))
+ val dd = sql(s"SELECT c1 FROM $tableName").toDF("c2")
+ dd.write.mode(SaveMode.Overwrite).parquet("/tmp/stefan_tbl")
Review Comment:
please use `withTempPath` to generate the temp path and write.
##########
sql/core/src/test/scala/org/apache/spark/sql/CollationSuite.scala:
##########
@@ -174,4 +176,89 @@ class CollationSuite extends QueryTest with SharedSparkSession {
Row(expected))
}
}
+
+ test("create table with collation") {
+ val tableName = "parquet_dummy_tbl"
+ val collationName = "UCS_BASIC_LCASE"
+ val collationId = CollationFactory.collationNameToId(collationName)
+
+ withTable(tableName) {
+ sql(
+ s"""
+ |CREATE TABLE $tableName (c1 STRING COLLATE '$collationName')
+ |USING PARQUET
+ |""".stripMargin)
+
+ sql(s"INSERT INTO $tableName VALUES ('aaa')")
+ sql(s"INSERT INTO $tableName VALUES ('AAA')")
+
+ checkAnswer(sql(s"SELECT DISTINCT COLLATION(c1) FROM $tableName"), Seq(Row(collationName)))
+ assert(sql(s"select c1 FROM $tableName").schema.head.dataType == StringType(collationId))
+ val dd = sql(s"SELECT c1 FROM $tableName").toDF("c2")
+ dd.write.mode(SaveMode.Overwrite).parquet("/tmp/stefan_tbl")
Review Comment:
can we also test read it back?
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47009][SQL] Enable create table support for collation [spark]
Posted by "stefankandic (via GitHub)" <gi...@apache.org>.
stefankandic commented on code in PR #45105:
URL: https://github.com/apache/spark/pull/45105#discussion_r1496048929
##########
sql/core/src/test/scala/org/apache/spark/sql/CollationSuite.scala:
##########
@@ -174,4 +176,89 @@ class CollationSuite extends QueryTest with SharedSparkSession {
Row(expected))
}
}
+
+ test("create table with collation") {
+ val tableName = "parquet_dummy_tbl"
+ val collationName = "UCS_BASIC_LCASE"
+ val collationId = CollationFactory.collationNameToId(collationName)
+
+ withTable(tableName) {
+ sql(
+ s"""
+ |CREATE TABLE $tableName (c1 STRING COLLATE '$collationName')
+ |USING PARQUET
+ |""".stripMargin)
+
+ sql(s"INSERT INTO $tableName VALUES ('aaa')")
+ sql(s"INSERT INTO $tableName VALUES ('AAA')")
+
+ checkAnswer(sql(s"SELECT DISTINCT COLLATION(c1) FROM $tableName"), Seq(Row(collationName)))
+ assert(sql(s"select c1 FROM $tableName").schema.head.dataType == StringType(collationId))
+ val dd = sql(s"SELECT c1 FROM $tableName").toDF("c2")
+ dd.write.mode(SaveMode.Overwrite).parquet("/tmp/stefan_tbl")
+ }
+ }
+
+ test("create table with collations inside a struct") {
+ val tableName = "struct_collation_tbl"
+ val collationName = "UCS_BASIC_LCASE"
+ val collationId = CollationFactory.collationNameToId(collationName)
+
+ withTable(tableName) {
+ sql(
+ s"""
+ |CREATE TABLE $tableName
+ |(c1 STRUCT<name: STRING COLLATE '$collationName', age: INT>)
+ |USING PARQUET
+ |""".stripMargin)
+
+ sql(s"INSERT INTO $tableName VALUES (named_struct('name', 'aaa', 'id', 1))")
+ sql(s"INSERT INTO $tableName VALUES (named_struct('name', 'AAA', 'id', 2))")
+
+ checkAnswer(sql(s"SELECT DISTINCT collation(c1.name) FROM $tableName"),
+ Seq(Row(collationName)))
+ assert(sql(s"SELECT c1.name FROM $tableName").schema.head.dataType == StringType(collationId))
+ }
+ }
+
+ test("add collated column with alter table") {
+ val tableName = "alter_column_tbl"
+ val defaultCollation = "UCS_BASIC"
+ val collationName = "UCS_BASIC_LCASE"
+ val collationId = CollationFactory.collationNameToId(collationName)
+
+ withTable(tableName) {
+ sql(
+ s"""
+ |CREATE TABLE $tableName (c1 STRING)
+ |USING PARQUET
Review Comment:
added them directly in v2 suite, let me know if you disagree
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47009][SQL] Enable create table support for collation [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #45105:
URL: https://github.com/apache/spark/pull/45105#discussion_r1496750961
##########
sql/core/src/test/scala/org/apache/spark/sql/connector/DataSourceV2SQLSuite.scala:
##########
@@ -292,6 +292,37 @@ class DataSourceV2SQLSuiteV1Filter
}
}
+ test("create v2 table with collation column") {
Review Comment:
I'd prefer to centralize the string collation tests. Can we extend `DatasourceV2SQLBase` in `CollationSuite` so that we can test v2 tables there?
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47009][SQL] Enable create table support for collation [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #45105:
URL: https://github.com/apache/spark/pull/45105#discussion_r1490442977
##########
sql/api/src/main/scala/org/apache/spark/sql/types/DataType.scala:
##########
@@ -117,6 +117,7 @@ object DataType {
private val FIXED_DECIMAL = """decimal\(\s*(\d+)\s*,\s*(\-?\d+)\s*\)""".r
private val CHAR_TYPE = """char\(\s*(\d+)\s*\)""".r
private val VARCHAR_TYPE = """varchar\(\s*(\d+)\s*\)""".r
+ private val COLLATED_STRING_TYPE = """string\(\s*([\w_]+)\s*\)""".r
Review Comment:
since it's a DDL string, shall we follow the actual SQL syntax and use `STRING COLLATE name`?
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47009][SQL] Enable create table support for collation [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #45105:
URL: https://github.com/apache/spark/pull/45105#discussion_r1495898143
##########
sql/core/src/test/scala/org/apache/spark/sql/CollationSuite.scala:
##########
@@ -174,4 +176,89 @@ class CollationSuite extends QueryTest with SharedSparkSession {
Row(expected))
}
}
+
+ test("create table with collation") {
+ val tableName = "parquet_dummy_tbl"
+ val collationName = "UCS_BASIC_LCASE"
+ val collationId = CollationFactory.collationNameToId(collationName)
+
+ withTable(tableName) {
+ sql(
+ s"""
+ |CREATE TABLE $tableName (c1 STRING COLLATE '$collationName')
+ |USING PARQUET
+ |""".stripMargin)
+
+ sql(s"INSERT INTO $tableName VALUES ('aaa')")
+ sql(s"INSERT INTO $tableName VALUES ('AAA')")
+
+ checkAnswer(sql(s"SELECT DISTINCT COLLATION(c1) FROM $tableName"), Seq(Row(collationName)))
+ assert(sql(s"select c1 FROM $tableName").schema.head.dataType == StringType(collationId))
+ val dd = sql(s"SELECT c1 FROM $tableName").toDF("c2")
+ dd.write.mode(SaveMode.Overwrite).parquet("/tmp/stefan_tbl")
+ }
+ }
+
+ test("create table with collations inside a struct") {
+ val tableName = "struct_collation_tbl"
+ val collationName = "UCS_BASIC_LCASE"
+ val collationId = CollationFactory.collationNameToId(collationName)
+
+ withTable(tableName) {
+ sql(
+ s"""
+ |CREATE TABLE $tableName
+ |(c1 STRUCT<name: STRING COLLATE '$collationName', age: INT>)
+ |USING PARQUET
+ |""".stripMargin)
+
+ sql(s"INSERT INTO $tableName VALUES (named_struct('name', 'aaa', 'id', 1))")
+ sql(s"INSERT INTO $tableName VALUES (named_struct('name', 'AAA', 'id', 2))")
+
+ checkAnswer(sql(s"SELECT DISTINCT collation(c1.name) FROM $tableName"),
+ Seq(Row(collationName)))
+ assert(sql(s"SELECT c1.name FROM $tableName").schema.head.dataType == StringType(collationId))
+ }
+ }
+
+ test("add collated column with alter table") {
+ val tableName = "alter_column_tbl"
+ val defaultCollation = "UCS_BASIC"
+ val collationName = "UCS_BASIC_LCASE"
+ val collationId = CollationFactory.collationNameToId(collationName)
+
+ withTable(tableName) {
+ sql(
+ s"""
+ |CREATE TABLE $tableName (c1 STRING)
+ |USING PARQUET
Review Comment:
can we also test v2 tables? See `DataSourceV2SQLSuite` about how we create and test v2 tables using v2 catalogs.
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47009][SQL] Enable create table support for collation [spark]
Posted by "stefankandic (via GitHub)" <gi...@apache.org>.
stefankandic commented on PR #45105:
URL: https://github.com/apache/spark/pull/45105#issuecomment-1964129843
@cloud-fan fixed the test failure, should be ready to merge now
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47009][SQL] Enable create table support for collation [spark]
Posted by "dbatomic (via GitHub)" <gi...@apache.org>.
dbatomic commented on code in PR #45105:
URL: https://github.com/apache/spark/pull/45105#discussion_r1495053546
##########
sql/core/src/test/scala/org/apache/spark/sql/CollationSuite.scala:
##########
@@ -174,4 +176,79 @@ class CollationSuite extends QueryTest with SharedSparkSession {
Row(expected))
}
}
+
+ test("create table with collation") {
+ val tableName = "parquet_dummy_tbl"
+ val collationName = "UCS_BASIC_LCASE"
+ withTable(tableName) {
+ sql(
+ s"""
+ |CREATE TABLE $tableName (c1 STRING COLLATE '$collationName')
+ |USING PARQUET
+ |""".stripMargin)
+
+ sql(s"INSERT INTO $tableName VALUES ('aaa')")
+ sql(s"INSERT INTO $tableName VALUES ('AAA')")
+
+ checkAnswer(sql(s"SELECT DISTINCT collation(c1) FROM $tableName"), Seq(Row(collationName)))
Review Comment:
Can you also add a checks that:
1) COLLATION expression returns correct collation.
2) schema for this column returns StringType(1) (same as we do in `collate returns proper type` test)
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47009][SQL] Enable create table support for collation [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #45105:
URL: https://github.com/apache/spark/pull/45105#discussion_r1495891034
##########
sql/core/src/test/scala/org/apache/spark/sql/CollationSuite.scala:
##########
@@ -174,4 +176,89 @@ class CollationSuite extends QueryTest with SharedSparkSession {
Row(expected))
}
}
+
+ test("create table with collation") {
+ val tableName = "parquet_dummy_tbl"
+ val collationName = "UCS_BASIC_LCASE"
+ val collationId = CollationFactory.collationNameToId(collationName)
+
+ withTable(tableName) {
+ sql(
+ s"""
+ |CREATE TABLE $tableName (c1 STRING COLLATE '$collationName')
+ |USING PARQUET
+ |""".stripMargin)
+
+ sql(s"INSERT INTO $tableName VALUES ('aaa')")
+ sql(s"INSERT INTO $tableName VALUES ('AAA')")
+
+ checkAnswer(sql(s"SELECT DISTINCT COLLATION(c1) FROM $tableName"), Seq(Row(collationName)))
+ assert(sql(s"select c1 FROM $tableName").schema.head.dataType == StringType(collationId))
+ val dd = sql(s"SELECT c1 FROM $tableName").toDF("c2")
+ dd.write.mode(SaveMode.Overwrite).parquet("/tmp/stefan_tbl")
+ }
+ }
+
+ test("create table with collations inside a struct") {
+ val tableName = "struct_collation_tbl"
+ val collationName = "UCS_BASIC_LCASE"
+ val collationId = CollationFactory.collationNameToId(collationName)
+
+ withTable(tableName) {
+ sql(
+ s"""
+ |CREATE TABLE $tableName
+ |(c1 STRUCT<name: STRING COLLATE '$collationName', age: INT>)
+ |USING PARQUET
+ |""".stripMargin)
+
+ sql(s"INSERT INTO $tableName VALUES (named_struct('name', 'aaa', 'id', 1))")
+ sql(s"INSERT INTO $tableName VALUES (named_struct('name', 'AAA', 'id', 2))")
+
+ checkAnswer(sql(s"SELECT DISTINCT collation(c1.name) FROM $tableName"),
+ Seq(Row(collationName)))
+ assert(sql(s"SELECT c1.name FROM $tableName").schema.head.dataType == StringType(collationId))
+ }
+ }
+
+ test("add collated column with alter table") {
+ val tableName = "alter_column_tbl"
+ val defaultCollation = "UCS_BASIC"
+ val collationName = "UCS_BASIC_LCASE"
+ val collationId = CollationFactory.collationNameToId(collationName)
+
+ withTable(tableName) {
+ sql(
+ s"""
+ |CREATE TABLE $tableName (c1 STRING)
+ |USING PARQUET
+ |""".stripMargin)
+
+ sql(s"INSERT INTO $tableName VALUES ('aaa')")
+ sql(s"INSERT INTO $tableName VALUES ('AAA')")
+
+ checkAnswer(sql(s"SELECT DISTINCT COLLATION(c1) FROM $tableName"),
+ Seq(Row(defaultCollation)))
+
+ sql(
+ s"""
+ |ALTER TABLE $tableName
+ |ADD COLUMN c2 STRING COLLATE '$collationName'
+ |""".stripMargin)
+
+ sql(
+ s"""
+ |ALTER TABLE $tableName
+ |ALTER COLUMN c2
+ |SET DEFAULT ''
Review Comment:
does this do anything? The INSERT below always provide the values.
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47009][SQL] Enable create table support for collation [spark]
Posted by "stefankandic (via GitHub)" <gi...@apache.org>.
stefankandic commented on code in PR #45105:
URL: https://github.com/apache/spark/pull/45105#discussion_r1494829432
##########
sql/api/src/main/scala/org/apache/spark/sql/types/DataType.scala:
##########
@@ -117,6 +117,7 @@ object DataType {
private val FIXED_DECIMAL = """decimal\(\s*(\d+)\s*,\s*(\-?\d+)\s*\)""".r
private val CHAR_TYPE = """char\(\s*(\d+)\s*\)""".r
private val VARCHAR_TYPE = """varchar\(\s*(\d+)\s*\)""".r
+ private val COLLATED_STRING_TYPE = """string\(\s*([\w_]+)\s*\)""".r
Review Comment:
i left `string` in lowercase due to backwards compatibility
##########
sql/api/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBaseParser.g4:
##########
@@ -1095,6 +1095,10 @@ colPosition
: position=FIRST | position=AFTER afterCol=errorCapturingIdentifier
;
+collateExpression
Review Comment:
makes sense
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-47009][SQL] Enable create table support for collation [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on PR #45105:
URL: https://github.com/apache/spark/pull/45105#issuecomment-1963491173
@stefankandic the new test has failures
```
- add collated column with alter table *** FAILED *** (167 milliseconds)
[info] org.apache.spark.SparkException: Job aborted due to stage failure: Task 0 in stage 140.0 failed 1 times, most recent failure: Lost task 0.0 in stage 140.0 (TID 134) (localhost executor driver): java.lang.AssertionError: index (1) should < 1
[info] at org.apache.spark.sql.catalyst.expressions.UnsafeRow.assertIndexIsValid(UnsafeRow.java:120)
[info] at org.apache.spark.sql.catalyst.expressions.UnsafeRow.isNullAt(UnsafeRow.java:317)
[info] at org.apache.spark.sql.catalyst.expressions.SpecializedGettersReader.read(SpecializedGettersReader.java:36)
[info] at org.apache.spark.sql.catalyst.expressions.UnsafeRow.get(UnsafeRow.java:312)
[info] at org.apache.spark.sql.connector.catalog.BufferedRowsReader.extractFieldValue(InMemoryBaseTable.scala:704)
[info] at org.apache.spark.sql.connector.catalog.BufferedRowsReader.$anonfun$get$1(InMemoryBaseTable.scala:678)
[info] at org.apache.spark.sql.connector.catalog.BufferedRowsReader.$anonfun$get$1$adapted(InMemoryBaseTable.scala:677)
```
--
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: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org