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

fix: scalar aggregation engine primitive #10465

Merged
merged 5 commits into from
Jun 8, 2022

Conversation

harshit-gangal
Copy link
Member

@harshit-gangal harshit-gangal commented Jun 8, 2022

Description

This PR fixes two bugs in scalar aggregation engine primitive

  1. Scalar aggregation was returning wrong output for empty row on count aggregation
  2. Scalar aggregation in streaming mode was not handling empty row and also final convert logic.

This was caused when we moved from using AggregateSum over AggregateCount as opcode for count(*). As the actual operation at the engine primitive level was sum of count, this caused a negative effect of returning NULL for empty row instead of 0.

Related Issue(s)

Checklist

  • "Backport me!" label has been added if this change should be backported -> 14.0
  • Tests were added or are not required
  • Documentation was added or is not required

Deployment Notes

Signed-off-by: Harshit Gangal <[email protected]>
@harshit-gangal harshit-gangal changed the title test: added failing e2e test fix: scalar aggregation engine primitive Jun 8, 2022
@harshit-gangal harshit-gangal marked this pull request as ready for review June 8, 2022 12:10
@github-actions
Copy link
Contributor

github-actions bot commented Jun 8, 2022

Review Checklist

Hello reviewers! 👋 Please follow this checklist when reviewing this Pull Request.

General

  • Ensure that the Pull Request has the correct release notes label. release notes none should only be used for PRs that are so trivial that they need not be included.
  • If a new flag is being introduced, review whether it is really needed. The flag names should be clear and intuitive (as far as possible), and the flag's help should be descriptive.

Bug fixes

  • There should be at least one unit or end-to-end test.
  • The Pull Request description should either include a link to an issue that describes the bug OR an actual description of the bug and how to reproduce, along with a description of the fix.

Non-trivial changes

  • There should be some code comments as to why things are implemented the way they are.

New/Existing features

  • Should be documented, either by modifying the existing documentation or creating new documentation.
  • New features should have a link to a feature request issue or an RFC that documents the use cases, corner cases and test cases.

Backward compatibility

  • Protobuf changes should be wire-compatible.
  • Changes to _vt tables and RPCs need to be backward compatible.
  • vtctl command output order should be stable and awk-able.

Comment on lines +134 to +141
dispOrigOp := ""
if ap.OrigOpcode != AggregateUnassigned && ap.OrigOpcode != ap.Opcode {
dispOrigOp = "_" + ap.OrigOpcode.String()
}
if ap.Alias != "" {
return fmt.Sprintf("%s(%s) AS %s", ap.Opcode.String(), keyCol, ap.Alias)
return fmt.Sprintf("%s%s(%s) AS %s", ap.Opcode.String(), dispOrigOp, keyCol, ap.Alias)
}
return fmt.Sprintf("%s(%s)", ap.Opcode.String(), keyCol)
return fmt.Sprintf("%s%s(%s)", ap.Opcode.String(), dispOrigOp, keyCol)
Copy link
Member

Choose a reason for hiding this comment

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

I think the plans would be more readable if we had a field that contains the original op code to the description instead of suffixing the original op code to the current op code. I don't have strong opinions though, the current change works well too imo.

@harshit-gangal harshit-gangal merged commit 90a649e into vitessio:main Jun 8, 2022
@harshit-gangal harshit-gangal deleted the fix-aggr-nores branch June 8, 2022 17:58
harshit-gangal added a commit to planetscale/vitess that referenced this pull request Jun 21, 2022
* test: added failing e2e test

Signed-off-by: Harshit Gangal <[email protected]>

* fix: handle empty row for scalar aggregation and also olap engine for scalar aggregation

Signed-off-by: Harshit Gangal <[email protected]>

* test: update plan test output

Signed-off-by: Harshit Gangal <[email protected]>

* test: e2e test for empty rows in non-scalar aggregates

Signed-off-by: Harshit Gangal <[email protected]>

Co-authored-by: Florent Poinsard <[email protected]>
harshit-gangal added a commit that referenced this pull request Jun 21, 2022
* test: added failing e2e test

Signed-off-by: Harshit Gangal <[email protected]>

* fix: handle empty row for scalar aggregation and also olap engine for scalar aggregation

Signed-off-by: Harshit Gangal <[email protected]>

* test: update plan test output

Signed-off-by: Harshit Gangal <[email protected]>

* test: e2e test for empty rows in non-scalar aggregates

Signed-off-by: Harshit Gangal <[email protected]>

Co-authored-by: Florent Poinsard <[email protected]>

Co-authored-by: Florent Poinsard <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants