refactor byte_to_string and string_to_byte #7091
Merged
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
reviewed
Jul 26, 2023
datafusion/proto/src/common.rs
Outdated
| } | ||
|
|
||
| pub fn str_to_byte(s: &String) -> Result<u8> { | ||
| pub fn str_to_byte(s: &String, flag: &str) -> Result<u8> { |
There was a problem hiding this comment.
I know this PR didn't introduce this change, but str_to_bytes doesn't need to be pub:
Suggested change
| pub fn str_to_byte(s: &String, flag: &str) -> Result<u8> { | |
| fn str_to_byte(s: &String, flag: &str) -> Result<u8> { |
There was a problem hiding this comment.
it might also be clearer if the name of flag was something like description
datafusion/proto/src/common.rs
Outdated
| } | ||
| Ok(s.as_bytes()[0]) | ||
| } | ||
|
|
||
| pub fn byte_to_string(b: u8) -> Result<String> { | ||
| pub fn byte_to_string(b: u8, flag: &str) -> Result<String> { |
There was a problem hiding this comment.
Suggested change
| pub fn byte_to_string(b: u8, flag: &str) -> Result<String> { | |
| fn byte_to_string(b: u8, flag: &str) -> Result<String> { |
There was a problem hiding this comment.
I am confuing about this, str_to_bytes is called in other file.
datafusion/proto/src/common.rs
Outdated
| return Err(DataFusionError::Internal( | ||
| "Invalid CSV delimiter".to_owned(), | ||
| )); | ||
| return Err(DataFusionError::Internal(format!("Invalid CSV {flag}"))); |
There was a problem hiding this comment.
I think more specific error messages are more helpful:
Suggested change
| return Err(DataFusionError::Internal(format!("Invalid CSV {flag}"))); | |
| return Err(DataFusionError::Internal(format!("Invalid CSV {flag}: expected single character, got {s}"))); |
datafusion/proto/src/common.rs
Outdated
| let b = &[b]; | ||
| let b = std::str::from_utf8(b) | ||
| .map_err(|_| DataFusionError::Internal("Invalid CSV delimiter".to_owned()))?; | ||
| .map_err(|_| DataFusionError::Internal(format!("Invalid CSV {flag}")))?; |
There was a problem hiding this comment.
Suggested change
| .map_err(|_| DataFusionError::Internal(format!("Invalid CSV {flag}")))?; | |
| .map_err(|_| DataFusionError::Internal(format!("Invalid CSV {flag}: can not represent {b:0x} as utf8")))?; |
alamb
approved these changes
Jul 26, 2023
jackwener
reviewed
Jul 27, 2023
jackwener
reviewed
Jul 27, 2023
jackwener
approved these changes
Jul 27, 2023
|
Thanks for reviewing @alamb @jackwener |
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?
Closes #6926
Rationale for this change
What changes are included in this PR?
Are these changes tested?
Are there any user-facing changes?