Skip to content

statistics: fix panic when using wrong globalStats.Indices key (#35424)#35543

Merged
ti-chi-bot merged 5 commits intopingcap:release-6.1from
ti-srebot:release-6.1-2a45f2102786
Nov 25, 2022
Merged

statistics: fix panic when using wrong globalStats.Indices key (#35424)#35543
ti-chi-bot merged 5 commits intopingcap:release-6.1from
ti-srebot:release-6.1-2a45f2102786

Conversation

@ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Jun 20, 2022 •
edited
Loading

cherry-pick #35424 to release-6.1
You can switch your code base to this Pull Request by using git-extras:

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/35543

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/tidb.git pr/35543:release-6.1-2a45f2102786

Signed-off-by: lilinghai lilinghai@pingcap.com

What problem does this PR solve?

Issue Number: close #35421

Problem Summary:
Before the fix, The idx in the expressionfor idx := range tblInfo.Indices start from 0, and the expressionglobalStats.Indices[idx] will get nil. We should use model.IndexInfo.ID as the key to access the content of globalStats.Indices.

What is changed and how it works?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • 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.

None

@lilinghai @ti-srebot
cherry pick pingcap#35424 to release-6.1
8947f8c 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jun 20, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • chrysan
  • xuyifangreeneyes

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

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

Details

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-srebot
Copy link
Contributor Author

ti-srebot commented Jun 20, 2022

/run-all-tests

@ti-chi-bot ti-chi-bot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Jun 20, 2022
@ti-srebot ti-srebot mentioned this pull request Jun 20, 2022
Merged
12 tasks
@ti-srebot ti-srebot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/6.1-cherry-pick labels Jun 20, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Jun 20, 2022

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/8947f8c94eb7df004be982b071dbf5ff6d7ca14b

@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Nov 24, 2022
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 24, 2022
@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Nov 24, 2022
@VelocityLight VelocityLight added do-not-merge/cherry-pick-not-approved and removed cherry-pick-approved Cherry pick PR approved by release team. labels Nov 25, 2022
@chrysan
Copy link
Contributor

chrysan commented Nov 25, 2022

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Nov 25, 2022

This pull request has been accepted and is ready to merge.

DetailsCommit hash: 8947f8c

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 25, 2022
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Nov 25, 2022
@wuhuizuo
Copy link
Contributor

wuhuizuo commented Nov 25, 2022

/run-all-tests

@Ivy-YinSu
Copy link

Ivy-YinSu commented Nov 25, 2022

/run-all-tests

@Ivy-YinSu
Copy link

Ivy-YinSu commented Nov 25, 2022

/run-check_dev

1 similar comment
@Ivy-YinSu
Copy link

Ivy-YinSu commented Nov 25, 2022

/run-check_dev

@Ivy-YinSu
Copy link

Ivy-YinSu commented Nov 25, 2022

/run-check_dev
/run-unit-test

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Nov 25, 2022

@ti-srebot: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

Details

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 ti-chi-bot merged commit ed8dda9 into pingcap:release-6.1 Nov 25, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers

@chrysan chrysan chrysan approved these changes

@xuyifangreeneyes xuyifangreeneyes xuyifangreeneyes approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@lilinghai lilinghai

Labels

cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/6.1-cherry-pick

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@ti-srebot @ti-chi-bot @sre-bot @chrysan @wuhuizuo @Ivy-YinSu @xuyifangreeneyes @lilinghai @VelocityLight