Skip to content

refactor(query): remove potential performance hotspots caused by fetch_add #18995

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
merged 4 commits into from
Nov 20, 2025
Merged

refactor(query): remove potential performance hotspots caused by fetch_add #18995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
badca0c
refactor(query): remove potential performance hotspots caused by fetc…
zhang2014 Nov 20, 2025
7f0381c
refactor(query): remove potential performance hotspots caused by fetc…
zhang2014 Nov 20, 2025
9145859
refactor(query): remove potential performance hotspots caused by fetc…
zhang2014 Nov 20, 2025
7a65ee5
Merge branch 'main' into refactor/remove_fetch_add
zhang2014 Nov 20, 2025
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
11 changes: 9 additions & 2 deletions src/common/hashtable/src/hashjoin_hashtable.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,10 @@ impl<K: Keyable, A: Allocator + Clone + Default + 'static, const SKIP_DUPLICATES
atomic_pointers: std::ptr::null_mut(),
hash_shift: (hash_bits() - capacity.trailing_zeros()) as usize,
phantom: PhantomData,
count: Default::default(),
count: match SKIP_DUPLICATES {
true => Default::default(),
false => AtomicUsize::new(row_num),
},
};
hashtable.atomic_pointers = unsafe {
std::mem::transmute::<*mut u64, *mut AtomicU64>(hashtable.pointers.as_mut_ptr())
Expand Down Expand Up @@ -172,7 +175,11 @@ impl<K: Keyable, A: Allocator + Clone + Default + 'static, const SKIP_DUPLICATES
Err(x) => old_header = x,
};
}
self.count.fetch_add(1, Ordering::Relaxed);

if SKIP_DUPLICATES {
self.count.fetch_add(1, Ordering::Relaxed);
}

unsafe { (*entry_ptr).next = remove_header_tag(old_header) };
}
}
Expand Down
11 changes: 9 additions & 2 deletions src/common/hashtable/src/hashjoin_string_hashtable.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,10 @@ impl<A: Allocator + Clone + Default + 'static, const SKIP_DUPLICATES: bool>
},
atomic_pointers: std::ptr::null_mut(),
hash_shift: (hash_bits() - capacity.trailing_zeros()) as usize,
count: Default::default(),
count: match SKIP_DUPLICATES {
true => Default::default(),
false => AtomicUsize::new(row_num),
},
};
hashtable.atomic_pointers = unsafe {
std::mem::transmute::<*mut u64, *mut AtomicU64>(hashtable.pointers.as_mut_ptr())
Expand Down Expand Up @@ -105,7 +108,11 @@ impl<A: Allocator + Clone + Default + 'static, const SKIP_DUPLICATES: bool>
Err(x) => old_header = x,
};
}
self.count.fetch_add(1, Ordering::Relaxed);

if SKIP_DUPLICATES {
self.count.fetch_add(1, Ordering::Relaxed);
}

unsafe { (*entry_ptr).next = remove_header_tag(old_header) };
}
}
Expand Down