Fix incorrect results in BitAnd GroupsAccumulator
#6957
Merged
Conversation
This file contains 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
Fix accumulator
github-actions
bot
added
physical-expr
alamb
changed the title
BitAnd GroupsAccumulator
alamb
force-pushed
the
alamb/fix_gby_bit_and
branch
from
a27881f
to
6459945
Compare
alamb
commented
Jul 13, 2023
| GROUP BY tag | ||
| ORDER BY tag | ||
| ---- | ||
| 1 8 11 13 14 11 12 6 11 A |
There was a problem hiding this comment.
before this PR, this test fails like
External error: query result mismatch:
[SQL] SELECT
bit_and(c1),
bit_and(c2),
bit_and(c3),
bit_or(c1),
bit_or(c2),
bit_or(c3),
bit_xor(c1),
bit_xor(c2),
bit_xor(c3),
tag
FROM bit_aggregate_functions
GROUP BY tag
ORDER BY tag
[Diff] (-expected|+actual)
- 1 8 11 13 14 11 12 6 11 A
- 33 11 NULL 33 11 NULL 33 11 NULL B
+ 0 0 0 13 14 11 12 6 11 A
+ 0 0 NULL 33 11 NULL 33 11 NULL B
at tests/sqllogictests/test_files/aggregate.slt:1546
| @@ -279,35 +280,31 @@ impl AggregateExpr for BitAnd { | |||
| use std::ops::BitAndAssign; | |||
| match self.data_type { | |||
| DataType::Int8 => { | |||
| instantiate_primitive_accumulator!(self, Int8Type, |x, y| x | |||
| .bitand_assign(y)) | |||
| instantiate_accumulator!(self, -1, Int8Type, |x, y| x.bitand_assign(y)) | |||
There was a problem hiding this comment.
the fix is passing in MAX / -1 here to get a bitpattern of all 1 initially
There was a problem hiding this comment.
The fix looks good. It's better to leave a comment like above in the code.
There was a problem hiding this comment.
Comment added in #6964
| @@ -85,7 +95,7 @@ where | |||
| let values = values[0].as_primitive::<T>(); | |||
|
|
|||
| // update values | |||
| self.values.resize(total_num_groups, T::default_value()); | |||
There was a problem hiding this comment.
previously this always started at zero, now it starts at the specified value.
I think I can now reduce the code in min/max accumulator as well
viirya
approved these changes
Jul 13, 2023
|
🤔 seems clippy failure is unrelated. I will fix that |
|
Clippy fixes in #6959 |
This was referenced Jul 13, 2023
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?
Resolves #6955, a bug introduced in #6904
Rationale for this change
The answer is incorrect because the starting value is always 0 and thus
0 &anything else will also be zero which is not rightWhat changes are included in this PR?
bit_andAre these changes tested?
Yes
Are there any user-facing changes?