Merge #111846 #111961 #112001 #112025 #112043 #112056

111846: backupccl: delete old-style split and scatter processor r=dt a=adityamaru This processor has not been used since 23.1, there is little value in keeping it around. We now have the generative split and scatter processor. Epic: none Release note: None 111961: sql: implement ALTER PROCEDURE r=mgartner a=mgartner #### sql/parser: parse ALTER PROCEDURE This commit updates the parser so that it can parse `ALTER PROCEDURE` statements. Release note: None #### sql/sem/tree: rename AlterFunction[Rename|SetSchema|SetOwner] This commit renames some structs to be more general: * `AlterFunctionRename` => `AlterRoutineRename` * `AlterFunctionSetSchema` => `AlterRoutineSetSchema` * `AlterFunctionSetOwner` => `AlterRoutineSetOwner` Release note: None #### sql: implement ALTER PROCEDURE...RENAME TO This commit implements the `ALTER PROCEDURE...RENAME TO` statement. Release note: None #### sql: implement ALTER PROCEDURE...SET SCHEMA This commit implements the `ALTER PROCEDURE...SET SCHEMA` statement. Release note: None #### sql: implement ALTER PROCEDURE...OWNER TO This commit implements the `ALTER PROCEDURE...OWNER TO` statement. Epic: CRDB-25388 Release note: None 112001: server: use tenant capability watcher in orchestrator r=knz a=stevendanna This changes over from polling to using the capability watcher to observe virtual cluster service mode changes. On the surface, it may seem like this make us less responsive since our poll interval was 1 seconds and by default we will only see an update every 3 seconds from the watcher. However, when we were using the polling approach, what was likely to happen is that the server would fail to start up until the tenant watcher caught up anyway, since the tenant server does a service-mode check using the capability watcher. Fixes #107827. Epic: CRDB-26691 Release note: None 112025: gcjob_test: fix logging in TestGCJobRetry r=rafiss a=andyyang890 This patch fixes the logging in `TestGCJobRetry` to handle NULL values being returned by a query. Fixes: #111839 Fixes: #111974 Fixes: #111990 Release note: None 112043: go.mod: bump Pebble to a678d0968383 r=RaduBerinde a=jbowens ``` a678d096 go.mod: revert change to require go 1.21 803507a7 go.mod: upgrade cockroachdb/errors to v1.11.1 d0ac26c3 metamorphic: use require.Equal in TestParserRandom 470a93d0 db: convert adjustedOutputLevel into a function ``` Epic: none Release note: none 112056: release: released CockroachDB version 23.2.0-alpha.2. Next version: 23.2.0-alpha.3 r=celiala a=cockroach-teamcity Release note: None Epic: None Release justification: non-production (release infra) change. Co-authored-by: adityamaru <[email protected]> Co-authored-by: Marcus Gartner <[email protected]> Co-authored-by: Steven Danna <[email protected]> Co-authored-by: Andy Yang <[email protected]> Co-authored-by: Jackson Owens <[email protected]> Co-authored-by: Justin Beaver <[email protected]>
cockroachdb · Oct 9, 2023 · 0a99ac2 · 0a99ac2
7 parents 69731b1 + a343158 + eb67d79 + 7d97d22 + 4a58cba + 859ebc4 + a220a3e
commit 0a99ac2
Show file tree

Hide file tree

Showing 48 changed files with 1,010 additions and 967 deletions.
diff --git a/DEPS.bzl b/DEPS.bzl
@@ -1599,10 +1599,10 @@ def go_deps():
         patches = [
             "@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
         ],
