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

sink: fix codec json encoding with non binary string (#2764) #2781

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #2764

What problem does this PR solve?

Close #2758

Note we still don't known in which scenario the column value is string instead of []byte, need more investigation.

What is changed and how it works?

The column value type of mysql.TypeString, mysql.TypeVarString, mysql.TypeVarchar could be either string or []byte, we should consider both of these two types when converting a row column value to json encoding.

Check List

Tests

  • Unit test
  • Integration test

Release note

Fix json encoding could panic when processing a string type value in some cases.

@ti-chi-bot
Copy link
Member Author

[REVIEW NOTIFICATION]

This pull request has not been approved.

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 submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/cherry-pick-not-approved size/M Denotes a PR that changes 30-99 lines, ignoring generated files. status/LGT2 Indicates that a PR has LGTM 2. type/bugfix This PR fixes a bug. type/cherry-pick-for-release-4.0 This PR is cherry-picked to release-4.0 from a source PR. labels Sep 9, 2021
@amyangfei amyangfei added this to the v4.0.15 milestone Sep 10, 2021
@amyangfei amyangfei added the release-blocker This issue blocks a release. Please solve it ASAP. label Sep 10, 2021
@nongfushanquan nongfushanquan added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Sep 10, 2021
@amyangfei
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

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

Commit hash: 28f5d9f

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 10, 2021
@codecov-commenter
Copy link

Codecov Report

Merging #2781 (28f5d9f) into release-4.0 (753073a) will increase coverage by 1.4653%.
The diff coverage is 58.8659%.

@@                 Coverage Diff                 @@
##           release-4.0      #2781        +/-   ##
===================================================
+ Coverage      53.7661%   55.2314%   +1.4652%     
===================================================
  Files              153        164        +11     
  Lines            15958      19746      +3788     
===================================================
+ Hits              8580      10906      +2326     
- Misses            6475       7805      +1330     
- Partials           903       1035       +132     

@ti-chi-bot ti-chi-bot merged commit c4e9321 into pingcap:release-4.0 Sep 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. release-blocker This issue blocks a release. Please solve it ASAP. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 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. type/bugfix This PR fixes a bug. type/cherry-pick-for-release-4.0 This PR is cherry-picked to release-4.0 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants