Account for child Bucket size in OrderPreservingInterner
#4646
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
Aug 4, 2023
| @@ -343,8 +343,19 @@ impl Bucket { | |||
| fn size(&self) -> usize { | |||
| std::mem::size_of::<Self>() | |||
| + self.slots.capacity() * std::mem::size_of::<Slot>() | |||
| // and account for the size of any embedded buckets in the slots | |||
| + self.slot_child_bucket_size() | |||
There was a problem hiding this comment.
The problem is that a Bucket may contain other Buckets in the children Slots:
arrow-rs/arrow-row/src/interner.rs
Line 233 in b15838c
Their memory was not accounted for
alamb
changed the title
Bucket size in OrderPreservingInterner
tustvold
approved these changes
Aug 5, 2023
alamb
commented
Aug 5, 2023
| .iter() | ||
| .map(|slot| slot.child.as_ref().map(|x| x.size()).unwrap_or_default()) | ||
| .sum() | ||
| } | ||
| } | ||
|
|
||
| #[cfg(test)] |
There was a problem hiding this comment.
I would love some suggestions on how to test this -- what I tried is described on #4645
There was a problem hiding this comment.
I made a test in 111b43c
It is basically a second implementation of size, which one could argue is unnecessary but I feel good by having a double check
|
I am still working on a test for this |
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 #4645
Rationale for this change
Without this change our system consumes significantly more memory (2-3x) than the configured limit
What changes are included in this PR?
Account for missing allocation
Are there any user-facing changes?
If you use this to enforce memory limits, will not exceed limits