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

*: fix pessimistic transaction and enable the test #10432

Merged
merged 2 commits into from
May 14, 2019

Conversation

coocood
Copy link
Member

@coocood coocood commented May 13, 2019

What problem does this PR solve?

Fix pessimistic transaction bug, enable the test.

What is changed and how it works?

  • move pessimistic test into its own test suite.
  • Define ErrWriteConflict in tikv package.
  • Define ErrConflict in mocktikv package.
  • Remove the [write conflict] mark.

Check List

Tests

  • Unit test

Code changes

  • Has exported variable/fields change

@coocood coocood requested review from jackysp and tiancaiamao and removed request for jackysp May 13, 2019 09:28
@codecov
Copy link

codecov bot commented May 13, 2019

Codecov Report

Merging #10432 into master will increase coverage by 0.2778%.
The diff coverage is 69.5652%.

@@               Coverage Diff                @@
##             master     #10432        +/-   ##
================================================
+ Coverage   77.0469%   77.3247%   +0.2778%     
================================================
  Files           412        412                
  Lines         86459      86354       -105     
================================================
+ Hits          66614      66773       +159     
+ Misses        14737      14469       -268     
- Partials       5108       5112         +4

@coocood
Copy link
Member Author

coocood commented May 13, 2019

/run-all-tests

@tiancaiamao
Copy link
Contributor

LGTM

@tiancaiamao tiancaiamao added the status/LGT1 Indicates that a PR has LGTM 1. label May 13, 2019
Copy link
Member

@jackysp jackysp left a comment

Choose a reason for hiding this comment

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

LGTM

@jackysp jackysp merged commit 118a88c into pingcap:master May 14, 2019
@coocood coocood deleted the run-pessimistic-test branch May 14, 2019 07:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
status/LGT1 Indicates that a PR has LGTM 1.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants