[SPARK-52281][SQL] Change ALTER TABLE ALTER COLUMN TYPE STRING not to apply default collation if original data type was instance of StringType
#51001
Conversation
This file contains hidden or 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
ilicmarkodb
changed the title
ALTER TABLE ALTER COLUMN TYPE STRING not to apply default collation if original data type was instance of StringTypeALTER TABLE ALTER COLUMN TYPE STRING not to apply default collation if original data type was instance of StringType
Contributor
Author
|
@cloud-fan can you please review? |
sql/core/src/test/scala/org/apache/spark/sql/collation/DefaultCollationTestSuite.scala
Outdated
Show resolved
Hide resolved
sql/core/src/test/scala/org/apache/spark/sql/collation/DefaultCollationTestSuite.scala
Outdated
Show resolved
Hide resolved
sql/core/src/test/scala/org/apache/spark/sql/collation/DefaultCollationTestSuite.scala
Outdated
Show resolved
Hide resolved
...rc/main/scala/org/apache/spark/sql/catalyst/analysis/ApplyDefaultCollationToStringType.scala
Outdated
Show resolved
Hide resolved
ilicmarkodb
force-pushed
the
fix_alter_colum_with_collation
branch
3 times, most recently
from
b40ed07 to
7a39330
Compare
ilicmarkodb
force-pushed
the
fix_alter_colum_with_collation
branch
2 times, most recently
from
e7e8c33 to
85680fe
Compare
ilicmarkodb
commented
May 26, 2025
sql/core/src/test/scala/org/apache/spark/sql/execution/command/CharVarcharDDLTestBase.scala
Outdated
Show resolved
Hide resolved
ilicmarkodb
force-pushed
the
fix_alter_colum_with_collation
branch
4 times, most recently
from
3e929ec to
f9081c3
Compare
cloud-fan
reviewed
May 27, 2025
...rc/main/scala/org/apache/spark/sql/catalyst/analysis/ApplyDefaultCollationToStringType.scala
Outdated
Show resolved
Hide resolved
ilicmarkodb
force-pushed
the
fix_alter_colum_with_collation
branch
4 times, most recently
from
c3dbcd0 to
1679aed
Compare
cloud-fan
reviewed
May 30, 2025
...rc/main/scala/org/apache/spark/sql/catalyst/analysis/ApplyDefaultCollationToStringType.scala
Outdated
Show resolved
Hide resolved
cloud-fan
reviewed
May 30, 2025
...rc/main/scala/org/apache/spark/sql/catalyst/analysis/ApplyDefaultCollationToStringType.scala
Outdated
Show resolved
Hide resolved
cloud-fan
reviewed
May 30, 2025
Contributor
There was a problem hiding this comment.
do we really need it? resolveAlterColumnsDataType removes the newDataType already
Contributor
Author
There was a problem hiding this comment.
this part applies default collation to dataType. resolveAlterColumnsDataType just removed dataType if alter column was noop. resolveAlterColumnsDataType isn't really best name since it doesn't fully resolve dataType, so I changed name
ilicmarkodb
force-pushed
the
fix_alter_colum_with_collation
branch
from
1679aed to
3acf439
Compare
ilicmarkodb
force-pushed
the
fix_alter_colum_with_collation
branch
from
3acf439 to
1d6fa46
Compare
cloud-fan
approved these changes
Jun 2, 2025
Contributor
|
thanks, merging to master! |
Contributor
|
@ilicmarkodb is this bug present in spark 4.0? |
yhuang-db
pushed a commit
to yhuang-db/spark
that referenced
this pull request
Jun 9, 2025
…to apply default collation if original data type was instance of `StringType` ### What changes were proposed in this pull request? Changed `ALTER TABLE ALTER COLUMN TYPE STRING` not to apply default collation if original data type was instance of `StringType`. ``` CREATE TABLE T (C1 CHAR/VARCHAR); ALTER TABLE T DEFAULT COLLATION UTF8_LCASE; ALTER TABLE T ALTER COLUMN C1 TYPE STRING COLLATE UTF8_LCASE; ----------------------------------------------------------------------------------- CREATE TABLE T (C1 STRING [COLLATE XYZ]) ALTER TABLE T DEFAULT COLLATION UTF8_LCASE ALTER TABLE T ALTER COLUMN C1 TYPE STRING // C1 -> STRING [COLLATE XYZ] ``` ### Why are the changes needed? Bug fix. ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Tests added to `DefaultCollationTestSuite`. ### Was this patch authored or co-authored using generative AI tooling? No. Closes apache#51001 from ilicmarkodb/fix_alter_colum_with_collation. Authored-by: ilicmarkodb <[email protected]> Signed-off-by: Wenchen Fan <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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?
Changed
ALTER TABLE ALTER COLUMN TYPE STRINGnot to apply default collation if original data type was instance ofStringType.Why are the changes needed?
Bug fix.
Does this PR introduce any user-facing change?
No.
How was this patch tested?
Tests added to
DefaultCollationTestSuite.Was this patch authored or co-authored using generative AI tooling?
No.