-
Notifications
You must be signed in to change notification settings - Fork 28.6k
[SPARK-52235][SQL] Add implicit cast to DefaultValue V2 Expressions passed to DSV2 #50959
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
szehon-ho
wants to merge
2
commits into
apache:master
Choose a base branch
from
szehon-ho:cast_default_value
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+245
−57
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. To explain this, the analyze() function in this class for strings does the following
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. |
||
case _ => None | ||
} | ||
} | ||
|
||
/** | ||
* If the provided default value is a literal of a wider type than the target column, | ||
* but the literal value fits within the narrower type, just coerce it for convenience. | ||
* Exclude boolean/array/struct/map types from consideration for this type coercion to | ||
* avoid surprising behavior like interpreting "false" as integer zero. | ||
*/ | ||
def defaultValueFromWiderType( | ||
expr: Expression, | ||
targetType: DataType, | ||
colName: String): Option[Expression] = { | ||
expr match { | ||
case e if !Seq(targetType, e.dataType).exists(_ match { | ||
case _: BooleanType | _: ArrayType | _: StructType | _: MapType => true | ||
case _ => false | ||
}) => | ||
val casted = Cast(l, targetType, Some(conf.sessionLocalTimeZone), evalMode = EvalMode.TRY) | ||
val casted = Cast(e, targetType, Some(conf.sessionLocalTimeZone), evalMode = EvalMode.TRY) | ||
try { | ||
Option(casted.eval(EmptyRow)).map(Literal(_, targetType)) | ||
} catch { | ||
case e @ ( _: SparkThrowable | _: RuntimeException) => | ||
logWarning(log"Failed to cast default value '${MDC(COLUMN_DEFAULT_VALUE, l)}' " + | ||
logWarning(log"Failed to cast default value '${MDC(COLUMN_DEFAULT_VALUE, e)}' " + | ||
log"for column ${MDC(COLUMN_NAME, colName)} " + | ||
log"from ${MDC(COLUMN_DATA_TYPE_SOURCE, l.dataType)} " + | ||
log"from ${MDC(COLUMN_DATA_TYPE_SOURCE, expr.dataType)} " + | ||
log"to ${MDC(COLUMN_DATA_TYPE_TARGET, targetType)} " + | ||
log"due to ${MDC(ERROR, e.getMessage)}", e) | ||
None | ||
|
@@ -461,7 +477,8 @@ object ResolveDefaultColumns extends QueryErrorsBase | |
dataType: DataType, | ||
statementType: String, | ||
colName: String, | ||
defaultSQL: String): Expression = { | ||
defaultSQL: String, | ||
castWiderOnlyLiterals: Boolean = true): Expression = { | ||
val supplanted = CharVarcharUtils.replaceCharVarcharWithString(dataType) | ||
// Perform implicit coercion from the provided expression type to the required column type. | ||
val ret = analyzed match { | ||
|
@@ -470,7 +487,12 @@ object ResolveDefaultColumns extends QueryErrorsBase | |
case canUpCast if Cast.canUpCast(canUpCast.dataType, supplanted) => | ||
Cast(analyzed, supplanted, Some(conf.sessionLocalTimeZone)) | ||
case other => | ||
defaultValueFromWiderTypeLiteral(other, supplanted, colName).getOrElse( | ||
val casted = if (castWiderOnlyLiterals) { | ||
defaultValueFromWiderTypeLiteral(other, supplanted, colName) | ||
} else { | ||
defaultValueFromWiderType(other, supplanted, colName) | ||
} | ||
casted.getOrElse( | ||
throw QueryCompilationErrors.defaultValuesDataTypeError( | ||
statementType, colName, defaultSQL, dataType, other.dataType)) | ||
} | ||
|
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you add a comment for this new rule?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
added