-        sha256 = "404de9ad4b96376ef9a99725c72377c49f9377327d197cc89fee4a4d57f61c88",
-        strip_prefix = "github.com/cockroachdb/[email protected]20231006155544-4280b457af56",
+        sha256 = "ad17adfa874889e8e1c43a3fe6c02ca1e4b6c67170ed37e2015e710aee5fdc7a",
+        strip_prefix = "github.com/cockroachdb/[email protected]20231009150004-a678d0968383",
         urls = [
-            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20231006155544-4280b457af56.zip",
+            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20231009150004-a678d0968383.zip",
         ],
     )
     go_repository(
@@ -1625,16 +1625,6 @@ def go_deps():
             "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/returncheck/com_github_cockroachdb_returncheck-v0.0.0-20200612231554-92cdbca611dd.zip",
         ],
     )
-    go_repository(
-        name = "com_github_cockroachdb_sentry_go",
-        build_file_proto_mode = "disable_global",
-        importpath = "github.com/cockroachdb/sentry-go",
-        sha256 = "fbb2207d02aecfdd411b1357efe1192dbb827959e36b7cab7491731ac55935c9",
-        strip_prefix = "github.com/cockroachdb/[email protected]",
-        urls = [
-            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/sentry-go/com_github_cockroachdb_sentry_go-v0.6.1-cockroachdb.2.zip",
-        ],
-    )
     go_repository(
         name = "com_github_cockroachdb_stress",
         build_file_proto_mode = "disable_global",

diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl
@@ -321,10 +321,9 @@ DISTDIR_FILES = {
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/go-test-teamcity/com_github_cockroachdb_go_test_teamcity-v0.0.0-20191211140407-cff980ad0a55.zip": "bac30148e525b79d004da84d16453ddd2d5cd20528e9187f1d7dac708335674b",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gostdlib/com_github_cockroachdb_gostdlib-v1.19.0.zip": "c4d516bcfe8c07b6fc09b8a9a07a95065b36c2855627cb3514e40c98f872b69e",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20230118201751-21c54148d20b.zip": "ca7776f47e5fecb4c495490a679036bfc29d95bd7625290cfdb9abb0baf97476",
-    "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20231006155544-4280b457af56.zip": "404de9ad4b96376ef9a99725c72377c49f9377327d197cc89fee4a4d57f61c88",
+    "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20231009150004-a678d0968383.zip": "ad17adfa874889e8e1c43a3fe6c02ca1e4b6c67170ed37e2015e710aee5fdc7a",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.5.zip": "11b30528eb0dafc8bc1a5ba39d81277c257cbe6946a7564402f588357c164560",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/returncheck/com_github_cockroachdb_returncheck-v0.0.0-20200612231554-92cdbca611dd.zip": "ce92ba4352deec995b1f2eecf16eba7f5d51f5aa245a1c362dfe24c83d31f82b",
-    "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/sentry-go/com_github_cockroachdb_sentry_go-v0.6.1-cockroachdb.2.zip": "fbb2207d02aecfdd411b1357efe1192dbb827959e36b7cab7491731ac55935c9",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/stress/com_github_cockroachdb_stress-v0.0.0-20220803192808-1806698b1b7b.zip": "3fda531795c600daf25532a4f98be2a1335cd1e5e182c72789bca79f5f69fcc1",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/tablewriter/com_github_cockroachdb_tablewriter-v0.0.5-0.20200105123400-bd15540e8847.zip": "79daf1c29ec50cdd8dd1ea33f8a814963646a45a2ebe22742d652579340ebde0",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/teamcity/com_github_cockroachdb_teamcity-v0.0.0-20180905144921-8ca25c33eb11.zip": "9df6b028c9fb5bff7bdad844bda504356945fd6d3cd583c50f68d8b8e85060f6",

diff --git a/docs/generated/sql/bnf/BUILD.bazel b/docs/generated/sql/bnf/BUILD.bazel
@@ -31,6 +31,10 @@ FILES = [
     "alter_func_owner_stmt",
     "alter_func_set_schema_stmt",
     "alter_func_dep_extension_stmt",
+    "alter_proc_stmt",
+    "alter_proc_rename_stmt",
+    "alter_proc_owner_stmt",
+    "alter_proc_set_schema_stmt",
     "alter_index_partition_by",
     "alter_index",
     "alter_index_visible_stmt",

diff --git a/docs/generated/sql/bnf/alter_ddl_stmt.bnf b/docs/generated/sql/bnf/alter_ddl_stmt.bnf
@@ -12,4 +12,5 @@ alter_ddl_stmt ::=
 	| alter_changefeed_stmt
 	| alter_backup_stmt
 	| alter_func_stmt
+	| alter_proc_stmt
 	| alter_backup_schedule
diff --git a/docs/generated/sql/bnf/alter_proc_owner_stmt.bnf b/docs/generated/sql/bnf/alter_proc_owner_stmt.bnf
@@ -0,0 +1,2 @@
+alter_proc_owner_stmt ::=
+	'ALTER' 'PROCEDURE' function_with_paramtypes 'OWNER' 'TO' role_spec
diff --git a/docs/generated/sql/bnf/alter_proc_rename_stmt.bnf b/docs/generated/sql/bnf/alter_proc_rename_stmt.bnf
@@ -0,0 +1,2 @@
+alter_proc_rename_stmt ::=
+	'ALTER' 'PROCEDURE' function_with_paramtypes 'RENAME' 'TO' name
diff --git a/docs/generated/sql/bnf/alter_proc_set_schema_stmt.bnf b/docs/generated/sql/bnf/alter_proc_set_schema_stmt.bnf
@@ -0,0 +1,2 @@
+alter_proc_set_schema_stmt ::=
+	'ALTER' 'PROCEDURE' function_with_paramtypes 'SET' 'SCHEMA' schema_name
diff --git a/docs/generated/sql/bnf/alter_proc_stmt.bnf b/docs/generated/sql/bnf/alter_proc_stmt.bnf
@@ -0,0 +1,4 @@
+alter_proc_stmt ::=
+	alter_proc_rename_stmt
+	| alter_proc_owner_stmt
+	| alter_proc_set_schema_stmt
diff --git a/docs/generated/sql/bnf/stmt_block.bnf b/docs/generated/sql/bnf/stmt_block.bnf
@@ -525,6 +525,7 @@ alter_ddl_stmt ::=
 	| alter_changefeed_stmt
 	| alter_backup_stmt
 	| alter_func_stmt
+	| alter_proc_stmt
 	| alter_backup_schedule
 
 alter_role_stmt ::=
@@ -1700,6 +1701,11 @@ alter_func_stmt ::=
 	| alter_func_set_schema_stmt
 	| alter_func_dep_extension_stmt
 
+alter_proc_stmt ::=
+	alter_proc_rename_stmt
+	| alter_proc_owner_stmt
+	| alter_proc_set_schema_stmt
+
 alter_backup_schedule ::=
 	'ALTER' 'BACKUP' 'SCHEDULE' iconst64 alter_backup_schedule_cmds
 
@@ -2323,6 +2329,15 @@ alter_func_set_schema_stmt ::=
 alter_func_dep_extension_stmt ::=
 	'ALTER' 'FUNCTION' function_with_paramtypes opt_no 'DEPENDS' 'ON' 'EXTENSION' name
 
+alter_proc_rename_stmt ::=
+	'ALTER' 'PROCEDURE' function_with_paramtypes 'RENAME' 'TO' name
+
+alter_proc_owner_stmt ::=
+	'ALTER' 'PROCEDURE' function_with_paramtypes 'OWNER' 'TO' role_spec
+
+alter_proc_set_schema_stmt ::=
+	'ALTER' 'PROCEDURE' function_with_paramtypes 'SET' 'SCHEMA' schema_name
+
 iconst64 ::=
 	'ICONST'
 

diff --git a/go.mod b/go.mod
@@ -113,7 +113,7 @@ require (
 	github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55
 	github.com/cockroachdb/gostdlib v1.19.0
 	github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b
-	github.com/cockroachdb/pebble v0.0.0-20231006155544-4280b457af56
+	github.com/cockroachdb/pebble v0.0.0-20231009150004-a678d0968383
 	github.com/cockroachdb/redact v1.1.5
 	github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
 	github.com/cockroachdb/stress v0.0.0-20220803192808-1806698b1b7b

diff --git a/go.sum b/go.sum
@@ -489,8 +489,8 @@ github.com/cockroachdb/gostdlib v1.19.0/go.mod h1:+dqqpARXbE/gRDEhCak6dm0l14AaTy
 github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
 github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE=
 github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
-github.com/cockroachdb/pebble v0.0.0-20231006155544-4280b457af56 h1:/3tRWdcJSclc0NCpcx+uM1oirgw7MeWm50WHiLpySdM=
-github.com/cockroachdb/pebble v0.0.0-20231006155544-4280b457af56/go.mod h1:YrXvx8gpG47XR+/7ejFIn7tADDpciHEec8+bWgiaUCY=
+github.com/cockroachdb/pebble v0.0.0-20231009150004-a678d0968383 h1:98LmGECk4ksnbvBVr0DgssnH0Mfwkd6+L6D/JHVd144=
+github.com/cockroachdb/pebble v0.0.0-20231009150004-a678d0968383/go.mod h1:sEHm5NOXxyiAoKWhoFxT8xMgd/f3RA6qUqQ1BXKrh2E=
 github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
 github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30=
 github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=

diff --git a/pkg/build/version.txt b/pkg/build/version.txt
@@ -1 +1 @@
-v23.2.0-alpha.2
+v23.2.0-alpha.3
diff --git a/pkg/ccl/backupccl/BUILD.bazel b/pkg/ccl/backupccl/BUILD.bazel
@@ -29,7 +29,6 @@ go_library(
         "schedule_exec.go",
         "schedule_pts_chaining.go",
         "show.go",
-        "split_and_scatter_processor.go",
         "system_schema.go",
         "targets.go",
         ":gen-targetscope-stringer",  # keep
@@ -196,7 +195,6 @@ go_test(
         "restore_span_covering_test.go",
         "schedule_pts_chaining_test.go",
         "show_test.go",
-        "split_and_scatter_processor_test.go",
         "system_schema_test.go",
         "tenant_backup_nemesis_test.go",
         "utils_test.go",
@@ -267,7 +265,6 @@ go_test(
         "//pkg/sql/catalog",
         "//pkg/sql/catalog/bootstrap",
         "//pkg/sql/catalog/catalogkeys",
-        "//pkg/sql/catalog/catenumpb",
         "//pkg/sql/catalog/dbdesc",
         "//pkg/sql/catalog/descbuilder",
         "//pkg/sql/catalog/descpb",
@@ -286,7 +283,6 @@ go_test(
         "//pkg/sql/pgwire/pgerror",
         "//pkg/sql/randgen",
         "//pkg/sql/rowenc",
-        "//pkg/sql/rowflow",
         "//pkg/sql/sem/eval",
         "//pkg/sql/sem/tree",
         "//pkg/sql/sessiondata",
@@ -295,7 +291,6 @@ go_test(
         "//pkg/storage",
         "//pkg/testutils",
         "//pkg/testutils/datapathutils",
-        "//pkg/testutils/distsqlutils",
         "//pkg/testutils/fingerprintutils",
         "//pkg/testutils/jobutils",
         "//pkg/testutils/kvclientutils",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		alter_proc_owner_stmt ::=
		'ALTER' 'PROCEDURE' function_with_paramtypes 'OWNER' 'TO' role_spec
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		alter_proc_rename_stmt ::=
		'ALTER' 'PROCEDURE' function_with_paramtypes 'RENAME' 'TO' name
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		alter_proc_set_schema_stmt ::=
		'ALTER' 'PROCEDURE' function_with_paramtypes 'SET' 'SCHEMA' schema_name