perf: Optimize NULL handling in find_in_set#21464
Merged
mbutrovich merged 3 commits intoapache:mainfrom Apr 10, 2026
Merged
Conversation
This reverts commit 6146fe4.
Contributor
Author
|
Btw I tried refactoring this to use an explicit |
find_in_set NULL handlingfind_in_set
mbutrovich
approved these changes
Apr 10, 2026
Contributor
mbutrovich
left a comment
There was a problem hiding this comment.
Thanks for continually improving performance, @neilconway!
alamb
added a commit
to apache/arrow-rs
that referenced
this pull request
Apr 14, 2026
…on_many` (#9692) ## Which issue does this PR close? - Closes #8809. ## Rationale for this change Several DataFusion PRs ([#21464](apache/datafusion#21464), [#21468](apache/datafusion#21468), [#21471](apache/datafusion#21471), [#21475](apache/datafusion#21475), [#21477](apache/datafusion#21477), [#21482](apache/datafusion#21482), [#21532](apache/datafusion#21532)) optimize NULL handling in scalar functions by replacing row-by-row null buffer construction with bulk `NullBuffer::union`. When 3+ null buffers need combining, they chain binary `union` calls, each allocating a new `BooleanBuffer`. `NullBuffer::union_many` reduces this to 1 allocation (clone + in-place ANDs). For example, from [#21482](apache/datafusion#21482): Before: ```rust [array.nulls(), from_array.nulls(), to_array.nulls(), stride.and_then(|s| s.nulls())] .into_iter() .fold(None, |acc, nulls| NullBuffer::union(acc.as_ref(), nulls)) ``` After: ```rust NullBuffer::union_many([ array.nulls(), from_array.nulls(), to_array.nulls(), stride.and_then(|s| s.nulls()), ]) ``` Per @alamb's [suggestion](#9692 (comment)), this PR also implements the general-purpose mutable bitwise operations on `BooleanArray` from #8809, following the `PrimitiveArray::unary` / `unary_mut` pattern. This builds on the `BitAndAssign`/`BitOrAssign`/`BitXorAssign` operators added to `BooleanBuffer` in #9567. ## What changes are included in this PR? **`NullBuffer::union_many(impl IntoIterator<Item = Option<&NullBuffer>>)`**: combines multiple null buffers in a single allocation (clone + in-place `&=`). Used by DataFusion for bulk null handling. **`BooleanArray` bitwise operations** (6 new public methods): Unary (`op: FnMut(u64) -> u64`): - `bitwise_unary(&self, op)` — always allocates a new array - `bitwise_unary_mut(self, op) -> Result<Self, Self>` — in-place if uniquely owned, `Err(self)` if shared - `bitwise_unary_mut_or_clone(self, op)` — in-place if uniquely owned, allocates if shared Binary (`op: FnMut(u64, u64) -> u64`): - `bitwise_bin_op(&self, rhs, op)` — always allocates, unions null buffers - `bitwise_bin_op_mut(self, rhs, op) -> Result<Self, Self>` — in-place if uniquely owned, `Err(self)` if shared, unions null buffers - `bitwise_bin_op_mut_or_clone(self, rhs, op)` — in-place if uniquely owned, allocates if shared, unions null buffers Note: #8809 proposed the binary variants take a raw buffer and `right_offset_in_bits`. This PR takes `&BooleanArray` instead, which encapsulates both and matches existing patterns like `BooleanArray::from_binary`. ## Are these changes tested? Yes. 23 tests for the `BooleanArray` bitwise methods and 6 tests for `union_many`, covering: - Basic correctness (AND, OR, NOT) - Null handling (both nullable, one nullable, no nulls, null union) - Buffer ownership (uniquely owned → in-place, shared → `Err` / fallback) - Edge cases (empty arrays, sliced arrays with non-zero offset, misaligned left/right offsets) ## Are there any user-facing changes? Six new public methods on `BooleanArray` and one new public method on `NullBuffer`. --------- Co-authored-by: Andrew Lamb <andrew@nerdnetworks.org>
Rich-T-kid
pushed a commit
to Rich-T-kid/datafusion
that referenced
this pull request
Apr 21, 2026
## Which issue does this PR close? - Closes apache#21463. ## Rationale for this change `find_in_set` uses `PrimitiveArray::<T>::builder` to construct its results, which means building the internal null buffer in an iterative fashion (via repeated `append_null` calls). It is more efficient to construct the null buffer directly, via `NullBuffer::union` (when multiple arguments might be NULL) or just cloning the input null buffer (when passed a single argument). Benchmarks (ARM64): ``` - find_in_set/string_len_8: 589.0 µs → 529.0 µs (-10.2%) - find_in_set/string_len_32: 736.2 µs → 660.5 µs (-10.3%) - find_in_set/string_len_1024: 7.5 ms → 7.4 ms (-1.3%) - find_in_set/string_view_len_8: 616.0 µs → 579.9 µs (-5.9%) - find_in_set/string_view_len_32: 748.0 µs → 701.9 µs (-6.2%) - find_in_set/string_view_len_1024: 7.6 ms → 7.6 ms (0.0%) - find_in_set_scalar/string_len_8: 76.7 µs → 48.0 µs (-37.4%) - find_in_set_scalar/string_len_32: 76.5 µs → 47.6 µs (-37.8%) - find_in_set_scalar/string_len_1024: 76.2 µs → 48.0 µs (-37.0%) - find_in_set_scalar/string_view_len_8: 81.9 µs → 55.7 µs (-32.0%) - find_in_set_scalar/string_view_len_32: 85.5 µs → 56.8 µs (-33.6%) - find_in_set_scalar/string_view_len_1024: 85.2 µs → 57.4 µs (-32.6%) ``` The change should be an improvement for both scalar and array cases. The relative improvement is larger in the scalar case because the scalar case is doing less work and so NULL handling was a larger fraction of the total runtime. ## What changes are included in this PR? * Optimize NULL handling for both scalar and array arg cases ## Are these changes tested? Yes. ## Are there any user-facing changes? No.
This file contains hidden or 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
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?
find_in_set#21463.Rationale for this change
find_in_setusesPrimitiveArray::<T>::builderto construct its results, which means building the internal null buffer in an iterative fashion (via repeatedappend_nullcalls). It is more efficient to construct the null buffer directly, viaNullBuffer::union(when multiple arguments might be NULL) or just cloning the input null buffer (when passed a single argument).Benchmarks (ARM64):
The change should be an improvement for both scalar and array cases. The relative improvement is larger in the scalar case because the scalar case is doing less work and so NULL handling was a larger fraction of the total runtime.
What changes are included in this PR?
Are these changes tested?
Yes.
Are there any user-facing changes?
No.