Skip to content

Commit 4e7fa94

Browse files
go.mod: bump Pebble to 06387e65044c (#170839)
go.mod: bump Pebble to 06387e65044c
2 parents 971ba39 + 03b4f7c commit 4e7fa94

6 files changed

Lines changed: 7 additions & 10 deletions

File tree

DEPS.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1854,10 +1854,10 @@ def go_deps():
18541854
patches = [
18551855
"@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
18561856
],
1857-
sha256 = "ee6f8438411df26caca1346092ae5213de080d4d65653415339a74cc612ec511",
1858-
strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20260521014523-dff839c359e5",
1857+
sha256 = "875e551c4e9139eaeb275eeb686d432d1d56a4964cc375f761acfe75d1362e02",
1858+
strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20260523000819-06387e65044c",
18591859
urls = [
1860-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20260521014523-dff839c359e5.zip",
1860+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20260523000819-06387e65044c.zip",
18611861
],
18621862
)
18631863
go_repository(

build/bazelutil/distdir_files.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ DISTDIR_FILES = {
357357
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gostdlib/com_github_cockroachdb_gostdlib-v1.19.0.zip": "c4d516bcfe8c07b6fc09b8a9a07a95065b36c2855627cb3514e40c98f872b69e",
358358
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20241215232642-bb51bb14a506.zip": "920068af09e3846d9ebb4e4a7787ff1dd10f3989c5f940ad861b0f6a9f824f6e",
359359
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/metamorphic/com_github_cockroachdb_metamorphic-v0.0.0-20231108215700-4ba948b56895.zip": "28c8cf42192951b69378cf537be5a9a43f2aeb35542908cc4fe5f689505853ea",
360-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20260521014523-dff839c359e5.zip": "ee6f8438411df26caca1346092ae5213de080d4d65653415339a74cc612ec511",
360+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20260523000819-06387e65044c.zip": "875e551c4e9139eaeb275eeb686d432d1d56a4964cc375f761acfe75d1362e02",
361361
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.8.zip": "833c2440ca5724533d053580c5fc818230106451edea959e5c334e7584b6d1a1",
362362
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/returncheck/com_github_cockroachdb_returncheck-v0.0.0-20200612231554-92cdbca611dd.zip": "ce92ba4352deec995b1f2eecf16eba7f5d51f5aa245a1c362dfe24c83d31f82b",
363363
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/stress/com_github_cockroachdb_stress-v0.0.0-20220803192808-1806698b1b7b.zip": "3fda531795c600daf25532a4f98be2a1335cd1e5e182c72789bca79f5f69fcc1",

build/patches/com_github_cockroachdb_pebble.patch

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ index a556ba52..db4fbfc1 100644
77
"cgo_off.go",
88
"cgo_on.go",
99
- "invariants_off.go",
10-
"iterv2_off.go",
1110
"race_off.go",
1211
"race_on.go",
1312
"slow_build_off.go",

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ require (
139139
github.com/cockroachdb/errors v1.12.1-0.20251010171200-64801262cd6f
140140
github.com/cockroachdb/gostdlib v1.19.0
141141
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506
142-
github.com/cockroachdb/pebble v0.0.0-20260521014523-dff839c359e5
142+
github.com/cockroachdb/pebble v0.0.0-20260523000819-06387e65044c
143143
github.com/cockroachdb/redact v1.1.8
144144
github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
145145
github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -587,8 +587,8 @@ github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 h1:ASDL+UJcILM
587587
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506/go.mod h1:Mw7HqKr2kdtu6aYGn3tPmAftiP3QPX63LdK/zcariIo=
588588
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895 h1:XANOgPYtvELQ/h4IrmPAohXqe2pWA8Bwhejr3VQoZsA=
589589
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895/go.mod h1:aPd7gM9ov9M8v32Yy5NJrDyOcD8z642dqs+F0CeNXfA=
590-
github.com/cockroachdb/pebble v0.0.0-20260521014523-dff839c359e5 h1:QBFnBJwJRJV6QCKV/0pbGjZshxz6DMdmW9DKcmBEh6I=
591-
github.com/cockroachdb/pebble v0.0.0-20260521014523-dff839c359e5/go.mod h1:ZDJqEfy0XjyRcqudiUC/FNs4lHlCnvbmOVD+YUJ8gBI=
590+
github.com/cockroachdb/pebble v0.0.0-20260523000819-06387e65044c h1:lksaGnwIX+JtwVSRMseIZgwSNmB2Mm5xght+zhxGeNw=
591+
github.com/cockroachdb/pebble v0.0.0-20260523000819-06387e65044c/go.mod h1:ZDJqEfy0XjyRcqudiUC/FNs4lHlCnvbmOVD+YUJ8gBI=
592592
github.com/cockroachdb/redact v1.1.8 h1:8eVLLj6juKxiKrAEw2b8cJvNqWq++U8WOfQFuL7KTaA=
593593
github.com/cockroachdb/redact v1.1.8/go.mod h1:GceHHpJ0rMDpYARL5In88Alq/xMBUtVlz7Qxix6ZVkw=
594594
github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd h1:KFOt5I9nEKZgCnOSmy8r4Oykh8BYQO8bFOTgHDS8YZA=

pkg/kv/kvserver/deleted_external_sstable_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -831,9 +831,7 @@ func TestGeneralOperationsWorkAsExpectedOnDeletedExternalSST(t *testing.T) {
831831
etc *externalSSTTestCluster,
832832
) {
833833
// Splits that operate on the deleted SSTable should fail.
834-
etc.requireNotFoundError(t, etc.splitHelper(ctx, roachpb.Key("d-15000")))
835834
etc.requireNotFoundError(t, etc.splitHelper(ctx, roachpb.Key("e-15000")))
836-
etc.requireNotFoundError(t, etc.splitHelper(ctx, roachpb.Key("f-15000")))
837835

838836
// Splits that don't operate on the deleted SSTable should
839837
// succeed.

0 commit comments

Comments
 (0)