-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Merge changelog and version from 54.3.1 into main #7340
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
Conversation
* bugfix: correct offsets when serializing a list of fixed sized list and non-zero start offset (#7318) * When serializing fixed length arrays, adjust the offsets for writing out * Add unit test * clippy warnings * Add unit test for nulls * Update unit test to account for which schema had nulls * Add missing type annotation (#7326) * Update version * Create changelog --------- Co-authored-by: Tim Saucer <[email protected]>
|
@alamb this is the requested PR to merge the changelog back into main |
alamb
left a comment
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.
Thank you @timsaucer
| write_options, | ||
| )?; | ||
| return Ok(offset); | ||
| } else if let DataType::FixedSizeList(_, fixed_size) = data_type { |
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.
it is strange that github is showing this in the diff. However, I verified this code is already on main so this PR doesn't change the cide
arrow-rs/arrow-ipc/src/writer.rs
Lines 1730 to 1750 in a01886d
| } else if let DataType::FixedSizeList(_, fixed_size) = data_type { | |
| assert_eq!(array_data.child_data().len(), 1); | |
| let fixed_size = *fixed_size as usize; | |
| let child_offset = array_data.offset() * fixed_size; | |
| let child_length = array_data.len() * fixed_size; | |
| let child_data = array_data.child_data()[0].slice(child_offset, child_length); | |
| offset = write_array_data( | |
| &child_data, | |
| buffers, | |
| arrow_data, | |
| nodes, | |
| offset, | |
| child_data.len(), | |
| child_data.null_count(), | |
| compression_codec, | |
| write_options, | |
| )?; | |
| return Ok(offset); | |
| } else { |
🤷
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.
And in fact the commit in main 0e73524 does not have these changes
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.
DOH! My original PR never was merged into main! It was approved, but not merged.
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.
It is now, via this.
No it was merged I just doubled checked 😅 The fact it showed up here in this PR I think is some sort of github rendering artifact |

bugfix: correct offsets when serializing a list of fixed sized list and non-zero start offset (bugfix: correct offsets when serializing a list of fixed sized list and non-zero start offset #7318)
When serializing fixed length arrays, adjust the offsets for writing out
Add unit test
clippy warnings
Add unit test for nulls
Update unit test to account for which schema had nulls
Add missing type annotation (Add missing type annotation #7326)
Update version
Create changelog
Which issue does this PR close?
54.3.1(Mar 2025) #7330Rationale for this change
What changes are included in this PR?
Are there any user-facing changes?