-
Notifications
You must be signed in to change notification settings - Fork 2k
Fix/issue 20779 subtract overflow #20799
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
Open
KARTIK64-rgb
wants to merge
6
commits into
apache:main
Choose a base branch
from
KARTIK64-rgb:fix/issue-20779-subtract-overflow
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
1d7049e
fix/substrait-lambda-rextype-0.62.3+
KARTIK64-rgb f1474fe
fix/issue-20779-subtract-overflow
KARTIK64-rgb 36d156b
fix/issue-20779
KARTIK64-rgb 0ab48c3
Merge branch 'main' into fix/issue-20779-subtract-overflow
KARTIK64-rgb bf2bdc2
sqllogic test updated
KARTIK64-rgb 129bb1f
Merge branch 'main' into fix/issue-20779-subtract-overflow
KARTIK64-rgb File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -721,12 +721,13 @@ fn max_distinct_count( | |
| Some(non_null_count) => Precision::Inexact(non_null_count), | ||
| } | ||
| } | ||
| Precision::Exact(count) => { | ||
| let count = count - stats.null_count.get_value().unwrap_or(&0); | ||
| Precision::Exact(count) => { | ||
| let null_count = *stats.null_count.get_value().unwrap_or(&0); | ||
| let non_null_count = count.checked_sub(null_count).unwrap_or(0); | ||
| if stats.null_count.is_exact().unwrap_or(false) { | ||
| Precision::Exact(count) | ||
| Precision::Exact(non_null_count) | ||
| } else { | ||
| Precision::Inexact(count) | ||
| Precision::Inexact(non_null_count) | ||
| } | ||
| } | ||
| }; | ||
|
|
@@ -2939,4 +2940,19 @@ mod tests { | |
|
|
||
| Ok(()) | ||
| } | ||
| } | ||
| #[test] | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I created a test for this for i verified it reproduces the bug |
||
| fn test_max_distinct_count_no_overflow_when_null_count_exceeds_num_rows() { | ||
| let num_rows = Precision::Exact(2); | ||
| let stats = ColumnStatistics { | ||
| distinct_count: Precision::Absent, | ||
| null_count: Precision::Exact(5), | ||
| min_value: Precision::Absent, | ||
| max_value: Precision::Absent, | ||
| sum_value: Precision::Absent, | ||
| byte_size: Precision::Absent, | ||
| }; | ||
| let result = max_distinct_count(&num_rows, &stats); | ||
| assert_eq!(result, Precision::Exact(0)); | ||
| } | ||
|
|
||
| } | ||
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍 nice, even if this is a good safeguard, the fact that this can even happen makes me think that there is some further work to be done in the stats propagation mechanism.
Ideally, this would not even be possible by construction, but that's a topic for another PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Welcome @gabotechs @jonathanc-n !