diff --git a/DEPS.bzl b/DEPS.bzl index 9226eff9d28c..c7803bd43bdd 100644 --- a/DEPS.bzl +++ b/DEPS.bzl @@ -1834,10 +1834,10 @@ def go_deps(): patches = [ "@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch", ], - sha256 = "0ffbfa9854e45c7fa775c37af3e80f439c078d28ffa348a6a2bdb9af4e10ad37", - strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20251102183433-951fae603dfe", + sha256 = "e0ee903c366abc160446c82a18d98cb1fc4d3c44bf21d2748844354fcc4c9424", + strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20251105164901-5c1580d5c101", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20251102183433-951fae603dfe.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20251105164901-5c1580d5c101.zip", ], ) go_repository( diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl index d56a83d93ca4..bf88a7a88274 100644 --- a/build/bazelutil/distdir_files.bzl +++ b/build/bazelutil/distdir_files.bzl @@ -352,7 +352,7 @@ DISTDIR_FILES = { "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-20241215232642-bb51bb14a506.zip": "920068af09e3846d9ebb4e4a7787ff1dd10f3989c5f940ad861b0f6a9f824f6e", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/metamorphic/com_github_cockroachdb_metamorphic-v0.0.0-20231108215700-4ba948b56895.zip": "28c8cf42192951b69378cf537be5a9a43f2aeb35542908cc4fe5f689505853ea", - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20251102183433-951fae603dfe.zip": "0ffbfa9854e45c7fa775c37af3e80f439c078d28ffa348a6a2bdb9af4e10ad37", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20251105164901-5c1580d5c101.zip": "e0ee903c366abc160446c82a18d98cb1fc4d3c44bf21d2748844354fcc4c9424", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.6.zip": "018eccb5fb9ca52d43ec9eaf213539d01c1f2b94e0e822406ebfb2e9321ef6cf", "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/stress/com_github_cockroachdb_stress-v0.0.0-20220803192808-1806698b1b7b.zip": "3fda531795c600daf25532a4f98be2a1335cd1e5e182c72789bca79f5f69fcc1", diff --git a/go.mod b/go.mod index 94c15759a2f5..0f25dc1b4601 100644 --- a/go.mod +++ b/go.mod @@ -137,7 +137,7 @@ require ( github.com/cockroachdb/errors v1.12.1-0.20251010171200-64801262cd6f github.com/cockroachdb/gostdlib v1.19.0 github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 - github.com/cockroachdb/pebble v0.0.0-20251102183433-951fae603dfe + github.com/cockroachdb/pebble v0.0.0-20251105164901-5c1580d5c101 github.com/cockroachdb/redact v1.1.6 github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb diff --git a/go.sum b/go.sum index 7779fb9f6512..0be2fb8c7033 100644 --- a/go.sum +++ b/go.sum @@ -572,8 +572,8 @@ github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 h1:ASDL+UJcILM github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506/go.mod h1:Mw7HqKr2kdtu6aYGn3tPmAftiP3QPX63LdK/zcariIo= github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895 h1:XANOgPYtvELQ/h4IrmPAohXqe2pWA8Bwhejr3VQoZsA= github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895/go.mod h1:aPd7gM9ov9M8v32Yy5NJrDyOcD8z642dqs+F0CeNXfA= -github.com/cockroachdb/pebble v0.0.0-20251102183433-951fae603dfe h1:HUrVJv2RUIT2L9Gl4STK1rS0AvlubDvHgreuc3f+Boc= -github.com/cockroachdb/pebble v0.0.0-20251102183433-951fae603dfe/go.mod h1:GflN9NRwberlF+gFRJd6r6jrUYdWR/QD+gtgtH0LRK8= +github.com/cockroachdb/pebble v0.0.0-20251105164901-5c1580d5c101 h1:k/gEqWA60iDwUdT3OgEIWirEUkI4ku/fxFfut7it6sg= +github.com/cockroachdb/pebble v0.0.0-20251105164901-5c1580d5c101/go.mod h1:VCfKgAYZuLVBLitd8boLrNa0oE3OsnRaQauWXvFQWKc= github.com/cockroachdb/redact v1.1.6 h1:zXJBwDZ84xJNlHl1rMyCojqyIxv+7YUpQiJLQ7n4314= github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd h1:KFOt5I9nEKZgCnOSmy8r4Oykh8BYQO8bFOTgHDS8YZA= diff --git a/pkg/storage/pebble.go b/pkg/storage/pebble.go index a01d8c538e13..fb5d219023e9 100644 --- a/pkg/storage/pebble.go +++ b/pkg/storage/pebble.go @@ -727,7 +727,6 @@ func spanPolicyFunc(startKey []byte) (policy pebble.SpanPolicy, endKey []byte, _ return policy, spanPolicyLockTableStartKey, nil } // Lock key. Disable value separation. - policy.DisableValueSeparationBySuffix = true policy.ValueStoragePolicy = pebble.ValueStorageLowReadLatency return policy, spanPolicyLockTableEndKey, nil } diff --git a/pkg/storage/pebble_test.go b/pkg/storage/pebble_test.go index 2d07611910d7..eed126f5fece 100644 --- a/pkg/storage/pebble_test.go +++ b/pkg/storage/pebble_test.go @@ -1888,9 +1888,8 @@ func TestPebbleSpanPolicyFunc(t *testing.T) { return k }(), wantPolicy: pebble.SpanPolicy{ - PreferFastCompression: true, - DisableValueSeparationBySuffix: true, - ValueStoragePolicy: pebble.ValueStorageLowReadLatency, + PreferFastCompression: true, + ValueStoragePolicy: pebble.ValueStorageLowReadLatency, }, wantEndKey: spanPolicyLockTableEndKey, },