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

config: fix 'PessimisticTxn' config JSON key #10820

Merged
merged 3 commits into from
Jun 17, 2019
Merged

config: fix 'PessimisticTxn' config JSON key #10820

merged 3 commits into from
Jun 17, 2019

Conversation

lonng
Copy link
Contributor

@lonng lonng commented Jun 16, 2019

Signed-off-by: Lonng heng@lonng.org

What problem does this PR solve?

This PR fix 'PessimisticTxn' config JSON key

Signed-off-by: Lonng <heng@lonng.org>
@codecov
Copy link

codecov bot commented Jun 16, 2019

Codecov Report

Merging #10820 into master will increase coverage by 0.0011%.
The diff coverage is n/a.

@@               Coverage Diff                @@
##             master     #10820        +/-   ##
================================================
+ Coverage   80.2889%   80.2901%   +0.0011%     
================================================
  Files           417        417                
  Lines         88453      88453                
================================================
+ Hits          71018      71019         +1     
+ Misses        12231      12226         -5     
- Partials       5204       5208         +4

@codecov
Copy link

codecov bot commented Jun 16, 2019

Codecov Report

Merging #10820 into master will decrease coverage by 0.0101%.
The diff coverage is n/a.

@@               Coverage Diff                @@
##             master     #10820        +/-   ##
================================================
- Coverage   80.2878%   80.2776%   -0.0102%     
================================================
  Files           417        417                
  Lines         88453      88453                
================================================
- Hits          71017      71008         -9     
- Misses        12230      12238         +8     
- Partials       5206       5207         +1

@lonng
Copy link
Contributor Author

lonng commented Jun 17, 2019

@coocood PTAL

@lonng
Copy link
Contributor Author

lonng commented Jun 17, 2019

/run-all-tests

@@ -82,7 +82,7 @@ type Config struct {
Binlog Binlog `toml:"binlog" json:"binlog"`
CompatibleKillQuery bool `toml:"compatible-kill-query" json:"compatible-kill-query"`
Plugin Plugin `toml:"plugin" json:"plugin"`
PessimisticTxn PessimisticTxn `toml:"pessimistic-txn" json:"pessimistic_txn"`
PessimisticTxn PessimisticTxn `toml:"pessimistic-txn" json:"pessimistic-txn"`
Copy link
Contributor

Choose a reason for hiding this comment

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

Could we add test for it?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK, I will add some tests later.

@lonng
Copy link
Contributor Author

lonng commented Jun 17, 2019

/run-unit-test

@coocood
Copy link
Member

coocood commented Jun 17, 2019

LGTM

Copy link
Contributor

@winkyao winkyao left a comment

Choose a reason for hiding this comment

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

LGTM

@lonng lonng merged commit 71e8523 into pingcap:master Jun 17, 2019
@lonng lonng deleted the fix-config branch June 17, 2019 09:47
winkyao pushed a commit that referenced this pull request Jun 18, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants