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: merge FullSchema and FullNames of subplans when rewriting "in (subquery)" to inner join #54334

Merged
merged 3 commits into from
Oct 10, 2024

Conversation

dash12653
Copy link
Contributor

@dash12653 dash12653 commented Jul 1, 2024

What problem does this PR solve?

Issue Number: close #53766

Problem Summary:

What changed and how does it work?

Merge FullSchema and FullNames of subplans when rewring "in (subquery)" to inner join, which will be used to rewrite fields when using natural join.

func findFieldNameFromNaturalUsingJoin(p base.LogicalPlan, v *ast.ColumnName) (col *expression.Column, name *types.FieldName, err error) {
switch x := p.(type) {
case *LogicalLimit, *LogicalSelection, *LogicalTopN, *LogicalSort, *LogicalMaxOneRow:
return findFieldNameFromNaturalUsingJoin(p.Children()[0], v)
case *LogicalJoin:
if x.FullSchema != nil {
idx, err := expression.FindFieldName(x.FullNames, v)
if err != nil {
return nil, nil, err
}
if idx >= 0 {
return x.FullSchema.Columns[idx], x.FullNames[idx], nil
}
}
}
return nil, nil, nil
}

The merging code I referenced was from the code in buildJoin as follows:

// Merge sub-plan's FullSchema into this join plan.
// Please read the comment of LogicalJoin.FullSchema for the details.
var (
lFullSchema, rFullSchema *expression.Schema
lFullNames, rFullNames types.NameSlice
)
if left, ok := leftPlan.(*LogicalJoin); ok && left.FullSchema != nil {
lFullSchema = left.FullSchema
lFullNames = left.FullNames
} else {
lFullSchema = leftPlan.Schema()
lFullNames = leftPlan.OutputNames()
}
if right, ok := rightPlan.(*LogicalJoin); ok && right.FullSchema != nil {
rFullSchema = right.FullSchema
rFullNames = right.FullNames
} else {
rFullSchema = rightPlan.Schema()
rFullNames = rightPlan.OutputNames()
}
if joinNode.Tp == ast.RightJoin {
// Make sure lFullSchema means outer full schema and rFullSchema means inner full schema.
lFullSchema, rFullSchema = rFullSchema, lFullSchema
lFullNames, rFullNames = rFullNames, lFullNames
}
joinPlan.FullSchema = expression.MergeSchema(lFullSchema, rFullSchema)
// Clear NotNull flag for the inner side schema if it's an outer join.
if joinNode.Tp == ast.LeftJoin || joinNode.Tp == ast.RightJoin {
resetNotNullFlag(joinPlan.FullSchema, lFullSchema.Len(), joinPlan.FullSchema.Len())
}
// Merge sub-plan's FullNames into this join plan, similar to the FullSchema logic above.
joinPlan.FullNames = make([]*types.FieldName, 0, len(lFullNames)+len(rFullNames))
for _, lName := range lFullNames {
name := *lName
joinPlan.FullNames = append(joinPlan.FullNames, &name)
}
for _, rName := range rFullNames {
name := *rName
joinPlan.FullNames = append(joinPlan.FullNames, &name)
}

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.

None

@ti-chi-bot ti-chi-bot bot added do-not-merge/needs-triage-completed release-note-none Denotes a PR that doesn't merit a release note. labels Jul 1, 2024
@sre-bot
Copy link
Contributor

sre-bot commented Jul 1, 2024

CLA assistant check
All committers have signed the CLA.

@ti-chi-bot ti-chi-bot bot added the sig/planner SIG: Planner label Jul 1, 2024
Copy link

ti-chi-bot bot commented Jul 1, 2024

Welcome @dash12653!

It looks like this is your first PR to pingcap/tidb 🎉.

I'm the bot to help you request reviewers, add labels and more, See available commands.

We want to make sure your contribution gets all the attention it needs!



Thank you, and welcome to pingcap/tidb. 😃

@ti-chi-bot ti-chi-bot bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jul 1, 2024
Copy link

ti-chi-bot bot commented Jul 1, 2024

Hi @dash12653. Thanks for your PR.

I'm waiting for a pingcap member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ti-chi-bot ti-chi-bot bot added the needs-ok-to-test Indicates a PR created by contributors and need ORG member send '/ok-to-test' to start testing. label Jul 1, 2024
Copy link

tiprow bot commented Jul 1, 2024

Hi @dash12653. Thanks for your PR.

PRs from untrusted users cannot be marked as trusted with /ok-to-test in this repo meaning untrusted PR authors can never trigger tests themselves. Collaborators can still trigger tests on the PR using /test all.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@hawkingrei
Copy link
Member

/ok-to-test

@ti-chi-bot ti-chi-bot bot added ok-to-test Indicates a PR is ready to be tested. and removed needs-ok-to-test Indicates a PR created by contributors and need ORG member send '/ok-to-test' to start testing. labels Jul 3, 2024
@hawkingrei hawkingrei self-assigned this Jul 3, 2024
Copy link

