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.

Sign up for GitHub

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

Jump to bottom

ddl: fix err check #22988

Merged
merged 2 commits into from
Mar 3, 2021
Merged

ddl: fix err check #22988

merged 2 commits into from
Mar 3, 2021

Conversation

Tjianke
Copy link
Contributor

@Tjianke Tjianke commented Feb 28, 2021 •
edited
Loading

What problem does this PR solve?

Issue Number: #22979

Problem Summary:

What is changed and how it works?

What's Changed: added err check

Check List

Tests

  • Unit test
  • Integration test

Release note

  • No release note.

@ti-chi-bot ti-chi-bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Feb 28, 2021
@github-actions github-actions bot added the sig/sql-infra SIG: SQL Infra label Feb 28, 2021
@Tjianke Tjianke marked this pull request as ready for review February 28, 2021 02:30
@ti-chi-bot ti-chi-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 28, 2021
@bb7133
Copy link
Member

bb7133 commented Feb 28, 2021

/lgtm

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Feb 28, 2021
@bb7133
Copy link
Member

bb7133 commented Feb 28, 2021 •
edited
Loading

Hi @Tjianke , thanks for your contribution!

BTW, since this PR doesn't change any behavior of TiDB('nothing to release'), I've changed the release note to 'No release note'.

@bb7133
Copy link
Member

bb7133 commented Feb 28, 2021

PTAL @zimulala @xhebox

tangenta
tangenta reviewed Mar 1, 2021
View reviewed changes
ddl/db_change_test.go

_, err = s.se.Execute(context.Background(), "update t set c2='N' where c4 = 10")
c.Assert(err, IsNil)
result, err = s.execQuery(tk, "select c2 from t where c4 = 10")
c.Assert(err, IsNil)
expected = []string{"8 N", "10 N", "11 A"}
checkResult(result, testkit.Rows(expected...))
// fixed
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
// fixed

tangenta
tangenta reviewed Mar 1, 2021
View reviewed changes
ddl/db_change_test.go
@@ -1161,7 +1203,11 @@ func (s *testStateChangeSuite) TestParallelDropPrimaryKey(c *C) {
func (s *testStateChangeSuite) TestParallelCreateAndRename(c *C) {
sql1 := "create table t_exists(c int);"
sql2 := "alter table t rename to t_exists;"
defer s.se.Execute(context.Background(), "drop table t_exists")
defer func() {
// fixed
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
// fixed

tangenta
tangenta reviewed Mar 1, 2021
View reviewed changes
ddl/db_change_test.go

_, err = s.se.Execute(context.Background(), "drop database if exists t_part")
// fixed
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
// fixed

@tangenta
Copy link
Contributor

tangenta commented Mar 1, 2021

/lgtm

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • bb7133
  • tangenta

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Mar 1, 2021
@zimulala
Copy link
Contributor

zimulala commented Mar 3, 2021

@Tjianke Please fix the conflict.

@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 3, 2021
@ti-chi-bot ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 3, 2021
@xhebox
Copy link
Contributor

xhebox commented Mar 3, 2021

/merge

@ti-chi-bot
Copy link
Member

@xhebox: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 4e72be3

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 3, 2021
@Tjianke
Copy link
Contributor Author

Tjianke commented Mar 3, 2021

/run-mybatis-test

@Tjianke
Copy link
Contributor Author

Tjianke commented Mar 3, 2021

/run-sqllogic-test-1

@Tjianke
Copy link
Contributor Author

Tjianke commented Mar 3, 2021

/run-all-tests

@xhebox
Copy link
Contributor

xhebox commented Mar 3, 2021

/run-e2e-test

@ti-chi-bot ti-chi-bot merged commit cb94139 into pingcap:master Mar 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tangenta tangenta tangenta left review comments

Assignees
No one assigned
Labels
sig/sql-infra SIG: SQL Infra size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@Tjianke @bb7133 @tangenta @ti-chi-bot @zimulala @xhebox