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

[release-20.0] JSON Encoding: Use Type_RAW for marshalling json (#16637) #16682

Merged
merged 6 commits into from
Sep 4, 2024

Conversation

vitess-bot[bot]
Copy link
Contributor

@vitess-bot vitess-bot bot commented Aug 29, 2024

Description

This is a backport of #16637

Copy link
Contributor Author

vitess-bot bot commented Aug 29, 2024

Hello @rohit-nayak-ps, there are conflicts in this backport.

Please address them in order to merge this Pull Request. You can execute the snippet below to reset your branch and resolve the conflict manually.

Make sure you replace origin by the name of the vitessio/vitess remote

git fetch --all
gh pr checkout 16682 -R vitessio/vitess
git reset --hard origin/release-20.0
git cherry-pick -m 1 e89f684b09afbbe494db8d9394f7045a61d84e14

Copy link
Contributor Author

vitess-bot bot commented Aug 29, 2024

Review Checklist

Hello reviewers! 👋 Please follow this checklist when reviewing this Pull Request.

General

  • Ensure that the Pull Request has a descriptive title.
  • Ensure there is a link to an issue (except for internal cleanup and flaky test fixes), new features should have an RFC that documents use cases and test cases.

Tests

  • Bug fixes should have at least one unit or end-to-end test, enhancement and new features should have a sufficient number of tests.

Documentation

  • Apply the release notes (needs details) label if users need to know about this change.
  • New features should be documented.
  • There should be some code comments as to why things are implemented the way they are.
  • There should be a comment at the top of each new or modified test to explain what the test does.

New flags

  • Is this flag really necessary?
  • Flag names must be clear and intuitive, use dashes (-), and have a clear help text.

If a workflow is added or modified:

  • Each item in Jobs should be named in order to mark it as required.
  • If the workflow needs to be marked as required, the maintainer team must be notified.

Backward compatibility

  • Protobuf changes should be wire-compatible.
  • Changes to _vt tables and RPCs need to be backward compatible.
  • RPC changes should be compatible with vitess-operator
  • If a flag is removed, then it should also be removed from vitess-operator and arewefastyet, if used there.
  • vtctl command output order should be stable and awk-able.

Signed-off-by: Rohit Nayak <[email protected]>
@github-actions github-actions bot added this to the v20.0.2 milestone Aug 29, 2024
@rohit-nayak-ps rohit-nayak-ps removed Type: Bug Skip CI Skip CI actions from running Merge Conflict labels Aug 29, 2024
Signed-off-by: Rohit Nayak <[email protected]>
Signed-off-by: Rohit Nayak <[email protected]>
Signed-off-by: Rohit Nayak <[email protected]>
Copy link

codecov bot commented Aug 29, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 68.68%. Comparing base (ceab13d) to head (bd7311d).
Report is 3 commits behind head on release-20.0.

Additional details and impacted files
@@               Coverage Diff                @@
##           release-20.0   #16682      +/-   ##
================================================
+ Coverage         68.67%   68.68%   +0.01%     
================================================
  Files              1541     1541              
  Lines            197903   197944      +41     
================================================
+ Hits             135908   135964      +56     
+ Misses            61995    61980      -15     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@rohit-nayak-ps rohit-nayak-ps marked this pull request as ready for review September 4, 2024 11:08
@shlomi-noach shlomi-noach merged commit 1e3d45c into release-20.0 Sep 4, 2024
188 checks passed
@shlomi-noach shlomi-noach deleted the backport-16637-to-release-20.0 branch September 4, 2024 11:29
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.

3 participants