Fix values with different data types caused failure#10445
Merged
alamb merged 11 commits intoapache:mainfrom May 14, 2024
Merged
Fix values with different data types caused failure#10445alamb merged 11 commits intoapache:mainfrom
alamb merged 11 commits intoapache:mainfrom
Conversation
github-actions
bot
added
logical-expr
jayzhan211
reviewed
May 11, 2024
alamb
approved these changes
May 13, 2024
Contributor
alamb
left a comment
alamb
left a comment
There was a problem hiding this comment.
Look good to me -- thank you @b41sh and @jayzhan211
I had some small code suggestions but I don't think they are required to merge this PR
Comment on lines
+218
to
+225
| let data_type = row[j].get_type(&empty_schema)?; | ||
| if data_type != *field_type { | ||
| row[j] = Expr::Cast(Cast { | ||
| expr: Box::new(row[j].clone()), | ||
| data_type: field_type.clone(), | ||
| }); | ||
| } | ||
| } |
Contributor
There was a problem hiding this comment.
I think you can write this more concisely like
Suggested change
| let data_type = row[j].get_type(&empty_schema)?; | |
| if data_type != *field_type { | |
| row[j] = Expr::Cast(Cast { | |
| expr: Box::new(row[j].clone()), | |
| data_type: field_type.clone(), | |
| }); | |
| } | |
| } | |
| row[j] = std::mem::take(&mut row[j]).cast_to(&field_type, &empty_schema)?; |
The std::mem::take is needed to avoid requiring a clone
| } | ||
| if let Some(prev_type) = common_type { | ||
| // get common type of each column values. | ||
| match values_coercion(&data_type, &prev_type) { |
Contributor
There was a problem hiding this comment.
Minor: I think you could write the same thing like this slightly more concisely (and I don't think we need new_type.clone())
if let Some(prev_type) = common_type {
// get common type of each column values.
let Some(new_type) = values_coercion(&data_type, &prev_type) else {
return plan_err!("Inconsistent data type across values list at row {i} column {j}. Was {prev_type} but found {data_type}");
};
common_type = Some(new_type);
} else {
common_type = Some(data_type.clone());
}
jayzhan211
reviewed
May 14, 2024
| } | ||
|
|
||
| #[test] | ||
| fn test_values() -> Result<()> { |
Contributor
There was a problem hiding this comment.
I think we don't need this since creating table in slt already covered it
Contributor
Author
Very good suggestion, I have revised it, thank you for your review @alamb |
Contributor
|
Thanks again @b41sh ! |
findepi
pushed a commit
to findepi/datafusion
that referenced
this pull request
Jul 16, 2024
* Fix values with different data types caused failure * fix tests * fix tests * fix tests * fix tests * fix tests * fix tests * add `list_coercion` * fix review suggestions
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Which issue does this PR close?
Closes #10440
Rationale for this change
What changes are included in this PR?
Are these changes tested?
Are there any user-facing changes?