codecov bot commented Jul 3, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 77.0460%. Comparing base (b520f61) to head (9dddc81).
Report is 832 commits behind head on master.

Additional details and impacted files
@@               Coverage Diff                @@
##             master     #54334        +/-   ##
================================================
+ Coverage   73.3867%   77.0460%   +3.6593%     
================================================
  Files          1620       1626         +6     
  Lines        447041     464984     +17943     
================================================
+ Hits         328069     358252     +30183     
+ Misses        98877      86453     -12424     
- Partials      20095      20279       +184     
Flag Coverage Δ
integration 51.3031% <100.0000%> (?)
unit 74.3418% <100.0000%> (+1.8635%) ⬆️

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

Components Coverage Δ
dumpling 52.9478% <ø> (ø)
parser ∅ <ø> (∅)
br 53.6562% <76.9230%> (+8.1269%) ⬆️

@ti-chi-bot ti-chi-bot bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 4, 2024
@ti-chi-bot ti-chi-bot bot added approved needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Sep 27, 2024
@winoros
Copy link
Member

winoros commented Sep 27, 2024

@dash12653 Hi, you need to also update the test result.
Follow the below step:

  • Use make to create binary.
  • Go to tests/integrationtest
  • run ./run-tests.sh -s ../../bin/tidb-server -r planner/core/issuetest/planner_issue to re-generate the file planner_issue.result

@dash12653 dash12653 closed this Sep 27, 2024
@ti-chi-bot ti-chi-bot bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed approved size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Sep 27, 2024
@dash12653
Copy link
Contributor Author

@dash12653 Hi, you need to also update the test result. Follow the below step:

  • Use make to create binary.
  • Go to tests/integrationtest
  • run ./run-tests.sh -s ../../bin/tidb-server -r planner/core/issuetest/planner_issue to re-generate the file planner_issue.result

Hi winoros, Thank you very much for your comment, I have generated a new result file now, but it seems that I accidentally closed this PR. Do you know how to reopen this PR, or do I need to create a new PR?

@dash12653 dash12653 reopened this Sep 27, 2024
@ti-chi-bot ti-chi-bot bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. approved labels Sep 27, 2024
@dash12653
Copy link
Contributor Author

@dash12653 Hi, you need to also update the test result. Follow the below step:

  • Use make to create binary.
  • Go to tests/integrationtest
  • run ./run-tests.sh -s ../../bin/tidb-server -r planner/core/issuetest/planner_issue to re-generate the file planner_issue.result

Hi winoros, Thank you very much for your comment, I have generated a new result file now, but it seems that I accidentally closed this PR. Do you know how to reopen this PR, or do I need to create a new PR?

It has been reopened.

@winoros
Copy link
Member

winoros commented Sep 27, 2024

Thanks! I'll check whether the tests all are green and help to merge this pull request.

Copy link

ti-chi-bot bot commented Oct 10, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hawkingrei, winoros

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 and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Oct 10, 2024
Copy link

ti-chi-bot bot commented Oct 10, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-09-27 15:05:36.944048396 +0000 UTC m=+21692.364261408: ☑️ agreed by winoros.
  • 2024-10-10 06:14:01.875649957 +0000 UTC m=+1112997.295862969: ☑️ agreed by hawkingrei.

@dash12653
Copy link
Contributor Author

/retest

@ti-chi-bot ti-chi-bot bot merged commit 0eccf79 into pingcap:master Oct 10, 2024
23 checks passed
@AilinKid AilinKid added needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. and removed approved labels Oct 31, 2024
@ti-chi-bot ti-chi-bot bot added the approved label Oct 31, 2024
Copy link

ti-chi-bot bot commented Oct 31, 2024

@AilinKid: You cannot manually add or delete the reviewing state labels, only I and the tursted members have permission to do so.

In response to removing label named approved.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Oct 31, 2024
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.1: #57036.

@hawkingrei
Copy link
Member

/cherrypick release-7.5

@ti-chi-bot
Copy link
Member

@hawkingrei: new pull request created to branch release-7.5: #58089.

In response to this:

/cherrypick release-7.5

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Dec 9, 2024
hawkingrei pushed a commit to ti-chi-bot/tidb that referenced this pull request Dec 12, 2024
ti-chi-bot bot pushed a commit that referenced this pull request Dec 13, 2024
@ti-chi-bot ti-chi-bot bot added the needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. label Jan 24, 2025
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-6.5: #59176.

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Jan 24, 2025
ti-chi-bot bot pushed a commit that referenced this pull request Feb 10, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. ok-to-test Indicates a PR is ready to be tested. release-note-none Denotes a PR that doesn't merit a release note. sig/planner SIG: Planner size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Query failed to execute in TiDB but succeeded in MySQL
6 participants