Skip to content

Commit

Permalink
sql: deflake TestLogic_crdb_internal_catalog
Browse files Browse the repository at this point in the history 
Fixes cockroachdb#93700

Epic: None

Release note: None
  • Loading branch information
@mgartner
mgartner committed Dec 19, 2022
1 parent a34ab92 commit 13679b0
Showing 1 changed file with 26 additions and 21 deletions.
47 changes: 26 additions & 21 deletions pkg/sql/logictest/testdata/logic_test/crdb_internal_catalog
View file
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,12 @@ SELECT * FROM "".crdb_internal.kv_catalog_zones
111 {"gc": {"ttlSeconds": 3600}, "inheritedConstraints": true, "inheritedLeasePreferences": true}

query TIIT
SELECT type, object_id, sub_id, to_json(btrim(comment)) FROM "".crdb_internal.kv_catalog_comments
SELECT
type,
object_id,
sub_id,
to_json(regexp_replace(btrim(comment), 'docs\/v\d+\.\d+\/', 'docs/dev/', 'g'))
FROM "".crdb_internal.kv_catalog_comments
----
DatabaseCommentType 104 0 "this is the test database"
TableCommentType 111 0 "this is a table"
Expand Down Expand Up @@ -671,7 +676,7 @@ TableCommentType 4294967128 0 "pg_amproc was created for compatibility a
TableCommentType 4294967129 0 "pg_amop was created for compatibility and is currently unimplemented"
TableCommentType 4294967130 0 "index access methods (incomplete)\nhttps://www.postgresql.org/docs/9.5/catalog-pg-am.html"
TableCommentType 4294967131 0 "aggregated built-in functions (incomplete)\nhttps://www.postgresql.org/docs/9.6/catalog-pg-aggregate.html"
TableCommentType 4294967133 0 "views (incomplete)\nhttps://www.cockroachlabs.com/docs/v23.1/information-schema.html#views\nhttps://www.postgresql.org/docs/9.5/infoschema-views.html"
TableCommentType 4294967133 0 "views (incomplete)\nhttps://www.cockroachlabs.com/docs/dev/information-schema.html#views\nhttps://www.postgresql.org/docs/9.5/infoschema-views.html"
TableCommentType 4294967134 0 "view_table_usage was created for compatibility and is currently unimplemented"
TableCommentType 4294967135 0 "view_routine_usage was created for compatibility and is currently unimplemented"
TableCommentType 4294967136 0 "view_column_usage was created for compatibility and is currently unimplemented"
Expand All @@ -682,25 +687,25 @@ TableCommentType 4294967140 0 "user_defined_types was created for compat
TableCommentType 4294967141 0 "user_attributes was created for compatibility and is currently unimplemented"
TableCommentType 4294967142 0 "usage_privileges was created for compatibility and is currently unimplemented"
TableCommentType 4294967143 0 "udt_privileges was created for compatibility and is currently unimplemented"
TableCommentType 4294967144 0 "type privileges (incomplete; may contain excess users or roles)\nhttps://www.cockroachlabs.com/docs/v23.1/information-schema.html#type_privileges"
TableCommentType 4294967144 0 "type privileges (incomplete; may contain excess users or roles)\nhttps://www.cockroachlabs.com/docs/dev/information-schema.html#type_privileges"
TableCommentType 4294967145 0 "triggers was created for compatibility and is currently unimplemented"
TableCommentType 4294967146 0 "triggered_update_columns was created for compatibility and is currently unimplemented"
TableCommentType 4294967147 0 "transforms was created for compatibility and is currently unimplemented"
TableCommentType 4294967148 0 "tablespaces was created for compatibility and is currently unimplemented"
TableCommentType 4294967149 0 "tablespaces_extensions was created for compatibility and is currently unimplemented"
TableCommentType 4294967150 0 "tables and views\nhttps://www.cockroachlabs.com/docs/v23.1/information-schema.html#tables\nhttps://www.postgresql.org/docs/9.5/infoschema-tables.html"
TableCommentType 4294967150 0 "tables and views\nhttps://www.cockroachlabs.com/docs/dev/information-schema.html#tables\nhttps://www.postgresql.org/docs/9.5/infoschema-tables.html"
TableCommentType 4294967151 0 "tables_extensions was created for compatibility and is currently unimplemented"
TableCommentType 4294967152 0 "privileges granted on table or views (incomplete; may contain excess users or roles)\nhttps://www.cockroachlabs.com/docs/v23.1/information-schema.html#table_privileges\nhttps://www.postgresql.org/docs/9.5/infoschema-table-privileges.html"
TableCommentType 4294967152 0 "privileges granted on table or views (incomplete; may contain excess users or roles)\nhttps://www.cockroachlabs.com/docs/dev/information-schema.html#table_privileges\nhttps://www.postgresql.org/docs/9.5/infoschema-table-privileges.html"
TableCommentType 4294967153 0 "table_constraints_extensions was created for compatibility and is currently unimplemented"
TableCommentType 4294967154 0 "table constraints\nhttps://www.cockroachlabs.com/docs/v23.1/information-schema.html#table_constraints\nhttps://www.postgresql.org/docs/9.5/infoschema-table-constraints.html"
TableCommentType 4294967155 0 "index metadata and statistics (incomplete)\nhttps://www.cockroachlabs.com/docs/v23.1/information-schema.html#statistics"
TableCommentType 4294967154 0 "table constraints\nhttps://www.cockroachlabs.com/docs/dev/information-schema.html#table_constraints\nhttps://www.postgresql.org/docs/9.5/infoschema-table-constraints.html"
TableCommentType 4294967155 0 "index metadata and statistics (incomplete)\nhttps://www.cockroachlabs.com/docs/dev/information-schema.html#statistics"
TableCommentType 4294967156 0 "st_units_of_measure was created for compatibility and is currently unimplemented"
TableCommentType 4294967157 0 "st_spatial_reference_systems was created for compatibility and is currently unimplemented"
TableCommentType 4294967158 0 "st_geometry_columns was created for compatibility and is currently unimplemented"
TableCommentType 4294967159 0 "exposes the session variables."
TableCommentType 4294967160 0 "sequences\nhttps://www.cockroachlabs.com/docs/v23.1/information-schema.html#sequences\nhttps://www.postgresql.org/docs/9.5/infoschema-sequences.html"
TableCommentType 4294967161 0 "schema privileges (incomplete; may contain excess users or roles)\nhttps://www.cockroachlabs.com/docs/v23.1/information-schema.html#schema_privileges"
TableCommentType 4294967162 0 "database schemas (may contain schemata without permission)\nhttps://www.cockroachlabs.com/docs/v23.1/information-schema.html#schemata\nhttps://www.postgresql.org/docs/9.5/infoschema-schemata.html"
TableCommentType 4294967160 0 "sequences\nhttps://www.cockroachlabs.com/docs/dev/information-schema.html#sequences\nhttps://www.postgresql.org/docs/9.5/infoschema-sequences.html"
TableCommentType 4294967161 0 "schema privileges (incomplete; may contain excess users or roles)\nhttps://www.cockroachlabs.com/docs/dev/information-schema.html#schema_privileges"
TableCommentType 4294967162 0 "database schemas (may contain schemata without permission)\nhttps://www.cockroachlabs.com/docs/dev/information-schema.html#schemata\nhttps://www.postgresql.org/docs/9.5/infoschema-schemata.html"
TableCommentType 4294967163 0 "schemata_extensions was created for compatibility and is currently unimplemented"
TableCommentType 4294967164 0 "sql_sizing was created for compatibility and is currently unimplemented"
TableCommentType 4294967165 0 "sql_parts was created for compatibility and is currently unimplemented"
Expand All @@ -710,19 +715,19 @@ TableCommentType 4294967168 0 "built-in functions (empty - introspection
TableCommentType 4294967169 0 "routine_privileges was created for compatibility and is currently unimplemented"
TableCommentType 4294967170 0 "role_usage_grants was created for compatibility and is currently unimplemented"
TableCommentType 4294967171 0 "role_udt_grants was created for compatibility and is currently unimplemented"
TableCommentType 4294967172 0 "privileges granted on table or views (incomplete; see also information_schema.table_privileges; may contain excess users or roles)\nhttps://www.cockroachlabs.com/docs/v23.1/information-schema.html#role_table_grants\nhttps://www.postgresql.org/docs/9.5/infoschema-role-table-grants.html"
TableCommentType 4294967172 0 "privileges granted on table or views (incomplete; see also information_schema.table_privileges; may contain excess users or roles)\nhttps://www.cockroachlabs.com/docs/dev/information-schema.html#role_table_grants\nhttps://www.postgresql.org/docs/9.5/infoschema-role-table-grants.html"
TableCommentType 4294967173 0 "privileges granted on functions (incomplete; only contains privileges of user-defined functions)"
TableCommentType 4294967174 0 "role_column_grants was created for compatibility and is currently unimplemented"
TableCommentType 4294967175 0 "resource_groups was created for compatibility and is currently unimplemented"
TableCommentType 4294967176 0 "foreign key constraints\nhttps://www.cockroachlabs.com/docs/v23.1/information-schema.html#referential_constraints\nhttps://www.postgresql.org/docs/9.5/infoschema-referential-constraints.html"
TableCommentType 4294967176 0 "foreign key constraints\nhttps://www.cockroachlabs.com/docs/dev/information-schema.html#referential_constraints\nhttps://www.postgresql.org/docs/9.5/infoschema-referential-constraints.html"
TableCommentType 4294967177 0 "profiling was created for compatibility and is currently unimplemented"
TableCommentType 4294967178 0 "processlist was created for compatibility and is currently unimplemented"
TableCommentType 4294967179 0 "plugins was created for compatibility and is currently unimplemented"
TableCommentType 4294967180 0 "partitions was created for compatibility and is currently unimplemented"
TableCommentType 4294967181 0 "built-in function parameters (empty - introspection not yet supported)\nhttps://www.postgresql.org/docs/9.5/infoschema-parameters.html"
TableCommentType 4294967182 0 "optimizer_trace was created for compatibility and is currently unimplemented"
TableCommentType 4294967183 0 "keywords was created for compatibility and is currently unimplemented"
TableCommentType 4294967184 0 "column usage by indexes and key constraints\nhttps://www.cockroachlabs.com/docs/v23.1/information-schema.html#key_column_usage\nhttps://www.postgresql.org/docs/9.5/infoschema-key-column-usage.html"
TableCommentType 4294967184 0 "column usage by indexes and key constraints\nhttps://www.cockroachlabs.com/docs/dev/information-schema.html#key_column_usage\nhttps://www.postgresql.org/docs/9.5/infoschema-key-column-usage.html"
TableCommentType 4294967185 0 "information_schema_catalog_name was created for compatibility and is currently unimplemented"
TableCommentType 4294967186 0 "foreign_tables was created for compatibility and is currently unimplemented"
TableCommentType 4294967187 0 "foreign_table_options was created for compatibility and is currently unimplemented"
Expand All @@ -733,30 +738,30 @@ TableCommentType 4294967191 0 "foreign_data_wrapper_options was created
TableCommentType 4294967192 0 "files was created for compatibility and is currently unimplemented"
TableCommentType 4294967193 0 "events was created for compatibility and is currently unimplemented"
TableCommentType 4294967194 0 "engines was created for compatibility and is currently unimplemented"
TableCommentType 4294967195 0 "roles for the current user\nhttps://www.cockroachlabs.com/docs/v23.1/information-schema.html#enabled_roles\nhttps://www.postgresql.org/docs/9.5/infoschema-enabled-roles.html"
TableCommentType 4294967195 0 "roles for the current user\nhttps://www.cockroachlabs.com/docs/dev/information-schema.html#enabled_roles\nhttps://www.postgresql.org/docs/9.5/infoschema-enabled-roles.html"
TableCommentType 4294967196 0 "element_types was created for compatibility and is currently unimplemented"
TableCommentType 4294967197 0 "domains was created for compatibility and is currently unimplemented"
TableCommentType 4294967198 0 "domain_udt_usage was created for compatibility and is currently unimplemented"
TableCommentType 4294967199 0 "domain_constraints was created for compatibility and is currently unimplemented"
TableCommentType 4294967200 0 "data_type_privileges was created for compatibility and is currently unimplemented"
TableCommentType 4294967201 0 "constraint_table_usage was created for compatibility and is currently unimplemented"
TableCommentType 4294967202 0 "columns usage by constraints\nhttps://www.postgresql.org/docs/9.5/infoschema-constraint-column-usage.html"
TableCommentType 4294967203 0 "table and view columns (incomplete)\nhttps://www.cockroachlabs.com/docs/v23.1/information-schema.html#columns\nhttps://www.postgresql.org/docs/9.5/infoschema-columns.html"
TableCommentType 4294967203 0 "table and view columns (incomplete)\nhttps://www.cockroachlabs.com/docs/dev/information-schema.html#columns\nhttps://www.postgresql.org/docs/9.5/infoschema-columns.html"
TableCommentType 4294967204 0 "columns_extensions was created for compatibility and is currently unimplemented"
TableCommentType 4294967205 0 "columns with user defined types\nhttps://www.cockroachlabs.com/docs/v23.1/information-schema.html#column_udt_usage\nhttps://www.postgresql.org/docs/current/infoschema-column-udt-usage.html"
TableCommentType 4294967205 0 "columns with user defined types\nhttps://www.cockroachlabs.com/docs/dev/information-schema.html#column_udt_usage\nhttps://www.postgresql.org/docs/current/infoschema-column-udt-usage.html"
TableCommentType 4294967206 0 "column_statistics was created for compatibility and is currently unimplemented"
TableCommentType 4294967207 0 "column privilege grants (incomplete)\nhttps://www.cockroachlabs.com/docs/v23.1/information-schema.html#column_privileges\nhttps://www.postgresql.org/docs/9.5/infoschema-column-privileges.html"
TableCommentType 4294967207 0 "column privilege grants (incomplete)\nhttps://www.cockroachlabs.com/docs/dev/information-schema.html#column_privileges\nhttps://www.postgresql.org/docs/9.5/infoschema-column-privileges.html"
TableCommentType 4294967208 0 "column_options was created for compatibility and is currently unimplemented"
TableCommentType 4294967209 0 "column_domain_usage was created for compatibility and is currently unimplemented"
TableCommentType 4294967210 0 "column_column_usage was created for compatibility and is currently unimplemented"
TableCommentType 4294967211 0 "shows the collations available in the current database\nhttps://www.postgresql.org/docs/current/infoschema-collations.html"
TableCommentType 4294967212 0 "identifies which character set the available collations are \napplicable to. As UTF-8 is the only available encoding this table does not\nprovide much useful information.\nhttps://www.postgresql.org/docs/current/infoschema-collation-character-set-applicab.html"
TableCommentType 4294967213 0 "check constraints\nhttps://www.cockroachlabs.com/docs/v23.1/information-schema.html#check_constraints\nhttps://www.postgresql.org/docs/9.5/infoschema-check-constraints.html"
TableCommentType 4294967213 0 "check constraints\nhttps://www.cockroachlabs.com/docs/dev/information-schema.html#check_constraints\nhttps://www.postgresql.org/docs/9.5/infoschema-check-constraints.html"
TableCommentType 4294967214 0 "check_constraint_routine_usage was created for compatibility and is currently unimplemented"
TableCommentType 4294967215 0 "character sets available in the current database\nhttps://www.cockroachlabs.com/docs/v23.1/information-schema.html#character_sets\nhttps://www.postgresql.org/docs/9.5/infoschema-character-sets.html"
TableCommentType 4294967215 0 "character sets available in the current database\nhttps://www.cockroachlabs.com/docs/dev/information-schema.html#character_sets\nhttps://www.postgresql.org/docs/9.5/infoschema-character-sets.html"
TableCommentType 4294967216 0 "attributes was created for compatibility and is currently unimplemented"
TableCommentType 4294967217 0 "roles available to the current user\nhttps://www.cockroachlabs.com/docs/v23.1/information-schema.html#applicable_roles\nhttps://www.postgresql.org/docs/9.5/infoschema-applicable-roles.html"
TableCommentType 4294967218 0 "roles for which the current user has admin option\nhttps://www.cockroachlabs.com/docs/v23.1/information-schema.html#administrable_role_authorizations\nhttps://www.postgresql.org/docs/9.5/infoschema-administrable-role-authorizations.html"
TableCommentType 4294967217 0 "roles available to the current user\nhttps://www.cockroachlabs.com/docs/dev/information-schema.html#applicable_roles\nhttps://www.postgresql.org/docs/9.5/infoschema-applicable-roles.html"
TableCommentType 4294967218 0 "roles for which the current user has admin option\nhttps://www.cockroachlabs.com/docs/dev/information-schema.html#administrable_role_authorizations\nhttps://www.postgresql.org/docs/9.5/infoschema-administrable-role-authorizations.html"
TableCommentType 4294967220 0 "list super regions of databases visible to the current user"
TableCommentType 4294967221 0 "which entries of pg_catalog are implemented in this version of CockroachDB"
TableCommentType 4294967223 0 "node-level table listing all currently running range feeds"
Expand Down

0 comments on commit 13679b0

Please sign in to comment.