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

support resolve specified lock keys (#10292) #11889

Merged
merged 5 commits into from Aug 27, 2019

Conversation

@zhangjinpeng1987
Copy link
Contributor

commented Aug 27, 2019

What problem does this PR solve?

Cherry-pick #10292

Check List

Tests

  • Unit test
Signed-off-by: zhangjinpeng1987 <zhangjinpeng@pingcap.com>
Signed-off-by: zhangjinpeng1987 <zhangjinpeng@pingcap.com>
Signed-off-by: zhangjinpeng1987 <zhangjinpeng@pingcap.com>
Signed-off-by: zhangjinpeng1987 <zhangjinpeng@pingcap.com>
Copy link
Contributor

left a comment

LGTM

@tiancaiamao

This comment has been minimized.

Copy link
Contributor

commented Aug 27, 2019

LGTM

@disksing

This comment has been minimized.

Copy link
Member

commented Aug 27, 2019

Need #11725 ?

@zhangjinpeng1987

This comment has been minimized.

Copy link
Contributor Author

commented Aug 27, 2019

Need #11725?

@disksing Currently i don't think so, one reason is the accurate number of keys is not necessary. The most important reason is #10292 has been tested for a long time, and it works well, but #11725 hasn't. Maybe we will cherry pick 11725 to 2.1 after it has tested for a long time.

@zz-jason zz-jason changed the title [2.1 cherry-pick] resolve specified keys support resolve specified lock keys (#10292) Aug 27, 2019
@sre-bot

This comment has been minimized.

Copy link

commented Aug 27, 2019

/run-all-tests

@sre-bot sre-bot merged commit 452dd0b into pingcap:release-2.1 Aug 27, 2019
14 checks passed
14 checks passed
ci/circleci Your tests passed on CircleCI!
Details
idc-jenkins-ci-tidb/build Jenkins job succeeded.
Details
idc-jenkins-ci-tidb/build_check_race Jenkins job succeeded.
Details
idc-jenkins-ci-tidb/check_dev Jenkins job succeeded.
Details
idc-jenkins-ci-tidb/check_dev_2 Jenkins job succeeded.
Details
idc-jenkins-ci-tidb/common-test job succeeded
Details
idc-jenkins-ci-tidb/integration-common-test Jenkins job succeeded.
Details
idc-jenkins-ci-tidb/integration-compatibility-test Jenkins job succeeded.
Details
idc-jenkins-ci-tidb/integration-ddl-test Jenkins job succeeded.
Details
idc-jenkins-ci-tidb/mybatis-test job succeeded
Details
idc-jenkins-ci-tidb/sqllogic-test-1 Jenkins job succeeded.
Details
idc-jenkins-ci-tidb/sqllogic-test-2 Jenkins job succeeded.
Details
idc-jenkins-ci-tidb/unit-test Jenkins job succeeded.
Details
license/cla Contributor License Agreement is signed.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants
You can’t perform that action at this time.