Skip to content

sql: add contended tables, indexes, and keys views #66370

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

Merged
merged 1 commit into from
Jun 17, 2021
Merged

sql: add contended tables, indexes, and keys views #66370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions pkg/cli/zip_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ table_name NOT IN (
-- allowlisted tables that don't need to be in debug zip
'backward_dependencies',
'builtin_functions',
'cluster_contended_keys',
'cluster_contended_indexes',
'cluster_contended_tables',
'create_statements',
'create_type_statements',
'cross_db_references',
Expand Down
3 changes: 3 additions & 0 deletions pkg/sql/catalog/catconstants/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ const (
CrdbInternalBackwardDependenciesTableID
CrdbInternalBuildInfoTableID
CrdbInternalBuiltinFunctionsTableID
CrdbInternalClusterContendedIndexesViewID
CrdbInternalClusterContendedKeysViewID
CrdbInternalClusterContendedTablesViewID
CrdbInternalClusterContentionEventsTableID
CrdbInternalClusterDistSQLFlowsTableID
CrdbInternalClusterQueriesTableID
Expand Down
113 changes: 113 additions & 0 deletions pkg/sql/crdb_internal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ var crdbInternal = virtualSchema{
catconstants.CrdbInternalBackwardDependenciesTableID: crdbInternalBackwardDependenciesTable,
catconstants.CrdbInternalBuildInfoTableID: crdbInternalBuildInfoTable,
catconstants.CrdbInternalBuiltinFunctionsTableID: crdbInternalBuiltinFunctionsTable,
catconstants.CrdbInternalClusterContendedIndexesViewID: crdbInternalClusterContendedIndexesView,
catconstants.CrdbInternalClusterContendedKeysViewID: crdbInternalClusterContendedKeysView,
catconstants.CrdbInternalClusterContendedTablesViewID: crdbInternalClusterContendedTablesView,
catconstants.CrdbInternalClusterContentionEventsTableID: crdbInternalClusterContentionEventsTable,
catconstants.CrdbInternalClusterDistSQLFlowsTableID: crdbInternalClusterDistSQLFlowsTable,
catconstants.CrdbInternalClusterQueriesTableID: crdbInternalClusterQueriesTable,
Expand Down Expand Up @@ -1744,6 +1747,116 @@ func populateSessionsTable(
return nil
}

var crdbInternalClusterContendedTablesView = virtualSchemaView{
schema: `
CREATE VIEW crdb_internal.cluster_contended_tables (
database_name,
schema_name,
table_name,
num_contention_events
) AS
SELECT
database_name, schema_name, name, sum(num_contention_events)
FROM
(
SELECT
DISTINCT
database_name,
schema_name,
name,
index_id,
num_contention_events
FROM
crdb_internal.cluster_contention_events
JOIN crdb_internal.tables ON
crdb_internal.cluster_contention_events.table_id
= crdb_internal.tables.table_id
)
GROUP BY
database_name, schema_name, name
`,
resultColumns: colinfo.ResultColumns{
{Name: "database_name", Typ: types.String},
{Name: "schema_name", Typ: types.String},
{Name: "table_name", Typ: types.String},
{Name: "num_contention_events", Typ: types.Int},
},
}

var crdbInternalClusterContendedIndexesView = virtualSchemaView{
schema: `
CREATE VIEW crdb_internal.cluster_contended_indexes (
database_name,
schema_name,
table_name,
index_name,
num_contention_events
) AS
SELECT
DISTINCT
database_name,
schema_name,
name,
index_name,
num_contention_events
FROM
crdb_internal.cluster_contention_events,
crdb_internal.tables,
crdb_internal.table_indexes
WHERE
crdb_internal.cluster_contention_events.index_id
= crdb_internal.table_indexes.index_id
AND crdb_internal.cluster_contention_events.table_id
= crdb_internal.tables.table_id
`,
resultColumns: colinfo.ResultColumns{
{Name: "database_name", Typ: types.String},
{Name: "schema_name", Typ: types.String},
{Name: "table_name", Typ: types.String},
{Name: "index_name", Typ: types.String},
{Name: "num_contention_events", Typ: types.Int},
},
}

var crdbInternalClusterContendedKeysView = virtualSchemaView{
schema: `
CREATE VIEW crdb_internal.cluster_contended_keys (
database_name,
schema_name,
table_name,
index_name,
key,
num_contention_events
) AS
SELECT
database_name,
schema_name,
name,
index_name,
crdb_internal.pretty_key(key, 0),
sum(count)
FROM
crdb_internal.cluster_contention_events,
crdb_internal.tables,
crdb_internal.table_indexes
WHERE
crdb_internal.cluster_contention_events.index_id
= crdb_internal.table_indexes.index_id
AND crdb_internal.cluster_contention_events.table_id
= crdb_internal.tables.table_id
GROUP BY
database_name, schema_name, name, index_name, key
`,
resultColumns: colinfo.ResultColumns{
{Name: "database_name", Typ: types.String},
{Name: "schema_name", Typ: types.String},
{Name: "table_name", Typ: types.String},
{Name: "index_name", Typ: types.String},
{Name: "key", Typ: types.Bytes},
{Name: "num_contention_events", Typ: types.Int},
},
}

const contentionEventsSchemaPattern = `
CREATE TABLE crdb_internal.%s (
table_id INT,
Expand Down
3 changes: 3 additions & 0 deletions pkg/sql/logictest/testdata/logic_test/crdb_internal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ SHOW TABLES FROM crdb_internal
----
crdb_internal backward_dependencies table NULL NULL NULL
crdb_internal builtin_functions table NULL NULL NULL
crdb_internal cluster_contended_indexes view NULL NULL NULL
crdb_internal cluster_contended_keys view NULL NULL NULL
crdb_internal cluster_contended_tables view NULL NULL NULL
crdb_internal cluster_contention_events table NULL NULL NULL
crdb_internal cluster_database_privileges table NULL NULL NULL
crdb_internal cluster_distsql_flows table NULL NULL NULL
Expand Down
3 changes: 3 additions & 0 deletions pkg/sql/logictest/testdata/logic_test/crdb_internal_tenant
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ SHOW TABLES FROM crdb_internal
----
crdb_internal backward_dependencies table NULL NULL NULL
crdb_internal builtin_functions table NULL NULL NULL
crdb_internal cluster_contended_indexes view NULL NULL NULL
crdb_internal cluster_contended_keys view NULL NULL NULL
crdb_internal cluster_contended_tables view NULL NULL NULL
crdb_internal cluster_contention_events table NULL NULL NULL
crdb_internal cluster_database_privileges table NULL NULL NULL
crdb_internal cluster_distsql_flows table NULL NULL NULL
Expand Down
3 changes: 3 additions & 0 deletions pkg/sql/logictest/testdata/logic_test/create_statements
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ CREATE TABLE crdb_internal.builtin_functions (
category STRING NOT NULL,
details STRING NOT NULL
) {} {}
CREATE VIEW crdb_internal.cluster_contended_indexes (database_name, schema_name, table_name, index_name, num_contention_events) AS SELECT DISTINCT database_name, schema_name, name, index_name, num_contention_events FROM crdb_internal.cluster_contention_events, crdb_internal.tables, crdb_internal.table_indexes WHERE (crdb_internal.cluster_contention_events.index_id = crdb_internal.table_indexes.index_id) AND (crdb_internal.cluster_contention_events.table_id = crdb_internal.tables.table_id) CREATE VIEW crdb_internal.cluster_contended_indexes (database_name, schema_name, table_name, index_name, num_contention_events) AS SELECT DISTINCT database_name, schema_name, name, index_name, num_contention_events FROM crdb_internal.cluster_contention_events, crdb_internal.tables, crdb_internal.table_indexes WHERE (crdb_internal.cluster_contention_events.index_id = crdb_internal.table_indexes.index_id) AND (crdb_internal.cluster_contention_events.table_id = crdb_internal.tables.table_id) {} {}
CREATE VIEW crdb_internal.cluster_contended_keys (database_name, schema_name, table_name, index_name, key, num_contention_events) AS SELECT database_name, schema_name, name, index_name, crdb_internal.pretty_key(key, 0), sum(count) FROM crdb_internal.cluster_contention_events, crdb_internal.tables, crdb_internal.table_indexes WHERE (crdb_internal.cluster_contention_events.index_id = crdb_internal.table_indexes.index_id) AND (crdb_internal.cluster_contention_events.table_id = crdb_internal.tables.table_id) GROUP BY database_name, schema_name, name, index_name, key CREATE VIEW crdb_internal.cluster_contended_keys (database_name, schema_name, table_name, index_name, key, num_contention_events) AS SELECT database_name, schema_name, name, index_name, crdb_internal.pretty_key(key, 0), sum(count) FROM crdb_internal.cluster_contention_events, crdb_internal.tables, crdb_internal.table_indexes WHERE (crdb_internal.cluster_contention_events.index_id = crdb_internal.table_indexes.index_id) AND (crdb_internal.cluster_contention_events.table_id = crdb_internal.tables.table_id) GROUP BY database_name, schema_name, name, index_name, key {} {}
CREATE VIEW crdb_internal.cluster_contended_tables (database_name, schema_name, table_name, num_contention_events) AS SELECT database_name, schema_name, name, sum(num_contention_events) FROM (SELECT DISTINCT database_name, schema_name, name, index_id, num_contention_events FROM crdb_internal.cluster_contention_events JOIN crdb_internal.tables ON crdb_internal.cluster_contention_events.table_id = crdb_internal.tables.table_id) GROUP BY database_name, schema_name, name CREATE VIEW crdb_internal.cluster_contended_tables (database_name, schema_name, table_name, num_contention_events) AS SELECT database_name, schema_name, name, sum(num_contention_events) FROM (SELECT DISTINCT database_name, schema_name, name, index_id, num_contention_events FROM crdb_internal.cluster_contention_events JOIN crdb_internal.tables ON crdb_internal.cluster_contention_events.table_id = crdb_internal.tables.table_id) GROUP BY database_name, schema_name, name {} {}
CREATE TABLE crdb_internal.cluster_contention_events (
table_id INT8 NULL,
index_id INT8 NULL,
Expand Down
3 changes: 3 additions & 0 deletions pkg/sql/logictest/testdata/logic_test/grant_table
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ test crdb_internal NULL admin
test crdb_internal NULL root ALL
test crdb_internal backward_dependencies public SELECT
test crdb_internal builtin_functions public SELECT
test crdb_internal cluster_contended_indexes public SELECT
test crdb_internal cluster_contended_keys public SELECT
test crdb_internal cluster_contended_tables public SELECT
test crdb_internal cluster_contention_events public SELECT
test crdb_internal cluster_database_privileges public SELECT
test crdb_internal cluster_distsql_flows public SELECT
Expand Down
15 changes: 15 additions & 0 deletions pkg/sql/logictest/testdata/logic_test/information_schema
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,9 @@ select table_schema, table_name FROM information_schema.tables
----
crdb_internal backward_dependencies
crdb_internal builtin_functions
crdb_internal cluster_contended_indexes
crdb_internal cluster_contended_keys
crdb_internal cluster_contended_tables
crdb_internal cluster_contention_events
crdb_internal cluster_database_privileges
crdb_internal cluster_distsql_flows
Expand Down Expand Up @@ -487,6 +490,9 @@ SELECT table_name FROM "".information_schema.tables WHERE table_catalog = 'other
----
backward_dependencies
builtin_functions
cluster_contended_indexes
cluster_contended_keys
cluster_contended_tables
cluster_contention_events
cluster_database_privileges
cluster_distsql_flows
Expand Down Expand Up @@ -713,6 +719,9 @@ SELECT * FROM system.information_schema.tables
table_catalog table_schema table_name table_type is_insertable_into version
system crdb_internal backward_dependencies SYSTEM VIEW NO 1
system crdb_internal builtin_functions SYSTEM VIEW NO 1
system crdb_internal cluster_contended_indexes SYSTEM VIEW NO 1
system crdb_internal cluster_contended_keys SYSTEM VIEW NO 1
system crdb_internal cluster_contended_tables SYSTEM VIEW NO 1
system crdb_internal cluster_contention_events SYSTEM VIEW NO 1
system crdb_internal cluster_database_privileges SYSTEM VIEW NO 1
system crdb_internal cluster_distsql_flows SYSTEM VIEW NO 1
Expand Down Expand Up @@ -2022,6 +2031,9 @@ SELECT * FROM system.information_schema.table_privileges ORDER BY table_schema,
grantor grantee table_catalog table_schema table_name privilege_type is_grantable with_hierarchy
NULL public system crdb_internal backward_dependencies SELECT NULL YES
NULL public system crdb_internal builtin_functions SELECT NULL YES
NULL public system crdb_internal cluster_contended_indexes SELECT NULL YES
NULL public system crdb_internal cluster_contended_keys SELECT NULL YES
NULL public system crdb_internal cluster_contended_tables SELECT NULL YES
NULL public system crdb_internal cluster_contention_events SELECT NULL YES
NULL public system crdb_internal cluster_database_privileges SELECT NULL YES
NULL public system crdb_internal cluster_distsql_flows SELECT NULL YES
Expand Down Expand Up @@ -2470,6 +2482,9 @@ SELECT * FROM system.information_schema.role_table_grants
grantor grantee table_catalog table_schema table_name privilege_type is_grantable with_hierarchy
NULL public system crdb_internal backward_dependencies SELECT NULL YES
NULL public system crdb_internal builtin_functions SELECT NULL YES
NULL public system crdb_internal cluster_contended_indexes SELECT NULL YES
NULL public system crdb_internal cluster_contended_keys SELECT NULL YES
NULL public system crdb_internal cluster_contended_tables SELECT NULL YES
NULL public system crdb_internal cluster_contention_events SELECT NULL YES
NULL public system crdb_internal cluster_database_privileges SELECT NULL YES
NULL public system crdb_internal cluster_distsql_flows SELECT NULL YES
Expand Down
Loading