Merge pull request #62619 from otan-cockroach/backport21.1-62490

release-21.1: delegate: order AZs in SHOW REGIONS commands
cockroachdb · Mar 25, 2021 · 7225cba · 7225cba
2 parents 2b37aea + 59ab49c
commit 7225cba
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/pkg/cli/interactive_tests/test_demo_global.tcl b/pkg/cli/interactive_tests/test_demo_global.tcl
@@ -13,6 +13,13 @@ spawn $argv demo --empty --nodes 9 --global
 # Ensure db is defaultdb.
 eexpect "defaultdb>"
 
+# Ensure regions display correctly.
+send "SELECT region, zones FROM \[SHOW REGIONS FROM CLUSTER\] ORDER BY region;\r"
+eexpect "  europe-west1 | {b,c,d}"
+eexpect "  us-east1     | {b,c,d}"
+eexpect "  us-west1     | {a,b,c}"
+eexpect "defaultdb>"
+
 interrupt
 eexpect eof
 end_test
diff --git a/pkg/sql/delegate/show_regions.go b/pkg/sql/delegate/show_regions.go
@@ -36,6 +36,7 @@ func (d *delegator) delegateShowRegions(n *tree.ShowRegions) (tree.Statement, er
 							'zone=([^,]*)'
 						)
 					)
+					ORDER BY locality
 				),
 				NULL
 			)
-Original file line number
+Diff line change
@@ Expand Up @@
     							'zone=([^,]*)'
     						)
     					)
+    					ORDER BY locality
     				),
     				NULL
     			)
@@ Expand Down @@