Merge #40704

40704: sql: support wildcard in SHOW PARTITIONS FROM INDEX r=solongordon a=solongordon The SHOW PARTITIONS FROM INDEX command now supports the same `tbl@*` syntax which `ALTER PARTITION OF INDEX` does. It behaves identically to SHOW PARTITIONS FROM TABLE. Fixes #40382 Release note: None Co-authored-by: Solon Gordon <[email protected]>
cockroachdb · Sep 12, 2019 · 29cb9a6 · 29cb9a6
2 parents 5169da9 + 5b7a96e
commit 29cb9a6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/docs/generated/sql/bnf/stmt_block.bnf b/docs/generated/sql/bnf/stmt_block.bnf
@@ -493,6 +493,7 @@ show_partitions_stmt ::=
 	'SHOW' 'PARTITIONS' 'FROM' 'TABLE' table_name
 	| 'SHOW' 'PARTITIONS' 'FROM' 'DATABASE' database_name
 	| 'SHOW' 'PARTITIONS' 'FROM' 'INDEX' table_index_name
+	| 'SHOW' 'PARTITIONS' 'FROM' 'INDEX' table_name '@' '*'
 
 show_jobs_stmt ::=
 	'SHOW' 'AUTOMATIC' 'JOBS'

diff --git a/pkg/ccl/logictestccl/testdata/logic_test/distsql_partitioning b/pkg/ccl/logictestccl/testdata/logic_test/distsql_partitioning
@@ -110,6 +110,14 @@ test t3 p2 NULL x t3@primary  (2)  constraints = '[+dc=dc2]'
 test t3 p3 NULL y t3@sec      (3)  constraints = '[+dc=dc3]'
 test t3 p4 NULL y t3@sec      (4)  constraints = '[+dc=dc4]'
 
+query TTTTTTTT
+SHOW PARTITIONS FROM INDEX t3@*
+----
+test t3 p1 NULL x t3@primary  (1)  constraints = '[+dc=dc1]'
+test t3 p2 NULL x t3@primary  (2)  constraints = '[+dc=dc2]'
+test t3 p3 NULL y t3@sec      (3)  constraints = '[+dc=dc3]'
+test t3 p4 NULL y t3@sec      (4)  constraints = '[+dc=dc4]'
+
 query TTTTTTTT
 SHOW PARTITIONS FROM INDEX t3@sec
 ----

diff --git a/pkg/sql/parser/sql.y b/pkg/sql/parser/sql.y
@@ -3455,6 +3455,10 @@ show_partitions_stmt:
   {
     $$.val = &tree.ShowPartitions{IsIndex: true, Index: $5.tableIndexName()}
   }
+| SHOW PARTITIONS FROM INDEX table_name '@' '*'
+  {
+    $$.val = &tree.ShowPartitions{IsTable: true, Table: $5.unresolvedObjectName()}
+  }
 | SHOW PARTITIONS error // SHOW HELP: SHOW PARTITIONS
 
 // %Help: SHOW DATABASES - list databases