[SPARK-52235][SQL] Add implicit cast to DefaultValue V2 Expressions passed to DSV2 #50959
+245
−57
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
szehon-ho
commented
May 20, 2025
| @@ -432,18 +432,34 @@ object ResolveDefaultColumns extends QueryErrorsBase | |||
| targetType: DataType, | |||
| colName: String): Option[Expression] = { | |||
| expr match { | |||
| case l: Literal if !Seq(targetType, l.dataType).exists(_ match { | |||
| case l: Literal => defaultValueFromWiderType(l, targetType, colName) | |||
There was a problem hiding this comment.
To explain this, the analyze() function in this class for strings does the following
- analyze/ checkAnalyze
- constant fold
- cast
However, because we add the rule in TypeCoercion (Analyzer phase), it runs before constant folding. Hence, relaxing the cast code to also take Expression instead of Literal.
szehon-ho
commented
May 20, 2025
|
|
||
| val alterExecCol3 = executeAndKeepPhysicalPlan[AlterTableExec] { | ||
| sql(s"ALTER TABLE $tableName ALTER COLUMN salary SET DEFAULT CAST(0 AS BOOLEAN)") | ||
| sql( |
There was a problem hiding this comment.
Some test cleanup, I didnt realize multiple ALTER COLUMN can be the same statement, so it was unnecessarily long
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/TypeCoercionBase.scala
Show resolved
Hide resolved
| @@ -81,6 +87,66 @@ abstract class TypeCoercionBase extends TypeCoercionHelper { | |||
| } | |||
| } | |||
|
|
|||
| object DefaultValueExpressionCoercion extends Rule[LogicalPlan] { | |||
There was a problem hiding this comment.
Could you add a comment for this new rule?
aokolnychyi
reviewed
May 23, 2025
| column.newCurrentDefault() == expectedDefault, | ||
| s"Default value mismatch for column '${column.toString}': " + | ||
| s"expected $expectedDefault but found ${column.newCurrentDefault()}") | ||
| private def checkDefaultValues( |
There was a problem hiding this comment.
I guess you could define new checkDefaultValues using checkDefaultValue to minimize changes.
aokolnychyi
approved these changes
May 23, 2025
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?
Add implicit cast to DefaultValue V2 expressions passed to DSV2, by adding rule to TypeCoercion.
Why are the changes needed?
Now default values are passed as V2 Expressions to DSV2 in Create/Replace/Alter table DDL statements.
We should match what the normal default value analysis path does for sql strings (ie, implicit cast).
Does this PR introduce any user-facing change?
No
How was this patch tested?
Add unit test to DatasourceV2DataFrameSuite
Was this patch authored or co-authored using generative AI tooling?
No