Skip to content

refactor: centralizing shared-allocation accounting for Arc DFHeapSize impls #23349

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.

Sign up for GitHub

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

Merged
kosiew merged 4 commits into from
Jul 9, 2026
+22 −6
Merged

refactor: centralizing shared-allocation accounting for Arc DFHeapSize impls #23349

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ce007af
refactor: centralizing shared-allocation accounting for Arc DFHeapSiz…
saadtajwar Jul 6, 2026
bdda193
Merge branch 'main' into saadt/centralize-arc-dfheapsize-impls
saadtajwar Jul 6, 2026
6eb6077
addressing comments
saadtajwar Jul 7, 2026
bc7152d
Merge branch 'main' into saadt/centralize-arc-dfheapsize-impls
saadtajwar Jul 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions datafusion/common/src/heap_size.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,11 +281,23 @@ impl<K: DFHeapSize, V: DFHeapSize> DFHeapSize for HashMap<K, V> {
}
}

fn count_allocation_once(ptr: usize, ctx: &mut DFHeapSizeCtx) -> bool {
Comment thread
saadtajwar marked this conversation as resolved.
Outdated
ctx.seen.insert(ptr)
}

fn arc_ptr<T>(arc: &Arc<T>) -> usize {
Arc::as_ptr(arc) as usize
}

fn arc_unsized_ptr<T: ?Sized>(arc: &Arc<T>) -> usize {
Comment thread
saadtajwar marked this conversation as resolved.
Arc::as_ptr(arc) as *const i32 as usize
}

impl<T: DFHeapSize> DFHeapSize for Arc<T> {
fn heap_size(&self, ctx: &mut DFHeapSizeCtx) -> usize {
let ptr = Arc::as_ptr(self) as usize;
let ptr = arc_ptr(self);

if !ctx.seen.insert(ptr) {
if !count_allocation_once(ptr, ctx) {
return 0;
}

Expand All @@ -296,9 +308,9 @@ impl<T: DFHeapSize> DFHeapSize for Arc<T> {

impl DFHeapSize for Arc<str> {
fn heap_size(&self, ctx: &mut DFHeapSizeCtx) -> usize {
let ptr = Arc::as_ptr(self) as *const i32 as usize;
let ptr = arc_unsized_ptr(self);

if !ctx.seen.insert(ptr) {
if !count_allocation_once(ptr, ctx) {
return 0;
}

Expand All @@ -309,9 +321,9 @@ impl DFHeapSize for Arc<str> {

impl DFHeapSize for Arc<dyn DFHeapSize> {
fn heap_size(&self, ctx: &mut DFHeapSizeCtx) -> usize {
let ptr = Arc::as_ptr(self) as *const i32 as usize;
let ptr = arc_unsized_ptr(self);

if !ctx.seen.insert(ptr) {
if !count_allocation_once(ptr, ctx) {
return 0;
}

Expand Down
Loading