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 TiDB server panic when uses indexMerge with the virtual generated column (#17065) #17126

Merged
merged 4 commits into from
May 14, 2020

Conversation

sre-bot
Copy link
Contributor

@sre-bot sre-bot commented May 12, 2020

cherry-pick #17065 to release-4.0


What problem does this PR solve?

Issue Number: close #17045

Problem Summary:
Previously, we didn't consider index merge when implemented the virtual generated column.

What is changed and how it works?

  1. Expand column info for the virtual generated column.
  2. Resolved indices for PhysicalIndexMergeReader.

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Integration test

Side effects

Release note

  • Fix TiDB server panic when uses indexMerge with the virtual generated column.

Signed-off-by: sre-bot <sre-bot@pingcap.com>
@sre-bot sre-bot requested review from a team as code owners May 12, 2020 08:50
@sre-bot
Copy link
Contributor Author

sre-bot commented May 12, 2020

/run-all-tests

@ghost ghost requested review from wshwsh12, winoros and a team and removed request for a team May 12, 2020 08:50
@sre-bot sre-bot requested review from bb7133, Deardrops, lzmhhh123 and a team May 12, 2020 08:50
@sre-bot sre-bot added this to the 4.0.0-rc.2 milestone May 12, 2020
@wshwsh12 wshwsh12 removed their request for review May 12, 2020 08:52
Copy link
Contributor

@qw4990 qw4990 left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@winoros winoros left a comment

Choose a reason for hiding this comment

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

lgtm

@lzmhhh123 lzmhhh123 requested review from wjhuang2016 and removed request for wjhuang2016 and lzmhhh123 May 13, 2020 08:17
@zz-jason zz-jason added status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. labels May 14, 2020
@sre-bot
Copy link
Contributor Author

sre-bot commented May 14, 2020

Your auto merge job has been accepted, waiting for:

  • 17118
  • 17107
  • 16165
  • 17003

@zz-jason zz-jason removed the request for review from bb7133 May 14, 2020 05:14
@zz-jason zz-jason removed the request for review from Deardrops May 14, 2020 05:14
@sre-bot
Copy link
Contributor Author

sre-bot commented May 14, 2020

/run-all-tests

@sre-bot sre-bot merged commit 6339df7 into pingcap:release-4.0 May 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/expression status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/4.0-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants