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-22.2: schema comment fixes #88263

Merged
merged 2 commits into from
Sep 20, 2022
Merged

release-22.2: schema comment fixes #88263

merged 2 commits into from
Sep 20, 2022

Conversation

knz
Copy link
Contributor

@knz knz commented Sep 20, 2022 •
edited
Loading

Backport:

Please see individual PRs for details.

/cc @cockroachdb/release

Release justification: bug fix

@knz
sql: use schema desc ID for OIDs in pg_catalog
9732057 
Prior to this patch, a synthetic OID was used for
"namespace" (schema) references in `pg_catalog`.

This was making it difficult/impossible to retrieve
schema comments using a non-`root` SQL query, e.g. via

```sql
SELECT nspname AS schema,
       substr(coalesce(pc.comment, sc.comment), e'[^\n]{0,40}') as description
  FROM pg_catalog.pg_namespace t
LEFT OUTER JOIN system.comments sc
    ON t.oid = sc.object_id AND sc.type = 4
LEFT OUTER JOIN crdb_internal.predefined_comments pc
    ON t.oid = pc.object_id AND pc.type = 4
```

This patch fixes it.

Release note: None
@knz
sql: add missing obj_description case
1553036 
Found with the following query:

```sql
COMMENT ON SCHEMA public IS 'hello';

SELECT obj_description(oid, 'pg_namespace')
FROM pg_namespace WHERE nspname = 'public';
```

Release note (sql change): The PostgreSQL compatibility
function `obj_description` now supports retrieving
comments on schemas.
@knz knz requested review from rafiss and a team September 20, 2022 17:15
@blathers-crl
Copy link

blathers-crl bot commented Sep 20, 2022 •
edited by knz
Loading

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Patches should only be created for serious issues or test-only changes.
  • Patches should not break backwards-compatibility.
  • Patches should change as little code as possible.
  • Patches should not change on-disk formats or node communication protocols.
  • Patches should not add new functionality.
  • Patches must not add, edit, or otherwise modify cluster versions; or add version gates.
If some of the basic criteria cannot be satisfied, ensure that the exceptional criteria are satisfied within.
  • 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.
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.

Add a brief release justification to the body of your PR to justify this backport.

Some other things to consider:

  • What did we do to ensure that a user that doesn’t know & care about this backport, has no idea that it happened?
  • Will this work in a cluster of mixed patch versions? Did we test that?
  • If a user upgrades a patch version, uses this feature, and then downgrades, what happens?

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@knz knz mentioned this pull request Sep 20, 2022
Closed
@knz knz merged commit ddaee60 into cockroachdb:release-22.2 Sep 20, 2022
@knz knz deleted the backport22.2-88009-88098 branch September 20, 2022 18:43
@cockroach-teamcity cockroach-teamcity mentioned this pull request Sep 20, 2022
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rafiss rafiss rafiss approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@knz @cockroach-teamcity @rafiss