Skip to content

Commit fcd9d58

Browse files
authored
Merge branch 'master' into ludo/rp-gc-update
2 parents a07a149 + 691f7a8 commit fcd9d58

File tree

1,658 files changed

+86860
-17992
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,658 files changed

+86860
-17992
lines changed

.github/CODEOWNERS

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
/pkg/sql/execinfrapb/processors_bulk_io.proto @cockroachdb/disaster-recovery
6363
/pkg/sql/execinfrapb/processors_changefeeds.proto @cockroachdb/cdc-prs
6464
/pkg/sql/execinfrapb/processors_ttl.proto @cockroachdb/sql-foundations
65+
/pkg/sql/execinfrapb/processors_inspect.proto @cockroachdb/sql-foundations
6566
/pkg/sql/exec_factory_util.go @cockroachdb/sql-queries-prs
6667
#!/pkg/sql/exec_log*.go @cockroachdb/sql-queries-noreview
6768
#!/pkg/sql/exec_util*.go @cockroachdb/sql-queries-noreview
@@ -105,6 +106,8 @@
105106
/pkg/sql/sessiondata/ @cockroachdb/sql-foundations
106107
/pkg/sql/tests/rsg_test.go @cockroachdb/sql-foundations
107108
/pkg/sql/ttl @cockroachdb/sql-foundations
109+
/pkg/sql/spanutils/ @cockroachdb/sql-foundations
110+
/pkg/sql/inspect/ @cockroachdb/sql-foundations
108111

109112
/pkg/sql/syntheticprivilege/ @cockroachdb/sql-foundations
110113
/pkg/sql/syntheticprivilegecache/ @cockroachdb/sql-foundations
@@ -409,8 +412,8 @@
409412
#!/pkg/ccl/sqlitelogictestccl/ @cockroachdb/sql-queries-noreview
410413
/pkg/ccl/multiregionccl/ @cockroachdb/sql-foundations
411414
/pkg/ccl/multitenantccl/ @cockroachdb/server-prs
412-
/pkg/ccl/multitenant/tenantcostclient/ @cockroachdb/sqlproxy-prs
413-
/pkg/ccl/multitenant/tenantcostserver/ @cockroachdb/sqlproxy-prs
415+
/pkg/ccl/multitenant/tenantcostclient/ @cockroachdb/sql-queries-prs
416+
/pkg/ccl/multitenant/tenantcostserver/ @cockroachdb/sql-queries-prs
414417
/pkg/ccl/oidcccl/ @cockroachdb/product-security
415418
/pkg/ccl/partitionccl/ @cockroachdb/sql-foundations
416419
/pkg/ccl/pgcryptoccl/ @cockroachdb/sql-foundations

.github/workflows/microbenchmarks-ci.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Microbenchmarks CI
22
on:
3-
pull_request_target:
3+
pull_request:
44
types: [ opened, reopened, synchronize ]
55
branches: [ master ]
66
concurrency:
@@ -91,7 +91,6 @@ jobs:
9191
env:
9292
BASE_SHA: ${{ needs.base.outputs.merge_base }}
9393
HEAD_SHA: ${{ env.HEAD }}
94-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9594
GITHUB_REPO: "cockroachdb/cockroach"
9695
GITHUB_PR_NUMBER: ${{ github.event.pull_request.number }}
9796
- name: Clean up

