Skip to content

planner: fix wrong TopN's ByItem with expression.ScalarFunction when to PushDownTopN (#60822)#61004

Merged
ti-chi-bot[bot] merged 10 commits into
pingcap:release-7.5from
ti-chi-bot:cherry-pick-60822-to-release-7.5
Jul 9, 2025
Merged

planner: fix wrong TopN's ByItem with expression.ScalarFunction when to PushDownTopN (#60822)#61004
ti-chi-bot[bot] merged 10 commits into
pingcap:release-7.5from
ti-chi-bot:cherry-pick-60822-to-release-7.5

Conversation

@ti-chi-bot
Copy link
Copy Markdown
Member

This is an automated cherry-pick of #60822

What problem does this PR solve?

Issue Number: close #60655

Problem Summary:

In the #40593,

There is a column in topN.ByItems is generated by proj, when topN is pushed down below proj, topN cannot obtain the column from datasource, to fix this, we can check whether topN.ByItems contains a column(with ID=0) generated by proj, if so, proj will prevent the optimizer from pushing topN down.

  1. A column with ID=0 indicates that the column cannot be resolved by data source.
  2. To determine whether a column is generated by projection, we can check whether the child of proj contains the column.

What changed and how does it work?

If you find that the TopN you can push down cannot actually be pushed down, you should use the original TopN to assemble into a structure of TopN -> Projection, rather than using the processed TopN to assemble.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No need to test
    • I checked and no code files have been changed.

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 wrong TopN's ByItem with expression.ScalarFunction when to PushDownTopN

修复在 TopN 下推过程中错误生成带表达式的TopN排序项 

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/planner SIG: Planner size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. type/cherry-pick-for-release-7.5 This PR is cherry-picked to release-7.5 from a source PR. labels May 8, 2025
@ti-chi-bot
Copy link
Copy Markdown
Member Author

@hawkingrei This PR has conflicts, I have hold it.
Please resolve them or ask others to resolve them, then comment /unhold to remove the hold label.

@ti-chi-bot ti-chi-bot Bot added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Jun 25, 2025
Copy link
Copy Markdown
Contributor

@fixdb fixdb left a comment

Choose a reason for hiding this comment

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

fix the conflict

@fixdb fixdb requested a review from AilinKid July 8, 2025 06:58
@ti-chi-bot ti-chi-bot Bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jul 8, 2025
@ti-chi-bot ti-chi-bot Bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jul 8, 2025
AilinKid added 3 commits July 8, 2025 17:47
.
Signed-off-by: AilinKid <314806019@qq.com>
.
Signed-off-by: AilinKid <314806019@qq.com>
@ti-chi-bot ti-chi-bot Bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 8, 2025
@hawkingrei
Copy link
Copy Markdown
Member

/unhold

@ti-chi-bot ti-chi-bot Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 8, 2025
@ti-chi-bot ti-chi-bot Bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Jul 8, 2025
@codecov
Copy link
Copy Markdown

codecov Bot commented Jul 8, 2025

Codecov Report

Attention: Patch coverage is 63.63636% with 4 lines in your changes missing coverage. Please review.

Please upload report for BASE (release-7.5@a4ff00a). Learn more about missing BASE report.

Additional details and impacted files
@@               Coverage Diff                @@
##             release-7.5     #61004   +/-   ##
================================================
  Coverage               ?   72.3042%           
================================================
  Files                  ?       1417           
  Lines                  ?     414663           
  Branches               ?          0           
================================================
  Hits                   ?     299819           
  Misses                 ?      94901           
  Partials               ?      19943           
Flag Coverage Δ
unit 72.3042% <63.6363%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
dumpling 52.9400% <0.0000%> (?)
parser ∅ <0.0000%> (?)
br 53.5531% <0.0000%> (?)
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Copy link
Copy Markdown
Contributor

@fixdb fixdb left a comment

Choose a reason for hiding this comment

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

+1

@ti-chi-bot
Copy link
Copy Markdown

ti-chi-bot Bot commented Jul 8, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: AilinKid, fixdb

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

The pull request process is described here

Details 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 and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Jul 8, 2025
@ti-chi-bot
Copy link
Copy Markdown

ti-chi-bot Bot commented Jul 8, 2025

[LGTM Timeline notifier]

Timeline:

  • 2025-07-08 10:02:23.139828674 +0000 UTC m=+1993995.863007655: ☑️ agreed by AilinKid.
  • 2025-07-08 23:31:07.491037187 +0000 UTC m=+2042520.214216168: ☑️ agreed by fixdb.

@fixdb
Copy link
Copy Markdown
Contributor

fixdb commented Jul 8, 2025

/retest

@ti-chi-bot ti-chi-bot Bot merged commit 9298ee7 into pingcap:release-7.5 Jul 9, 2025
17 of 18 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 release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/planner SIG: Planner size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/cherry-pick-for-release-7.5 This PR is cherry-picked to release-7.5 from a source PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants