[SPARK-48841][SQL] Include collationName to sql() of Collate
#47265
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
HyukjinKwon
approved these changes
Jul 11, 2024
cloud-fan
approved these changes
Jul 11, 2024
|
The file conflict has been resolved, let it run GA again |
|
thanks, merging to master! |
jingz-db
pushed a commit
to jingz-db/spark
that referenced
this pull request
Jul 22, 2024
### What changes were proposed in this pull request?
In the PR, I propose to fix the `sql()` method of the `Collate` expression, and append the `collationName` clause.
### Why are the changes needed?
To distinguish column names when the `collationName` argument is used by `collate`. Before the changes, columns might conflict like the example below, and that could confuse users:
```
sql("CREATE TEMP VIEW tbl as (SELECT collate('A', 'UTF8_BINARY'), collate('A', 'UTF8_LCASE'))")
```
- Before:
```
[COLUMN_ALREADY_EXISTS] The column `collate(a)` already exists. Choose another name or rename the existing column. SQLSTATE: 42711
org.apache.spark.sql.AnalysisException: [COLUMN_ALREADY_EXISTS] The column `collate(a)` already exists. Choose another name or rename the existing column. SQLSTATE: 42711
at org.apache.spark.sql.errors.QueryCompilationErrors$.columnAlreadyExistsError(QueryCompilationErrors.scala:2595)
at org.apache.spark.sql.util.SchemaUtils$.checkColumnNameDuplication(SchemaUtils.scala:115)
at org.apache.spark.sql.util.SchemaUtils$.checkColumnNameDuplication(SchemaUtils.scala:97)
```
- After:
```
describe extended tbl;
+-----------------------+-------------------------+-------+
|col_name |data_type |comment|
+-----------------------+-------------------------+-------+
|collate(A, UTF8_BINARY)|string |NULL |
|collate(A, UTF8_LCASE) |string collate UTF8_LCASE|NULL |
+-----------------------+-------------------------+-------+
```
### Does this PR introduce _any_ user-facing change?
Should not.
### How was this patch tested?
Update existed UT.
### Was this patch authored or co-authored using generative AI tooling?
No.
Closes apache#47265 from panbingkun/SPARK-48841.
Authored-by: panbingkun <panbingkun@baidu.com>
Signed-off-by: Wenchen Fan <wenchen@databricks.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
In the PR, I propose to fix the
sql()method of theCollateexpression, and append thecollationNameclause.Why are the changes needed?
To distinguish column names when the
collationNameargument is used bycollate. Before the changes, columns might conflict like the example below, and that could confuse users:Does this PR introduce any user-facing change?
Should not.
How was this patch tested?
Update existed UT.
Was this patch authored or co-authored using generative AI tooling?
No.