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: correct the usage of json.Unmarshal in job.DecodeArgs (#17857) #17887

Merged
merged 3 commits into from
Jun 17, 2020
Merged

ddl: correct the usage of json.Unmarshal in job.DecodeArgs (#17857) #17887

merged 3 commits into from
Jun 17, 2020

Conversation

sre-bot
Copy link
Contributor

@sre-bot sre-bot commented Jun 10, 2020

cherry-pick #17857 to release-3.0

What problem does this PR solve?

pingcap/parser#889

DDL relies on a wrong behavior of json.Unmarshal.

What is changed and how it works?

Update parser to pingcap/parser#890. Change some code in TiDB.

Check List

Tests

  • Manual test (add detailed scripts or steps below)
  • Run unit-tests with Go 1.15

Side effects

  • Performance regression
    • Consumes more CPU (for DDL)

Release note

  • Correct the usage of json.Unmarshal in job.DecodeArgs to be compatible with future Go versions。

@sre-bot
cherry pick pingcap#17857 to release-3.0
d48224a 
Signed-off-by: sre-bot <sre-bot@pingcap.com>
@sre-bot
Copy link
Contributor Author

sre-bot commented Jun 10, 2020

/run-all-tests

@sre-bot sre-bot mentioned this pull request Jun 10, 2020
Merged
@sre-bot sre-bot added this to the v3.0.16 milestone Jun 10, 2020
@github-actions github-actions bot added the sig/sql-infra SIG: SQL Infra label Jun 10, 2020
@bobotu
Copy link
Contributor

bobotu commented Jun 16, 2020

PTAL @jackysp @wjhuang2016 @kennytm @zimulala

jackysp
jackysp reviewed Jun 16, 2020
View reviewed changes
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

wjhuang2016
wjhuang2016 reviewed Jun 16, 2020
View reviewed changes
Copy link
Member

@wjhuang2016 wjhuang2016 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
Copy link
Member

jackysp commented Jun 17, 2020

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 17, 2020
@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot ti-srebot merged commit ce06781 into pingcap:release-3.0 Jun 17, 2020
bobotu added a commit to bobotu/tidb that referenced this pull request Dec 2, 2020
@sre-bot @bobotu
ddl: correct the usage of json.Unmarshal in job.DecodeArgs (pingcap#1…
7d31c5f 
…7857) (pingcap#17887)

* cherry pick pingcap#17857 to release-3.0

Signed-off-by: sre-bot <sre-bot@pingcap.com>

* resolve conflict

Co-authored-by: Zejun Li <lizejun@pingcap.com>
Co-authored-by: Zejun Li <me@bobotu.dev>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wjhuang2016 wjhuang2016 wjhuang2016 left review comments

@jackysp jackysp jackysp approved these changes

@kennytm kennytm Awaiting requested review from kennytm

Assignees

@bobotu bobotu

Labels
sig/sql-infra SIG: SQL Infra status/can-merge Indicates a PR has been approved by a committer. type/bugfix This PR fixes a bug. type/3.0-cherry-pick
Projects
None yet
Milestone
v3.0.16
Development

Successfully merging this pull request may close these issues.
5 participants
@sre-bot @bobotu @jackysp @ti-srebot @wjhuang2016