[SPARK-49992][SQL] Default collation resolution for DDL and DML queries #48844
+636
−33
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
cloud-fan
reviewed
Nov 14, 2024
| @@ -30,7 +30,7 @@ import org.apache.spark.sql.catalyst.util.CollationFactory | |||
| * The id of collation for this StringType. | |||
| */ | |||
| @Stable | |||
| class StringType private (val collationId: Int) extends AtomicType with Serializable { | |||
| class StringType private[sql] (val collationId: Int) extends AtomicType with Serializable { | |||
There was a problem hiding this comment.
no need to do this, as we have def apply(collationId: Int) in object StringType
cloud-fan
reviewed
Nov 14, 2024
| @@ -43,7 +43,7 @@ import org.apache.spark.sql.types._ | |||
| case class CreateTable( | |||
| tableDesc: CatalogTable, | |||
| mode: SaveMode, | |||
| query: Option[LogicalPlan]) extends LogicalPlan { | |||
| query: Option[LogicalPlan]) extends LogicalPlan with V1DDLCommand { | |||
There was a problem hiding this comment.
I don't think this works. We need to resolve string collation in tableDesc.schema, and the rule must match CreateTable directly to do it.
cloud-fan
reviewed
Nov 14, 2024
| import org.apache.spark.sql.internal.SqlApiConf | ||
| import org.apache.spark.sql.types.StringType | ||
|
|
||
| class DefaultCollationTestSuite extends DatasourceV2SQLBase { |
There was a problem hiding this comment.
does this test cover v1 commands as well?
stefankandic
changed the title
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?
This PR proposes not using session-level collation in DDL commands (create/alter view/table, add/replace columns).
Also, resolution of default collation should happen in the analyzer and not in the parser. However, due to how we are checking for default string type (using reference equals with
StringTypeobject) we cannot just replace this object withStringType("UTF8_BINARY")because they compare as equal so the tree node framework will just return the old plan. Because of this we have to perform this resolution twice, once by changing theStringTypeobject into aTemporaryStringTypeand then back toStringType("UTF8_BINARY")which is not considered a default string type anymore.Why are the changes needed?
The default collation for DDL commands should be tied to the object being created or altered (e.g., table, view, schema) rather than the session-level setting. Since object-level collations are not yet supported, we will assume the UTF8_BINARY collation by default for now.
Does this PR introduce any user-facing change?
No.
How was this patch tested?
Added new unit tests.
Was this patch authored or co-authored using generative AI tooling?
No.