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-24.2: sql/types, sql/stats: fix SQLStringFullyQualified for arrays of UDTs #137954

Open
wants to merge 1 commit into
base: release-24.2
Choose a base branch
from

Conversation

michae2
Copy link
Collaborator

@michae2 michae2 commented Dec 23, 2024

Backport 1/1 commits from #137448.

/cc @cockroachdb/release


Starting in v24.2 we added SQLStringFullyQualified, but it looks like it didn't work for arrays of user-defined types. This is only used in a few places, including the output of SHOW STATISTICS USING JSON.

This commit:

  1. fixes SQLStringFullyQualified for arrays of UDTs
  2. adds the t.TypeMeta.Name == nil guard to SQLString for composite UDTs
  3. sets a formatting flag in stats.(*JSONStatistic).SetHistogram so that we get fully-qualified type annotations on histogram upper bounds

No release note because the output of SHOW STATISTICS USING JSON isn't documented.

Fixes: #137443

Release note: None


Release justification: quality-of-life fix for regression in SHOW STATISTICS which will help with ALTER TABLE INJECT STATISTICS.

@michae2 michae2 requested review from a team as code owners December 23, 2024 20:50
@michae2 michae2 requested review from dt and removed request for a team December 23, 2024 20:50
Copy link

blathers-crl bot commented Dec 23, 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. 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 Dec 23, 2024
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Collaborator

@rytaft rytaft left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 5 of 5 files at r1, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @dt, @mgartner, and @spilchen)

Starting in v24.2 we added `SQLStringFullyQualified`, but it looks like
it didn't work for arrays of user-defined types. This is only used in a
few places, including the output of `SHOW STATISTICS USING JSON`.

This commit:
1. fixes `SQLStringFullyQualified` for arrays of UDTs
2. adds the `t.TypeMeta.Name == nil` guard to `SQLString` for composite
   UDTs
3. sets a formatting flag in `stats.(*JSONStatistic).SetHistogram` so
   that we get fully-qualified type annotations on histogram upper
   bounds

No release note because the output of `SHOW STATISTICS USING JSON` isn't
documented.

Fixes: cockroachdb#137443

Release note: None
@michae2 michae2 force-pushed the backport24.2-137448 branch from b6be9de to 4c110f8 Compare December 23, 2024 22:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Label PR's that are backports to older release branches
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants