Minor: improve performance of ScalarValue::Binary* debug
#12323
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
commented
Sep 4, 2024
| @@ -3707,7 +3711,7 @@ impl fmt::Debug for ScalarValue { | |||
| write!(f, "FixedSizeBinary({size}, {self})") | |||
| } | |||
| ScalarValue::FixedSizeBinary(size, Some(b)) => { | |||
| write!(f, "Binary({size}, \"")?; | |||
| write!(f, "FixedSizeBinary({size}, \"")?; | |||
There was a problem hiding this comment.
this is a bug (likely copy/paste error) found with the tests
datafusion/common/src/scalar/mod.rs
Outdated
| @@ -3646,18 +3646,22 @@ fn fmt_list(arr: ArrayRef, f: &mut fmt::Formatter) -> fmt::Result { | |||
| write!(f, "{value_formatter}") | |||
| } | |||
|
|
|||
| /// writes a byte array to formatter. `[1, 2, 3]` ==> `"1,2,3"` | |||
| fn fmt_binary(data: &[u8], f: &mut fmt::Formatter) -> fmt::Result { | |||
| let mut first = true; | |||
There was a problem hiding this comment.
the difference here is that join allocates a new String
There was a problem hiding this comment.
... and format! as well :)
Dandandan
reviewed
Sep 4, 2024
datafusion/common/src/scalar/mod.rs
Outdated
| /// writes a byte array to formatter. `[1, 2, 3]` ==> `"1,2,3"` | ||
| fn fmt_binary(data: &[u8], f: &mut fmt::Formatter) -> fmt::Result { | ||
| let mut first = true; | ||
| for b in data { |
There was a problem hiding this comment.
I think this is slightly more idiomatic written as follows:
fn fmt_binary(data: &[u8], f: &mut fmt::Formatter) -> fmt::Result {
let mut data_iter = data.iter();
if let Some(b) = data_iter.next() {
write!(f, "{}", b)?;
}
for b in data_iter {
write!(f, ",{b}")?;
}
Ok(())
}
There was a problem hiding this comment.
Or even better
fn fmt_binary(data: &[u8], f: &mut fmt::Formatter) -> fmt::Result {
if let Some(b) = data.first() {
write!(f, "{}", b)?;
}
for b in data.iter().skip(1) {
write!(f, ",{b}")?;
}
Ok(())
}
There was a problem hiding this comment.
I came up with something slightly different that I still think is more idiomatic in 99a57e7.
/// writes a byte array to formatter. `[1, 2, 3]` ==> `"1,2,3"`
fn fmt_binary(data: &[u8], f: &mut fmt::Formatter) -> fmt::Result {
let mut iter = data.iter();
if let Some(b) = iter.next() {
write!(f, "{b}")?;
}
for b in iter {
write!(f, ",{b}")?;
}
Ok(())
}
Dandandan
approved these changes
Sep 4, 2024
|
Added one small suggestion |
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?
Rationale for this change
This is similar to #12322
(Another) Follow on to #12192 from @lewiszlw
What changes are included in this PR?
Are these changes tested?
Yes
Are there any user-facing changes?