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

release-24.1: util/json,builtins: miscellaneous improvements around json objects #121510

Merged
merged 3 commits into from
Apr 2, 2024
Merged

release-24.1: util/json,builtins: miscellaneous improvements around json objects #121510

merged 3 commits into from
Apr 2, 2024

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Apr 1, 2024 •
edited by yuzefovich
Loading

Backport 3/3 commits from #121390 on behalf of @yuzefovich.

/cc @cockroachdb/release

Fixes: #121326.

Release note: None

Release justification: low-risk minor bug fix.

@yuzefovich
builtins: match postgres around json object building builtins in errors
f7d1181 
Release note: None
@yuzefovich
util/json: fix AreKeysSorted for json objects in some cases
0cfd100 
We incorrectly used `jsonString.String` method to populate the list of
keys whereas we should've used `string(jsonString)`. This is now fixed.
Note that it's not a big deal since this method is only used in
a test-only assertion.

Release note: None
@yuzefovich
util/json: remove AreKeysSorted from the interface
aea8ed7 
This method is only called on `jsonObject` in one spot, so we can inline
it and remove unused implementations.

Release note: None
@blathers-crl blathers-crl bot requested review from a team as code owners April 1, 2024 22:43
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-24.1-121390 branch from fa9daa7 to aea8ed7 Compare April 1, 2024 22:43
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Apr 1, 2024
@blathers-crl blathers[crl]
Copy link
Author

blathers-crl bot commented Apr 1, 2024

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Backports should only be created for serious
    issues     or test-only changes.
  • Backports should not break backwards-compatibility.
  • Backports should change as little code as possible.
  • Backports should not change on-disk formats or node communication protocols.
  • Backports should not add new functionality (except as defined
    here).
  • Backports must not add, edit, or otherwise modify cluster versions; or add version gates.
  • All backports must be reviewed by the owning areas TL and one additional
    TL. For more information as to how that review should be conducted, please consult the backport
    policy    .
If your backport adds new functionality, please ensure that the following additional criteria are satisfied:
  • There is a high priority need for the functionality that cannot wait until the next release and is difficult to address in another way.
  • The new functionality is additive-only and only runs for clusters which have specifically “opted in” to it (e.g. by a cluster setting).
  • New code is protected by a conditional check that is trivial to verify and ensures that it only runs for opt-in clusters. State changes must be further protected such that nodes running old binaries will not be negatively impacted by the new state (with a mixed version test added).
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.
  • Your backport must be accompanied by a post to the appropriate Slack
    channel (#db-backports-point-releases or #db-backports-XX-X-release) for awareness and discussion.

Also, please add a brief release justification to the body of your PR to justify this
backport.

@blathers-crl blathers-crl bot added the backport Label PR's that are backports to older release branches label Apr 1, 2024
@cockroach-teamcity
Copy link
Member

This change is Reviewable

yuzefovich
yuzefovich approved these changes Apr 2, 2024
View reviewed changes
Copy link
Member

@yuzefovich yuzefovich left a comment

Choose a reason for hiding this comment

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

Reviewed 5 of 5 files at r1, 2 of 2 files at r2, 2 of 2 files at r3, all commit messages.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @blathers-crl[bot])

@yuzefovich yuzefovich merged commit 2cbadb1 into release-24.1 Apr 2, 2024
5 of 6 checks passed
@yuzefovich yuzefovich deleted the blathers/backport-release-24.1-121390 branch April 2, 2024 00:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yuzefovich yuzefovich yuzefovich approved these changes

Assignees

@yuzefovich yuzefovich

Labels
backport Label PR's that are backports to older release branches blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@cockroach-teamcity @yuzefovich