.github/workflows/update_releases.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ jobs:
3232
- "release-24.3"
3333
- "release-25.1"
3434
- "release-25.2"
35+
- "release-25.3"
3536
name: Update pkg/testutils/release/cockroach_releases.yaml on ${{ matrix.branch }}
3637
runs-on: ubuntu-latest
3738
steps:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,4 @@ pkg/testutils/serverutils/*_generated.go
6565

6666
.DS_Store
6767
.idea/
68+
.vscode/

AUTHORS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,7 @@ PJ Tatlow <[email protected]> pjtatlow <[email protected]>
421421
422422
423423
Poornima Malepati <[email protected]> Poornima <[email protected]>
424+
Pradyum Agarwal <[email protected]>
424425
Pransu Dash <[email protected]>
425426
Pritesh Lahoti <[email protected]>
426427
Rachael Harding <[email protected]>
@@ -479,6 +480,7 @@ Shawn Morel <[email protected]> <[email protected]> <strangemonad@squareup
479480
480481
481482
Shivam Saraf <[email protected]>
483+
Shriram Ravindranathan <[email protected]> <[email protected]>
482484
Shubham Dhama <[email protected]> shubhamdhama <[email protected]>
483485
484486
@@ -539,6 +541,7 @@ Wade Waldron <[email protected]>
539541
540542
wenyong-h <[email protected]>
541543
544+
542545
543546
544547

BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,5 +208,6 @@ nogo(
208208
"//pkg/testutils/lint/passes/returnerrcheck",
209209
"//pkg/testutils/lint/passes/shadow",
210210
"//pkg/testutils/lint/passes/unconvert",
211+
"//pkg/testutils/lint/passes/roachtest",
211212
],
212213
)

DEPS.bzl

Lines changed: 55 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1735,10 +1735,10 @@ def go_deps():
17351735
name = "com_github_cockroachdb_cockroach_go_v2",
17361736
build_file_proto_mode = "disable_global",
17371737
importpath = "github.com/cockroachdb/cockroach-go/v2",
1738-
sha256 = "028c29c79c2d373bca3ce9a475291285fdcb68a2f908190f738d5ce605edbd07",
1739-
strip_prefix = "github.com/cockroachdb/cockroach-go/v2@v2.3.7",
1738+
sha256 = "ba646db91152f3121a6812c7b74d12d8c0e126f7b4d3b927618b159692ceb424",
1739+
strip_prefix = "github.com/cockroachdb/cockroach-go/v2@v2.4.1",
17401740
urls = [
1741-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/cockroach-go/v2/com_github_cockroachdb_cockroach_go_v2-v2.3.7.zip",
1741+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/cockroach-go/v2/com_github_cockroachdb_cockroach_go_v2-v2.4.1.zip",
17421742
],
17431743
)
17441744
go_repository(
@@ -1755,10 +1755,10 @@ def go_deps():
17551755
name = "com_github_cockroachdb_crlib",
17561756
build_file_proto_mode = "disable_global",
17571757
importpath = "github.com/cockroachdb/crlib",
1758-
sha256 = "1afc910b4ff270de79eecb42ab7bd5e6404e6128666c6c55e96db9e27d28e69e",
1759-
strip_prefix = "github.com/cockroachdb/[email protected]20241205160938-4a90b184f49c",
1758+
sha256 = "47ee61f8b5cc8327e3b3b65a93dee277137e762a73650c2f0a75a24a37361114",
1759+
strip_prefix = "github.com/cockroachdb/[email protected]20250617202621-0794c595bbe6",
17601760
urls = [
1761-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/crlib/com_github_cockroachdb_crlib-v0.0.0-20241205160938-4a90b184f49c.zip",
1761+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/crlib/com_github_cockroachdb_crlib-v0.0.0-20250617202621-0794c595bbe6.zip",
17621762
],
17631763
)
17641764
go_repository(
@@ -1835,10 +1835,10 @@ def go_deps():
18351835
patches = [
18361836
"@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
18371837
],
1838-
sha256 = "9829156559e966e2594026d1eb66db9f18b12129851da4f1a6784e994f1e6f7e",
1839-
strip_prefix = "github.com/cockroachdb/[email protected]20250616174800-acc4f6d85f26",
1838+
sha256 = "d3a727e03593def35072caac3e097b4cbc58ebafc3f8dc7294f9acfb7c4d79c0",
1839+
strip_prefix = "github.com/cockroachdb/[email protected]20250708172732-a370be5e7e50",
18401840
urls = [
1841-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250616174800-acc4f6d85f26.zip",
1841+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250708172732-a370be5e7e50.zip",
18421842
],
18431843
)
18441844
go_repository(
@@ -1875,10 +1875,10 @@ def go_deps():
18751875
name = "com_github_cockroachdb_swiss",
18761876
build_file_proto_mode = "disable_global",
18771877
importpath = "github.com/cockroachdb/swiss",
1878-
sha256 = "b9968f20abf619de68e0276595d8a2ccc6fbfac924446af878805d19c31f6560",
1879-
strip_prefix = "github.com/cockroachdb/[email protected]20250304010804-34a2c6a59016",
1878+
sha256 = "e21566a2feb40f000ade8c9c6a0a9901908e3f3fc1ac3870df6f33c9bfb5d3e1",
1879+
strip_prefix = "github.com/cockroachdb/[email protected]20250624142022-d6e517c1d961",
18801880
urls = [
1881-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/swiss/com_github_cockroachdb_swiss-v0.0.0-20250304010804-34a2c6a59016.zip",
1881+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/swiss/com_github_cockroachdb_swiss-v0.0.0-20250624142022-d6e517c1d961.zip",
18821882
],
18831883
)
18841884
go_repository(
@@ -3796,10 +3796,10 @@ def go_deps():
37963796
name = "com_github_gofrs_flock",
37973797
build_file_proto_mode = "disable_global",
37983798
importpath = "github.com/gofrs/flock",
3799-
sha256 = "9ace5b0a05672937904fba1fcb86cb45e7f701e508faeb5f612e243340351dfa",
3800-
strip_prefix = "github.com/gofrs/flock@v0.8.1",
3799+
sha256 = "fe8242a48c3109148d988433301bd8ab3cd1d0430a21af07e601f9b0671923e8",
3800+
strip_prefix = "github.com/gofrs/flock@v0.12.1",
38013801
urls = [
3802-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/gofrs/flock/com_github_gofrs_flock-v0.8.1.zip",
3802+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/gofrs/flock/com_github_gofrs_flock-v0.12.1.zip",
38033803
],
38043804
)
38053805
go_repository(
@@ -5105,20 +5105,20 @@ def go_deps():
51055105
name = "com_github_jackc_pgservicefile",
51065106
build_file_proto_mode = "disable_global",
51075107
importpath = "github.com/jackc/pgservicefile",
5108-
sha256 = "1f8bdf75b2a0d750e56c2a94b1d1b0b5be4b29d6df056aebd997162c29bfd8ab",
5109-
strip_prefix = "github.com/jackc/[email protected]20221227161230-091c0ba34f0a",
5108+
sha256 = "c9e31c91aebf96eb246bd410d1849cc7666d955a1e20ca2eba1c30b4eb89335f",
5109+
strip_prefix = "github.com/jackc/[email protected]20240606120523-5a60cdf6a761",
51105110
urls = [
5111-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/jackc/pgservicefile/com_github_jackc_pgservicefile-v0.0.0-20221227161230-091c0ba34f0a.zip",
5111+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/jackc/pgservicefile/com_github_jackc_pgservicefile-v0.0.0-20240606120523-5a60cdf6a761.zip",
51125112
],
51135113
)
51145114
go_repository(
51155115
name = "com_github_jackc_pgtype",
51165116
build_file_proto_mode = "disable_global",
51175117
importpath = "github.com/jackc/pgtype",
5118-
sha256 = "3acb69a66e7e432c010d503425810620d04c304166c45083fa8a96feca13054d",
5119-
strip_prefix = "github.com/jackc/[email protected].1",
5118+
sha256 = "24eb1112e74a18ba22ef7b47f59808060ddef00b98c2ade780d81b283e40f676",
5119+
strip_prefix = "github.com/jackc/[email protected].3",
51205120
urls = [
5121-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/jackc/pgtype/com_github_jackc_pgtype-v1.14.1.zip",
5121+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/jackc/pgtype/com_github_jackc_pgtype-v1.14.3.zip",
51225122
],
51235123
)
51245124
go_repository(
@@ -5135,10 +5135,10 @@ def go_deps():
51355135
name = "com_github_jackc_pgx_v5",
51365136
build_file_proto_mode = "disable_global",
51375137
importpath = "github.com/jackc/pgx/v5",
5138-
sha256 = "221749d6187aaeeb14097a41f2510689eaf35245ef77d243a1f69dc23605d2a2",
5139-
strip_prefix = "github.com/jackc/pgx/v5@v5.5.5",
5138+
sha256 = "c4b5a22a3f3db2e764f5b4df65ad1b2550d4587b3640f73ab27b868136ef9018",
5139+
strip_prefix = "github.com/jackc/pgx/v5@v5.7.2",
51405140
urls = [
5141-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/jackc/pgx/v5/com_github_jackc_pgx_v5-v5.5.5.zip",
5141+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/jackc/pgx/v5/com_github_jackc_pgx_v5-v5.7.2.zip",
51425142
],
51435143
)
51445144
go_repository(
@@ -5155,10 +5155,10 @@ def go_deps():
51555155
name = "com_github_jackc_puddle_v2",
51565156
build_file_proto_mode = "disable_global",
51575157
importpath = "github.com/jackc/puddle/v2",
5158-
sha256 = "6698895617fabb929fa1ac868ad5253e02a997888bf5c6004379c5b29eedee58",
5159-
strip_prefix = "github.com/jackc/puddle/[email protected].1",
5158+
sha256 = "f1f0789098a0bcb5ff3c7024f9ee387a6748446e1bc6713b13a63d763a9fb11e",
5159+
strip_prefix = "github.com/jackc/puddle/[email protected].2",
51605160
urls = [
5161-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/jackc/puddle/v2/com_github_jackc_puddle_v2-v2.2.1.zip",
5161+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/jackc/puddle/v2/com_github_jackc_puddle_v2-v2.2.2.zip",
51625162
],
51635163
)
51645164
go_repository(
@@ -5275,10 +5275,10 @@ def go_deps():
52755275
name = "com_github_jinzhu_now",
52765276
build_file_proto_mode = "disable_global",
52775277
importpath = "github.com/jinzhu/now",
5278-
sha256 = "245473b8e50be3897751ec66dd6be93588de261920e0345b500f692924575872",
5279-
strip_prefix = "github.com/jinzhu/[email protected].4",
5278+
sha256 = "1223dc55db616f156c1f1467adc2c88f786905df3cc3cb4fd5161badd654c62b",
5279+
strip_prefix = "github.com/jinzhu/[email protected].5",
52805280
urls = [
5281-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/jinzhu/now/com_github_jinzhu_now-v1.1.4.zip",
5281+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/jinzhu/now/com_github_jinzhu_now-v1.1.5.zip",
52825282
],
52835283
)
52845284
go_repository(
@@ -5305,10 +5305,10 @@ def go_deps():
53055305
name = "com_github_jmoiron_sqlx",
53065306
build_file_proto_mode = "disable_global",
53075307
importpath = "github.com/jmoiron/sqlx",
5308-
sha256 = "5900777a64016e4a5b3847126ef4bed4ed5d3543ed980ae8a79ab110c9da8fc6",
5309-
strip_prefix = "github.com/jmoiron/sqlx@v1.3.5",
5308+
sha256 = "992ac9b6a33b12bd8e411ce9c9699231f8ac8550812805660b7ee06676bdc3ad",
5309+
strip_prefix = "github.com/jmoiron/sqlx@v1.4.0",
53105310
urls = [
5311-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/jmoiron/sqlx/com_github_jmoiron_sqlx-v1.3.5.zip",
5311+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/jmoiron/sqlx/com_github_jmoiron_sqlx-v1.4.0.zip",
53125312
],
53135313
)
53145314
go_repository(
@@ -5929,10 +5929,10 @@ def go_deps():
59295929
name = "com_github_lib_pq",
59305930
build_file_proto_mode = "disable_global",
59315931
importpath = "github.com/lib/pq",
5932-
sha256 = "5d339f4296dcf650b4cec6b58e44988f8bbf7a4ca4bb9fff6e0421464efd7612",
5933-
strip_prefix = "github.com/lib/[email protected].7",
5932+
sha256 = "6791a7af67f846a86335350012c4efadd0850096ebf22350b7b20e01e216e6f2",
5933+
strip_prefix = "github.com/lib/[email protected].9",
59345934
urls = [
5935-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/lib/pq/com_github_lib_pq-v1.10.7.zip",
5935+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/lib/pq/com_github_lib_pq-v1.10.9.zip",
59365936
],
59375937
)
59385938
go_repository(
@@ -10002,6 +10002,16 @@ def go_deps():
1000210002
"https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/privatecatalog/com_google_cloud_go_privatecatalog-v0.8.0.zip",
1000310003
],
1000410004
)
10005+
go_repository(
10006+
name = "com_google_cloud_go_profiler",
10007+
build_file_proto_mode = "disable_global",
10008+
importpath = "cloud.google.com/go/profiler",
10009+
sha256 = "6026dcb7abd520ed3584a805333244b83673c28090d0e2208049178ddc757b4d",
10010+
strip_prefix = "cloud.google.com/go/[email protected]",
10011+
urls = [
10012+
"https://storage.googleapis.com/cockroach-godeps/gomod/cloud.google.com/go/profiler/com_google_cloud_go_profiler-v0.3.1.zip",
10013+
],
10014+
)
1000510015
go_repository(
1000610016
name = "com_google_cloud_go_pubsub",
1000710017
build_file_proto_mode = "disable_global",
@@ -10776,20 +10786,20 @@ def go_deps():
1077610786
name = "io_gorm_driver_postgres",
1077710787
build_file_proto_mode = "disable_global",
1077810788
importpath = "gorm.io/driver/postgres",
10779-
sha256 = "834b2c3a1ddf3fe5dc3b34614365205d9007d51f243b688b467dff9d44e9fc8c",
10780-
strip_prefix = "gorm.io/driver/postgres@v1.3.5",
10789+
sha256 = "a6ef6708ce8b1f48a06fa7624952eea6da525543b2769b4393dbedd075fe6435",
10790+
strip_prefix = "gorm.io/driver/postgres@v1.5.11",
1078110791
urls = [
10782-
"https://storage.googleapis.com/cockroach-godeps/gomod/gorm.io/driver/postgres/io_gorm_driver_postgres-v1.3.5.zip",
10792+
"https://storage.googleapis.com/cockroach-godeps/gomod/gorm.io/driver/postgres/io_gorm_driver_postgres-v1.5.11.zip",
1078310793
],
1078410794
)
1078510795
go_repository(
1078610796
name = "io_gorm_gorm",
1078710797
build_file_proto_mode = "disable_global",
1078810798
importpath = "gorm.io/gorm",
10789-
sha256 = "34219a6d2ac9b9c340f811e5863a98b150db6d1fd5b8f02777299863c1628e0f",
10790-
strip_prefix = "gorm.io/gorm@v1.23.5",
10799+
sha256 = "74f4fae208a8a5622612f6f3cadd01c8122074be1dd652017ddf4aa1f22c7351",
10800+
strip_prefix = "gorm.io/gorm@v1.25.12",
1079110801
urls = [
10792-
"https://storage.googleapis.com/cockroach-godeps/gomod/gorm.io/gorm/io_gorm_gorm-v1.23.5.zip",
10802+
"https://storage.googleapis.com/cockroach-godeps/gomod/gorm.io/gorm/io_gorm_gorm-v1.25.12.zip",
1079310803
],
1079410804
)
1079510805
go_repository(
@@ -11129,10 +11139,10 @@ def go_deps():
1112911139
name = "io_storj_drpc",
1113011140
build_file_proto_mode = "disable_global",
1113111141
importpath = "storj.io/drpc",
11132-
sha256 = "67a517d0a6c90586f265135ab60619a06a3be5b5c871c15093865716a6de5b39",
11133-
strip_prefix = "github.com/cockroachdb/[email protected]20250603054748-5b0c5d2c7b38",
11142+
sha256 = "612016b7a145f386a2163d788e3376cb0f63410b8423f2ef3f723f7aa24c1971",
11143+
strip_prefix = "github.com/cockroachdb/[email protected]20250618091105-e79a954a2193",
1113411144
urls = [
11135-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/drpc/com_github_cockroachdb_drpc-v0.0.0-20250603054748-5b0c5d2c7b38.zip",
11145+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/drpc/com_github_cockroachdb_drpc-v0.0.0-20250618091105-e79a954a2193.zip",
1113611146
],
1113711147
)
1113811148
go_repository(

TEAMS.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ cockroachdb/kv:
2929
'cockroachdb/kv-triage ': unittest
3030
cockroachdb/kv-prs: other
3131
label: T-kv
32+
cockroachdb/admission-control:
33+
label: T-kv,A-admission-control
3234
cockroachdb/spatial:
3335
label: T-spatial
3436
cockroachdb/dev-inf:
@@ -38,8 +40,6 @@ cockroachdb/drp-eng:
3840
cockroachdb/multiregion:
3941
label: T-multiregion
4042
cockroachdb/storage:
41-
aliases:
42-
cockroachdb/admission-control: other
4343
label: T-storage
4444
cockroachdb/test-eng:
4545
label: T-testeng

0 commit comments

Comments
 (0)