Skip to content

revert accidently deleted size code in count_distinct - #5533

Merged
alamb merged 4 commits into
apache:mainfrom
comphead:dev
Mar 9, 2023
Merged

revert accidently deleted size code in count_distinct#5533
alamb merged 4 commits into
apache:mainfrom
comphead:dev

Conversation

@comphead

@compheadcomphead commented Mar 9, 2023•
edited
Loading

Copy link
Copy Markdown
Contributor

Which issue does this PR close?

Closes#5534.

Rationale for this change

The .size was accidently corrupted during #5408

What changes are included in this PR?

Put the size logic back

Are these changes tested?

Are there any user-facing changes?

@github-actionsgithub-actionsBot added the physical-expr Changes to the physical-expr crates label Mar 9, 2023
alamb
alamb approved these changes Mar 9, 2023
View reviewed changes

@alambalamb 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.

thanks @comphead -- sorry we missed this in review

Comment threaddatafusion/physical-expr/src/aggregate/count_distinct.rs

fn size(&self) -> usize {
self.fixed_size()
match &self.state_data_type {

@alambalambMar 9, 2023

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.

👍 thank you @comphead

@alamb

alamb commented Mar 9, 2023

Copy link
Copy Markdown
Contributor

I plan to merge this PR as soon as the CI checks have passed, as I would like to ensure it makes it into the release if possible

@alamb

alamb commented Mar 9, 2023

Copy link
Copy Markdown
Contributor

The clippy CI check https://github.com/apache/arrow-datafusion/actions/runs/4376721582/jobs/7659390110 was failing due to clippy being updated.

I merged up from main (to get @jackwener 's #5532 ❤️ ) and pushed to your branch

@alamb
alamb merged commit 7f84503 into apache:mainMar 9, 2023
@ursabot

ursabot commented Mar 9, 2023

Copy link
Copy Markdown

Benchmark runs are scheduled for baseline = 6a8c4a6 and contender = 7f84503. 7f84503 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

@andygroveandygrove added the bug Something isn't working label Mar 12, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alambalambalamb approved these changes

Assignees

No one assigned

Labels

bugSomething isn't workingphysical-exprChanges to the physical-expr crates

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Revert accidently deleted size code in count_distinct

4 participants

@comphead@alamb@ursabot@andygrove