Skip to content
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.

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

Minor: use upstream RowSelection code from arrow intersect_row_selection #4340

Merged
merged 2 commits into from
Dec 3, 2022

Conversation

alamb
Copy link
Contributor

@alamb alamb commented Nov 23, 2022

Draft as it is waiting on

Which issue does this PR close?

N/A

Rationale for this change

This code was upstreamed in apache/arrow-rs#3003

What changes are included in this PR?

Remove Datafusion copy of intersect_row_selection which has been upstreamed

Are these changes tested?

Yes by existing tests

Are there any user-facing changes?

No

@github-actions github-actions bot added the core Core DataFusion crate label Nov 23, 2022
Cargo.toml Outdated


[patch.crates-io]
arrow = { git = "https://github.com/alamb/arrow-rs.git", rev="7fd330b" }
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Waiting on arrow 28.0.0 release

@alamb alamb changed the title Minor: use upstream RowSelection code in arrow Minor: use upstream RowSelection code from arrow intersect_row_selection Nov 23, 2022
@alamb alamb force-pushed the alamb/upstream_row_seectors branch from d2db743 to 1b73c51 Compare November 30, 2022 19:32
@@ -123,7 +122,7 @@ pub(crate) fn build_page_filter(
if let (Some(file_offset_indexes), Some(file_page_indexes)) =
(file_offset_indexes, file_page_indexes)
{
let mut row_selections = VecDeque::with_capacity(page_index_predicates.len());
let mut row_selections = Vec::with_capacity(page_index_predicates.len());
Copy link
Contributor Author

Choose a reason for hiding this comment

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

since row_selections are always appended to (never pop_front, for example) I think Vec is just fine and using VecDequeue just makes the code more confusing

@alamb alamb force-pushed the alamb/upstream_row_seectors branch from 1b73c51 to 5634163 Compare November 30, 2022 19:37
/// set `need_combine` true will combine result: Select(2) + Select(1) + Skip(2) -> Select(3) + Skip(2)
///
/// Move to arrow-rs: https://github.com/apache/arrow-rs/issues/3003
pub(crate) fn intersect_row_selection(
Copy link
Contributor Author

Choose a reason for hiding this comment

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

upstreamed in apache/arrow-rs#3173

@alamb alamb marked this pull request as ready for review November 30, 2022 19:38
@alamb alamb requested a review from Ted-Jiang November 30, 2022 19:38
@tustvold tustvold merged commit 8db99d2 into apache:master Dec 3, 2022
@ursabot
Copy link

ursabot commented Dec 3, 2022

Benchmark runs are scheduled for baseline = 27dc295 and contender = 8db99d2. 8db99d2 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-datafusion-commits is not supported on ec2-t3-xlarge-us-east-2] ec2-t3-xlarge-us-east-2
[Skipped ⚠️ Benchmarking of arrow-datafusion-commits is not supported on test-mac-arm] test-mac-arm
[Skipped ⚠️ Benchmarking of arrow-datafusion-commits is not supported on ursa-i9-9960x] ursa-i9-9960x
[Skipped ⚠️ Benchmarking of arrow-datafusion-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

@alamb alamb deleted the alamb/upstream_row_seectors branch December 3, 2022 10:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core Core DataFusion crate
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants