diff --git a/DEPS.bzl b/DEPS.bzl index f7b076a97edf..ab008d04cbc9 100644 --- a/DEPS.bzl +++ b/DEPS.bzl @@ -3880,10 +3880,10 @@ def go_deps(): patches = [ "@com_github_cockroachdb_cockroach//build/patches:com_github_gogo_protobuf.patch", ], - sha256 = "dcd238e23ee4363de82379741ef09b6583947fcd4d8d6a4616ce1516cc8945b3", - strip_prefix = "github.com/cockroachdb/gogoproto@v1.3.3-0.20241214030254-fb9ffcbc9553", + sha256 = "bf052c9a7f9e23fb3ec7e9f3b7201cfc264c18ed6da0d662952d276dbc339003", + strip_prefix = "github.com/cockroachdb/gogoproto@v1.3.3-0.20241216150617-2358cdb156a1", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gogoproto/com_github_cockroachdb_gogoproto-v1.3.3-0.20241214030254-fb9ffcbc9553.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gogoproto/com_github_cockroachdb_gogoproto-v1.3.3-0.20241216150617-2358cdb156a1.zip", ], ) go_repository( diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl index 4899e47a6278..570381d3e8ae 100644 --- a/build/bazelutil/distdir_files.bzl +++ b/build/bazelutil/distdir_files.bzl @@ -350,7 +350,7 @@ DISTDIR_FILES = { "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/datadriven/com_github_cockroachdb_datadriven-v1.0.3-0.20240530155848-7682d40af056.zip": "f4cb70fec2b2904a56bfbda6a6c8bf9ea1d568a5994ecdb825f770671119b63b", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/errors/com_github_cockroachdb_errors-v1.11.3.zip": "d11ed59d96afef2d1f0ce56892839c62ff5c0cbca8dff0aaefeaef7eb190e73c", "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/gogoproto/com_github_cockroachdb_gogoproto-v1.3.3-0.20241214030254-fb9ffcbc9553.zip": "dcd238e23ee4363de82379741ef09b6583947fcd4d8d6a4616ce1516cc8945b3", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gogoproto/com_github_cockroachdb_gogoproto-v1.3.3-0.20241216150617-2358cdb156a1.zip": "bf052c9a7f9e23fb3ec7e9f3b7201cfc264c18ed6da0d662952d276dbc339003", "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-20241205023844-89a8856d99be.zip": "ff8b3d36873cfff78669000d194cbaa96520549a62408c52b538380d953b99d7", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/metamorphic/com_github_cockroachdb_metamorphic-v0.0.0-20231108215700-4ba948b56895.zip": "28c8cf42192951b69378cf537be5a9a43f2aeb35542908cc4fe5f689505853ea", diff --git a/go.mod b/go.mod index 706078af39c2..60bb57b2adc3 100644 --- a/go.mod +++ b/go.mod @@ -483,4 +483,4 @@ replace github.com/docker/docker => github.com/moby/moby v24.0.6+incompatible replace golang.org/x/time => github.com/cockroachdb/x-time v0.3.1-0.20230525123634-71747adb5d5c -replace github.com/gogo/protobuf => github.com/cockroachdb/gogoproto v1.3.3-0.20241214030254-fb9ffcbc9553 +replace github.com/gogo/protobuf => github.com/cockroachdb/gogoproto v1.3.3-0.20241216150617-2358cdb156a1 diff --git a/go.sum b/go.sum index 5d023732195b..0135495104f2 100644 --- a/go.sum +++ b/go.sum @@ -536,8 +536,8 @@ github.com/cockroachdb/errors v1.11.3 h1:5bA+k2Y6r+oz/6Z/RFlNeVCesGARKuC6YymtcDr github.com/cockroachdb/errors v1.11.3/go.mod h1:m4UIW4CDjx+R5cybPsNrRbreomiFqt8o1h1wUVazSd8= github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55 h1:YqzBA7tf8Gv8Oz0BbBsPenqkyjiohS7EUIwi7p1QJCU= github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55/go.mod h1:QqVqNIiRhLqJXif5C9wbM4JydBhrAF2WDMxkv5xkyxQ= -github.com/cockroachdb/gogoproto v1.3.3-0.20241214030254-fb9ffcbc9553 h1:qVbAx/t2EU//lHyR4LCDgHoZStlYnUuBeMYejUo/ado= -github.com/cockroachdb/gogoproto v1.3.3-0.20241214030254-fb9ffcbc9553/go.mod h1:wIrkfXJOUk95vmhcdlmaou6FpqbEExZWBM7EAtKDvYg= +github.com/cockroachdb/gogoproto v1.3.3-0.20241216150617-2358cdb156a1 h1:heM4wOIqC8Q5OH6rVCo9WoYqRKp1IrJfeqt8KYo12vY= +github.com/cockroachdb/gogoproto v1.3.3-0.20241216150617-2358cdb156a1/go.mod h1:wIrkfXJOUk95vmhcdlmaou6FpqbEExZWBM7EAtKDvYg= github.com/cockroachdb/gostdlib v1.19.0 h1:cSISxkVnTlWhTkyple/T6NXzOi5659FkhxvUgZv+Eb0= github.com/cockroachdb/gostdlib v1.19.0/go.mod h1:+dqqpARXbE/gRDEhCak6dm0l14AaTymPZUKMfURjBtY= github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= diff --git a/pkg/kv/kvpb/api_test.go b/pkg/kv/kvpb/api_test.go index 2f6459280b80..a010873c7256 100644 --- a/pkg/kv/kvpb/api_test.go +++ b/pkg/kv/kvpb/api_test.go @@ -435,7 +435,7 @@ func TestRequestHeaderRoundTrip(t *testing.T) { func TestBatchRequestEmptySize(t *testing.T) { ba := &BatchRequest{} - require.Equal(t, 28, ba.Size()) + require.Equal(t, 22, ba.Size()) } func TestBatchResponseEmptySize(t *testing.T) { diff --git a/pkg/kv/kvserver/concurrency/testdata/lock_table/add_discovered b/pkg/kv/kvserver/concurrency/testdata/lock_table/add_discovered index bbc8f2f31afd..b14589187b20 100644 --- a/pkg/kv/kvserver/concurrency/testdata/lock_table/add_discovered +++ b/pkg/kv/kvserver/concurrency/testdata/lock_table/add_discovered @@ -75,7 +75,7 @@ num=1 # When uncontented=false one or more active waiters marks the lock as contented. query span=a,c ---- -num locks: 1, bytes returned: 85, resume reason: RESUME_UNKNOWN, resume span: +num locks: 1, bytes returned: 79, resume reason: RESUME_UNKNOWN, resume span: locks: range_id=3 key="a" holder= durability=Unreplicated duration=0s waiters: diff --git a/pkg/kv/kvserver/concurrency/testdata/lock_table/basic b/pkg/kv/kvserver/concurrency/testdata/lock_table/basic index d518382f4e5c..24b298dab172 100644 --- a/pkg/kv/kvserver/concurrency/testdata/lock_table/basic +++ b/pkg/kv/kvserver/concurrency/testdata/lock_table/basic @@ -702,7 +702,7 @@ topklocksbywaitduration: query ---- -num locks: 3, bytes returned: 288, resume reason: RESUME_UNKNOWN, resume span: +num locks: 3, bytes returned: 282, resume reason: RESUME_UNKNOWN, resume span: locks: range_id=3 key="a" holder=00000000-0000-0000-0000-000000000003 durability=Replicated duration=2.65s waiters: @@ -867,7 +867,7 @@ topklocksbywaitduration: query ---- -num locks: 3, bytes returned: 268, resume reason: RESUME_UNKNOWN, resume span: +num locks: 3, bytes returned: 258, resume reason: RESUME_UNKNOWN, resume span: locks: range_id=3 key="b" holder= durability=Unreplicated duration=0s waiters: diff --git a/pkg/kv/kvserver/concurrency/testdata/lock_table/dup_access b/pkg/kv/kvserver/concurrency/testdata/lock_table/dup_access index 3b061a61173f..9e5cd8d63bde 100644 --- a/pkg/kv/kvserver/concurrency/testdata/lock_table/dup_access +++ b/pkg/kv/kvserver/concurrency/testdata/lock_table/dup_access @@ -223,7 +223,7 @@ num=3 query span=a,d ---- -num locks: 1, bytes returned: 77, resume reason: RESUME_UNKNOWN, resume span: +num locks: 1, bytes returned: 73, resume reason: RESUME_UNKNOWN, resume span: locks: range_id=3 key="c" holder=00000000-0000-0000-0000-000000000001 durability=Unreplicated duration=0s waiters: diff --git a/pkg/kv/kvserver/concurrency/testdata/lock_table/query b/pkg/kv/kvserver/concurrency/testdata/lock_table/query index 01e80fcdf0e1..bc35cb834891 100644 --- a/pkg/kv/kvserver/concurrency/testdata/lock_table/query +++ b/pkg/kv/kvserver/concurrency/testdata/lock_table/query @@ -45,7 +45,7 @@ num locks: 0, bytes returned: 0, resume reason: RESUME_UNKNOWN, resume span: +num locks: 1, bytes returned: 39, resume reason: RESUME_UNKNOWN, resume span: locks: range_id=3 key="c" holder=00000000-0000-0000-0000-000000000001 durability=Unreplicated duration=0s @@ -82,14 +82,14 @@ num=3 query span=a,f max-locks=2 uncontended ---- -num locks: 2, bytes returned: 82, resume reason: RESUME_KEY_LIMIT, resume span: {e-f} +num locks: 2, bytes returned: 78, resume reason: RESUME_KEY_LIMIT, resume span: {e-f} locks: range_id=3 key="b" holder=00000000-0000-0000-0000-000000000001 durability=Unreplicated duration=0s range_id=3 key="c" holder=00000000-0000-0000-0000-000000000001 durability=Unreplicated duration=0s query span=a,f max-bytes=50 uncontended ---- -num locks: 1, bytes returned: 41, resume reason: RESUME_BYTE_LIMIT, resume span: {c-f} +num locks: 1, bytes returned: 39, resume reason: RESUME_BYTE_LIMIT, resume span: {c-f} locks: range_id=3 key="b" holder=00000000-0000-0000-0000-000000000001 durability=Unreplicated duration=0s @@ -97,7 +97,7 @@ num locks: 1, bytes returned: 41, resume reason: RESUME_BYTE_LIMIT, resume span: query span=a,f max-bytes=10 uncontended ---- -num locks: 1, bytes returned: 41, resume reason: RESUME_BYTE_LIMIT, resume span: {c-f} +num locks: 1, bytes returned: 39, resume reason: RESUME_BYTE_LIMIT, resume span: {c-f} locks: range_id=3 key="b" holder=00000000-0000-0000-0000-000000000001 durability=Unreplicated duration=0s @@ -238,13 +238,13 @@ num=4 query span=a,f uncontended max-bytes=50 ---- -num locks: 1, bytes returned: 41, resume reason: RESUME_BYTE_LIMIT, resume span: {b-f} +num locks: 1, bytes returned: 39, resume reason: RESUME_BYTE_LIMIT, resume span: {b-f} locks: range_id=3 key="a" holder=00000000-0000-0000-0000-000000000003 durability=Unreplicated duration=0s query span=a,f uncontended max-locks=2 uncontended ---- -num locks: 1, bytes returned: 41, resume reason: RESUME_KEY_LIMIT, resume span: {b-f} +num locks: 1, bytes returned: 39, resume reason: RESUME_KEY_LIMIT, resume span: {b-f} locks: range_id=3 key="a" holder=00000000-0000-0000-0000-000000000003 durability=Unreplicated duration=0s @@ -252,7 +252,7 @@ num locks: 1, bytes returned: 41, resume reason: RESUME_KEY_LIMIT, resume span: # Bumping max locks up to 3 should return all locks on key b. query span=a,f uncontended max-locks=3 uncontended ---- -num locks: 3, bytes returned: 123, resume reason: RESUME_KEY_LIMIT, resume span: {c-f} +num locks: 3, bytes returned: 117, resume reason: RESUME_KEY_LIMIT, resume span: {c-f} locks: range_id=3 key="a" holder=00000000-0000-0000-0000-000000000003 durability=Unreplicated duration=0s range_id=3 key="b" holder=00000000-0000-0000-0000-000000000003 durability=Unreplicated duration=0s @@ -262,7 +262,7 @@ num locks: 3, bytes returned: 123, resume reason: RESUME_KEY_LIMIT, resume span: # locks, which is 2) should return all locks even though it goes over the limit. query span=b,f uncontended max-locks=1 uncontended ---- -num locks: 2, bytes returned: 82, resume reason: RESUME_KEY_LIMIT, resume span: {c-f} +num locks: 2, bytes returned: 78, resume reason: RESUME_KEY_LIMIT, resume span: {c-f} locks: range_id=3 key="b" holder=00000000-0000-0000-0000-000000000003 durability=Unreplicated duration=0s range_id=3 key="b" holder=00000000-0000-0000-0000-000000000002 durability=Unreplicated duration=0s @@ -271,7 +271,7 @@ num locks: 2, bytes returned: 82, resume reason: RESUME_KEY_LIMIT, resume span: query span=b,f uncontended max-bytes=50 ---- -num locks: 2, bytes returned: 82, resume reason: RESUME_BYTE_LIMIT, resume span: {c-f} +num locks: 2, bytes returned: 78, resume reason: RESUME_BYTE_LIMIT, resume span: {c-f} locks: range_id=3 key="b" holder=00000000-0000-0000-0000-000000000003 durability=Unreplicated duration=0s range_id=3 key="b" holder=00000000-0000-0000-0000-000000000002 durability=Unreplicated duration=0s