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

planner: fix agg elimination logic after agg pushed down through a join (#44941) #45096

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #44941

What problem does this PR solve?

Issue Number: close #44795

Problem Summary:

What is changed and how it works?

code in aggregationPushDownSolver for the switch p.SCtx().GetSessionVars().AllowAggPushDown path is too old to use.

briefly speaking, when we try to push agg down through a join (that's what aggregationPushDownSolver does) and try to combine some aggregation elimination (for example, group item covering unique key, then the aggregation itself can be eliminated):

buildKeyInfo(join)
proj := a.tryToEliminateAggregation(agg, opt). // here use an old pointer, whose child is already changed during the logic above
if proj != nil {
	p = proj
}

the comment place is actually to eliminate the new pushed-down agg since agg's children have changed, maybe some new unique key can be detected to eliminate itself. Or we should say, the old agg elimination logic is quite different from normal agg eliminations (see comments for more detail)

image

old agg rewriting still uses the ifnull(col#19, 0, 1)'s logic, taking every row as a count 1, while after the agg has been pushed down, the col#19 here is already the final aggregation result, rather than in the process of aggregation. Keep it real is the true path, while for now, we banned this kind of old agg elimination logic.

so the handling logic is a mess.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
    scripts:

sql = $below

SELECT c_count, count(*) as custdist
from ( SELECT c_custkey, count(o_orderkey)  as  c_count
       from customer left join orders on c_custkey = o_custkey and o_comment not like '%special%requests%'
       group by c_custkey ) c_orders
group by c_count
order by custdist desc, c_count desc;

execute $sql + "into outfile 'tai1.txt'" under set tidb_opt_agg_push_down=ON;
execute $sql + "into outfile 'tai2txt'" under set tidb_opt_agg_push_down=OFF;

diff tai1.txt tai2.txt to see nothing strange

  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

planner: fix agg elimination logic after agg pushed down to join

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot added ok-to-test Indicates a PR is ready to be tested. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR. labels Jun 30, 2023
@ti-chi-bot ti-chi-bot bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/cherry-pick-not-approved labels Jun 30, 2023
@ti-chi-bot ti-chi-bot bot deleted a comment from ti-chi-bot Jun 30, 2023
@ti-chi-bot ti-chi-bot bot deleted a comment from ti-chi-bot Jun 30, 2023
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Jul 12, 2023
@AilinKid
Copy link
Contributor

/retest

Signed-off-by: AilinKid <314806019@qq.com>
Copy link
Contributor

@elsa0520 elsa0520 left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-chi-bot ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Aug 14, 2023
@ti-chi-bot
Copy link

ti-chi-bot bot commented Aug 14, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: elsa0520, time-and-fate

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added lgtm approved and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Aug 14, 2023
@ti-chi-bot
Copy link

ti-chi-bot bot commented Aug 14, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-08-14 09:44:49.764816296 +0000 UTC m=+537854.313832278: ☑️ agreed by elsa0520.
  • 2023-08-14 10:04:38.815424745 +0000 UTC m=+539043.364440716: ☑️ agreed by time-and-fate.

@codecov
Copy link

codecov bot commented Aug 14, 2023

Codecov Report

❗ No coverage uploaded for pull request base (release-6.5@d52ff9d). Click here to learn what that means.
The diff coverage is n/a.

Additional details and impacted files
@@               Coverage Diff                @@
##             release-6.5     #45096   +/-   ##
================================================
  Coverage               ?   73.7672%           
================================================
  Files                  ?       1083           
  Lines                  ?     347787           
  Branches               ?          0           
================================================
  Hits                   ?     256553           
  Misses                 ?      74826           
  Partials               ?      16408           

@ti-chi-bot ti-chi-bot bot merged commit 361fe40 into pingcap:release-6.5 Aug 14, 2023
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved cherry-pick-approved Cherry pick PR approved by release team. lgtm ok-to-test Indicates a PR is ready to be tested. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants