Avoid panics on error while encoding/decoding ListValue::Array as protobuf #7837
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
alamb
commented
Oct 16, 2023
|
|
||
| // TODO: Add comment to why adding 0 before arrow_data. |
There was a problem hiding this comment.
The 0 was added in the arrow.rs code as it was a test for unaligned data. The zero is not needed for this cod
cc @jayzhan211
| @@ -56,13 +56,6 @@ use datafusion_expr::{ | |||
| pub enum Error { | |||
| General(String), | |||
|
|
|||
| InconsistentListTyping(DataType, DataType), | |||
There was a problem hiding this comment.
These variants are no longer used
comphead
reviewed
Oct 16, 2023
| @@ -655,29 +656,36 @@ impl TryFrom<&protobuf::ScalarValue> for ScalarValue { | |||
| let schema: Schema = if let Some(schema_ref) = schema { | |||
| schema_ref.try_into()? | |||
| } else { | |||
| return Err(Error::General("Unexpected schema".to_string())); | |||
| return Err(Error::General( | |||
There was a problem hiding this comment.
Should we return some of Datafusion Errors instead? Maybe IoError or InternalError?
There was a problem hiding this comment.
I am not sure why the from_proto and to_proto modules have their own error types and don't use DataFusionError (or even wrap DataFusionError)
It does seem like that would be an improvement. Maybe I can file a follow on ticket to do so.
jayzhan211
approved these changes
Oct 16, 2023
Dandandan
approved these changes
Oct 17, 2023
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.
Which issue does this PR close?
Follow on to #7629
Rationale for this change
I noticed some panics while reviewing #7629 from @jayzhan211 but I didn't want to delay merging that PR any longer.
What changes are included in this PR?
This commit avoids panics in the error handling in the ScalarValue::List protobuf encoding by using the
?operatorinstead unwrap. It also removes some unused variants that are no longer used after
#7629
Are these changes tested?
By existing tests and the rust compiler
Are there any user-facing changes?
Less panics on bad data