Skip to content

Fix take string on sliced indices#2960

Merged
tustvold merged 1 commit into
apache:masterfrom
tustvold:fix-take-string-nulls
Oct 28, 2022
Merged

Fix take string on sliced indices#2960
tustvold merged 1 commit into
apache:masterfrom
tustvold:fix-take-string-nulls

Conversation

@tustvold

Copy link
Copy Markdown
Contributor

Which issue does this PR close?

Closes #1049

Rationale for this change

What changes are included in this PR?

Are there any user-facing changes?

@github-actions github-actions Bot added the arrow Changes to the arrow crate label Oct 27, 2022
Comment thread arrow-select/src/take.rs

nulls = match indices.data_ref().null_buffer() {
Some(buffer) => {
Some(buffer_bin_and(buffer, 0, &null_buf.into(), 0, data_len))

@tustvold tustvold Oct 27, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The bug is that this doesn't take into account any offset that indices may have, it should be

buffer_bin_and(buffer, indices.offset(), &null_buf.into(), 0, data_len)

However, this code is completely redundant as we already check the validity of indices in the loop above when constructing this mask, and so we can just remove this

@nevi-me nevi-me left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@tustvold tustvold merged commit 87ac05b into apache:master Oct 28, 2022
@ursabot

ursabot commented Oct 28, 2022

Copy link
Copy Markdown

Benchmark runs are scheduled for baseline = 0a115d6 and contender = 87ac05b. 87ac05b is a master commit associated with this PR. Results will be available as each benchmark for each run completes.
Conbench compare runs links:
[Skipped ⚠️ Benchmarking of arrow-rs-commits is not supported on ec2-t3-xlarge-us-east-2] ec2-t3-xlarge-us-east-2
[Skipped ⚠️ Benchmarking of arrow-rs-commits is not supported on test-mac-arm] test-mac-arm
[Skipped ⚠️ Benchmarking of arrow-rs-commits is not supported on ursa-i9-9960x] ursa-i9-9960x
[Skipped ⚠️ Benchmarking of arrow-rs-commits is not supported on ursa-thinkcentre-m75q] ursa-thinkcentre-m75q
Buildkite builds:
Supported benchmarks:
ec2-t3-xlarge-us-east-2: Supported benchmark langs: Python, R. Runs only benchmarks with cloud = True
test-mac-arm: Supported benchmark langs: C++, Python, R
ursa-i9-9960x: Supported benchmark langs: Python, R, JavaScript
ursa-thinkcentre-m75q: Supported benchmark langs: C++, Java

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

arrow Changes to the arrow crate

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Take on strings incorrect on slices

4 participants