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

executor: fix a logical error which is introduced in a previous refactor #11060

Merged
merged 5 commits into from Jul 4, 2019

Conversation

Projects
None yet
5 participants
@tiancaiamao
Copy link
Contributor

commented Jul 3, 2019

What problem does this PR solve?

Fix #11059

What is changed and how it works?

In the refactor of PR 11018, an if-else logic is reversed

Check List

Tests

  • Unit test
executor: fix a logical error which is introduced in a previous refactor
In the refactor of PR 11018, an if-else logic is reversed
@tiancaiamao

This comment has been minimized.

Copy link
Contributor Author

commented Jul 3, 2019

func (s *testSuite4) TestIssue11059(c *C) {
tk := testkit.NewTestKitWithInit(c, s.store)
tk.MustExec("create table t (pk int primary key, uk int unique, v int)")
tk.MustExec("insert into t values (2,11,215)")

This comment has been minimized.

Copy link
@jackysp

jackysp Jul 3, 2019

Member

Plz keep aligning.

This comment has been minimized.

Copy link
@tiancaiamao

tiancaiamao Jul 4, 2019

Author Contributor

Done

@codecov

This comment has been minimized.

Copy link

commented Jul 3, 2019

Codecov Report

Merging #11060 into master will increase coverage by 0.0176%.
The diff coverage is 100%.

@@               Coverage Diff               @@
##            master     #11060        +/-   ##
===============================================
+ Coverage   80.945%   80.9627%   +0.0176%     
===============================================
  Files          419        419                
  Lines        89326      89330         +4     
===============================================
+ Hits         72305      72324        +19     
+ Misses       11784      11769        -15     
  Partials      5237       5237
@imtbkcat

This comment has been minimized.

Copy link
Contributor

commented Jul 3, 2019

/run-all-tests tidb-test=pr/847

@lysu

This comment has been minimized.

Copy link
Member

commented Jul 3, 2019

/run-all-tests

@tiancaiamao

This comment has been minimized.

Copy link
Contributor Author

commented Jul 3, 2019

/run-all-tests

@tiancaiamao

This comment has been minimized.

Copy link
Contributor Author

commented Jul 3, 2019

Data race fixed in #11063
/run-unit-test

tiancaiamao added some commits Jul 4, 2019

@tiancaiamao

This comment has been minimized.

Copy link
Contributor Author

commented Jul 4, 2019

/run-all-tests

@tiancaiamao

This comment has been minimized.

Copy link
Contributor Author

commented Jul 4, 2019

CI is rather unstable currently, not caused by this PR

@lysu

This comment has been minimized.

Copy link
Member

commented Jul 4, 2019

LGTM

@tiancaiamao

This comment has been minimized.

Copy link
Contributor Author

commented Jul 4, 2019

/run-integration-common-test

@coocood

coocood approved these changes Jul 4, 2019

Copy link
Member

left a comment

LGTM

@coocood coocood merged commit ea6b865 into pingcap:master Jul 4, 2019

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

@tiancaiamao tiancaiamao deleted the tiancaiamao:fix-11059 branch Jul 4, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.