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

sql: add ability set, edit, read tenant capabilities #95013

Merged
merged 1 commit into from
Jan 26, 2023
Merged

sql: add ability set, edit, read tenant capabilities #95013

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 docs/generated/sql/bnf/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ FILES = [
"opt_frame_clause",
"opt_locality",
"opt_persistence_temp_table",
"opt_show_tenant_options",
"opt_with_storage_parameter_list",
"pause_all_jobs_stmt",
"pause_job",
Expand Down Expand Up @@ -266,6 +267,8 @@ FILES = [
"table_clause",
"table_constraint",
"table_ref",
"tenant_capability",
"tenant_capability_list",
"transaction_stmt",
"truncate_stmt",
"unique_column_level",
Expand Down
2 changes: 2 additions & 0 deletions docs/generated/sql/bnf/opt_show_tenant_options.bnf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
opt_show_tenant_options ::=
'WITH' show_tenant_options
9 changes: 3 additions & 6 deletions docs/generated/sql/bnf/show_tenant_stmt.bnf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
show_tenant_stmt ::=
'SHOW' 'TENANTS'
| 'SHOW' 'TENANT_ALL' 'ALL'
| 'SHOW' 'TENANTS' 'WITH' 'REPLICATION' 'STATUS'
| 'SHOW' 'TENANT_ALL' 'ALL' 'WITH' 'REPLICATION' 'STATUS'
| 'SHOW' 'TENANT' tenant_spec
| 'SHOW' 'TENANT' tenant_spec 'WITH' 'REPLICATION' 'STATUS'
'SHOW' 'TENANTS' opt_show_tenant_options
| 'SHOW' 'TENANT_ALL' 'ALL' opt_show_tenant_options
| 'SHOW' 'TENANT' tenant_spec opt_show_tenant_options
17 changes: 11 additions & 6 deletions docs/generated/sql/bnf/stmt_block.bnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -917,12 +917,9 @@ show_tables_stmt ::=
| 'SHOW' 'TABLES' with_comment

show_tenant_stmt ::=
'SHOW' 'TENANTS'
| 'SHOW' 'TENANT_ALL' 'ALL'
| 'SHOW' 'TENANTS' 'WITH' 'REPLICATION' 'STATUS'
| 'SHOW' 'TENANT_ALL' 'ALL' 'WITH' 'REPLICATION' 'STATUS'
| 'SHOW' 'TENANT' tenant_spec
| 'SHOW' 'TENANT' tenant_spec 'WITH' 'REPLICATION' 'STATUS'
'SHOW' 'TENANTS' opt_show_tenant_options
| 'SHOW' 'TENANT_ALL' 'ALL' opt_show_tenant_options
| 'SHOW' 'TENANT' tenant_spec opt_show_tenant_options

show_trace_stmt ::=
'SHOW' opt_compact 'TRACE' 'FOR' 'SESSION'
Expand Down Expand Up @@ -1031,6 +1028,8 @@ unreserved_keyword ::=
| 'CALLED'
| 'CANCEL'
| 'CANCELQUERY'
| 'CAPABILITIES'
| 'CAPABILITY'
| 'CASCADE'
| 'CHANGEFEED'
| 'CLOSE'
Expand Down Expand Up @@ -1938,6 +1937,9 @@ statements_or_queries ::=
opt_show_ranges_options ::=
'WITH' show_ranges_options

opt_show_tenant_options ::=
'WITH' show_tenant_options

opt_compact ::=
'COMPACT'
|
Expand Down Expand Up @@ -2647,6 +2649,9 @@ targets_roles ::=
show_ranges_options ::=
( 'TABLES' | 'INDEXES' | 'DETAILS' | 'KEYS' | 'EXPLAIN' ) ( ( ',' 'TABLES' | ',' 'INDEXES' | ',' 'DETAILS' | ',' 'EXPLAIN' | ',' 'KEYS' ) )*

show_tenant_options ::=
( 'REPLICATION' 'STATUS' | 'CAPABILITIES' ) ( ( ',' 'REPLICATION' 'STATUS' | ',' 'CAPABILITIES' ) )*

partition ::=
'PARTITION' partition_name

Expand Down
3 changes: 3 additions & 0 deletions docs/generated/sql/bnf/tenant_capability.bnf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
tenant_capability ::=
var_name
| var_name to_or_eq var_value
2 changes: 2 additions & 0 deletions docs/generated/sql/bnf/tenant_capability_list.bnf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
tenant_capability_list ::=
tenant_capability ( ( ',' tenant_capability ) )*
43 changes: 43 additions & 0 deletions pkg/ccl/logictestccl/testdata/logic_test/tenant_capability
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# LogicTest: local

statement ok
SELECT crdb_internal.create_tenant(5, 'five')

statement error error parsing capability "not_a_capability": invalid capability
ALTER TENANT [5] GRANT CAPABILITY not_a_capability=true

statement error error parsing capability "can_admin_split": value must be bool
ALTER TENANT [5] GRANT CAPABILITY can_admin_split=1

statement error error parsing capability "not_a_capability": invalid capability
ALTER TENANT [5] REVOKE CAPABILITY not_a_capability

statement error error parsing capability "can_admin_split": revoke must not specify value
ALTER TENANT [5] REVOKE CAPABILITY can_admin_split=false

query ITTTT colnames
SHOW TENANT 'five' WITH CAPABILITIES
----
id name status capability_name capability_value
5 five ACTIVE can_admin_split false
5 five ACTIVE can_admin_unsplit false

statement ok
ALTER TENANT [5] GRANT CAPABILITY can_admin_split=true

query ITTTT colnames
SHOW TENANT 'five' WITH CAPABILITIES
----
id name status capability_name capability_value
5 five ACTIVE can_admin_split true
5 five ACTIVE can_admin_unsplit false

statement ok
ALTER TENANT [5] REVOKE CAPABILITY can_admin_split

query ITTTT colnames
SHOW TENANT 'five' WITH CAPABILITIES
----
id name status capability_name capability_value
5 five ACTIVE can_admin_split false
5 five ACTIVE can_admin_unsplit false
7 changes: 7 additions & 0 deletions pkg/ccl/logictestccl/tests/local/generated_test.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions pkg/gen/bnf.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ BNF_SRCS = [
"//docs/generated/sql/bnf:opt_frame_clause.bnf",
"//docs/generated/sql/bnf:opt_locality.bnf",
"//docs/generated/sql/bnf:opt_persistence_temp_table.bnf",
"//docs/generated/sql/bnf:opt_show_tenant_options.bnf",
"//docs/generated/sql/bnf:opt_with_storage_parameter_list.bnf",
"//docs/generated/sql/bnf:pause_all_jobs_stmt.bnf",
"//docs/generated/sql/bnf:pause_job.bnf",
Expand Down Expand Up @@ -266,6 +267,8 @@ BNF_SRCS = [
"//docs/generated/sql/bnf:table_clause.bnf",
"//docs/generated/sql/bnf:table_constraint.bnf",
"//docs/generated/sql/bnf:table_ref.bnf",
"//docs/generated/sql/bnf:tenant_capability.bnf",
"//docs/generated/sql/bnf:tenant_capability_list.bnf",
"//docs/generated/sql/bnf:transaction_stmt.bnf",
"//docs/generated/sql/bnf:truncate_stmt.bnf",
"//docs/generated/sql/bnf:unique_column_level.bnf",
Expand Down
3 changes: 3 additions & 0 deletions pkg/gen/diagrams.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ DIAGRAMS_SRCS = [
"//docs/generated/sql/bnf:opt_frame_clause.html",
"//docs/generated/sql/bnf:opt_locality.html",
"//docs/generated/sql/bnf:opt_persistence_temp_table.html",
"//docs/generated/sql/bnf:opt_show_tenant_options.html",
"//docs/generated/sql/bnf:opt_with_storage_parameter_list.html",
"//docs/generated/sql/bnf:pause.html",
"//docs/generated/sql/bnf:pause_all_jobs.html",
Expand Down Expand Up @@ -260,6 +261,8 @@ DIAGRAMS_SRCS = [
"//docs/generated/sql/bnf:table_clause.html",
"//docs/generated/sql/bnf:table_constraint.html",
"//docs/generated/sql/bnf:table_ref.html",
"//docs/generated/sql/bnf:tenant_capability.html",
"//docs/generated/sql/bnf:tenant_capability_list.html",
"//docs/generated/sql/bnf:transaction.html",
"//docs/generated/sql/bnf:truncate.html",
"//docs/generated/sql/bnf:unique_column_level.html",
Expand Down
3 changes: 3 additions & 0 deletions pkg/gen/docs.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ DOCS_SRCS = [
"//docs/generated/sql/bnf:opt_frame_clause.bnf",
"//docs/generated/sql/bnf:opt_locality.bnf",
"//docs/generated/sql/bnf:opt_persistence_temp_table.bnf",
"//docs/generated/sql/bnf:opt_show_tenant_options.bnf",
"//docs/generated/sql/bnf:opt_with_storage_parameter_list.bnf",
"//docs/generated/sql/bnf:pause_all_jobs_stmt.bnf",
"//docs/generated/sql/bnf:pause_job.bnf",
Expand Down Expand Up @@ -278,6 +279,8 @@ DOCS_SRCS = [
"//docs/generated/sql/bnf:table_clause.bnf",
"//docs/generated/sql/bnf:table_constraint.bnf",
"//docs/generated/sql/bnf:table_ref.bnf",
"//docs/generated/sql/bnf:tenant_capability.bnf",
"//docs/generated/sql/bnf:tenant_capability_list.bnf",
"//docs/generated/sql/bnf:transaction_stmt.bnf",
"//docs/generated/sql/bnf:truncate_stmt.bnf",
"//docs/generated/sql/bnf:unique_column_level.bnf",
Expand Down
1 change: 1 addition & 0 deletions pkg/sql/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@ go_library(
"telemetry_logging.go",
"temporary_schema.go",
"tenant_accessors.go",
"tenant_capability.go",
"tenant_creation.go",
"tenant_deletion.go",
"tenant_gc.go",
Expand Down
7 changes: 7 additions & 0 deletions pkg/sql/catalog/colinfo/result_columns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,13 @@ var TenantColumnsWithReplication = ResultColumns{
{Name: "cutover_time", Typ: types.Decimal},
}

// TenantColumnsWithCapabilities is appended to TenantColumns for
// SHOW TENANT ... WITH CAPABILITIES queries.
var TenantColumnsWithCapabilities = ResultColumns{
{Name: "capability_name", Typ: types.String},
{Name: "capability_value", Typ: types.String},
}

// RangesNoLeases is the schema for crdb_internal.ranges_no_leases.
var RangesNoLeases = ResultColumns{
{Name: "range_id", Typ: types.Int},
Expand Down
3 changes: 3 additions & 0 deletions pkg/sql/opaque.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,8 @@ func planOpaque(ctx context.Context, p *planner, stmt tree.Statement) (planNode,
return p.AlterTableOwner(ctx, n)
case *tree.AlterTableSetSchema:
return p.AlterTableSetSchema(ctx, n)
case *tree.AlterTenantCapability:
return p.AlterTenantCapability(ctx, n)
case *tree.AlterTenantSetClusterSetting:
return p.AlterTenantSetClusterSetting(ctx, n)
case *tree.AlterTenantRename:
Expand Down Expand Up @@ -312,6 +314,7 @@ func init() {
&tree.AlterTableLocality{},
&tree.AlterTableOwner{},
&tree.AlterTableSetSchema{},
&tree.AlterTenantCapability{},
&tree.AlterTenantRename{},
&tree.AlterTenantSetClusterSetting{},
&tree.AlterType{},
Expand Down
Loading