Skip to content

Commit 4c2edf3

Browse files
craig[bot]jbowens
andcommitted
Merge #148619
148619: go.mod: bump Pebble to 4a0664421082 r=RaduBerinde a=jbowens Changes: * [`4a066442`](cockroachdb/pebble@4a066442) db: add fallback behavior if ShortAttributeExtractor errors * [`ff44e8a5`](cockroachdb/pebble@ff44e8a5) pebble: clarify some multilevel compaction areas * [`268e3fa4`](cockroachdb/pebble@268e3fa4) pebble: extract growL0 into function * [`54bb06f3`](cockroachdb/pebble@54bb06f3) tool: separate blob mode flags * [`586965a1`](cockroachdb/pebble@586965a1) compressionanalyzer: don't analyze Zstd levels 5 and 7 * [`a2d5e412`](cockroachdb/pebble@a2d5e412) sstable: fix CopySpan filter block bug * [`c54cc1a1`](cockroachdb/pebble@c54cc1a1) sstable: include all filter blocks in Reader.Layout * [`7058aad5`](cockroachdb/pebble@7058aad5) block: support different setting for value blocks * [`0d44add7`](cockroachdb/pebble@0d44add7) compression: add Compressor.Algorithm() convenience method * [`08c01fe5`](cockroachdb/pebble@08c01fe5) db: improve file cache metrics, fix 32-bit platform adjustment Release note: none. Epic: none. Co-authored-by: Jackson Owens <[email protected]>
2 parents 561b230 + deab47e commit 4c2edf3

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

DEPS.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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 = "a7619dca2877f739868a0e62ec02537172589edafbbeeeb396e2b63aa04d2845",
1839+
strip_prefix = "github.com/cockroachdb/[email protected]20250620225651-4a0664421082",
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-20250620225651-4a0664421082.zip",
18421842
],
18431843
)
18441844
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-20250616174800-acc4f6d85f26.zip": "9829156559e966e2594026d1eb66db9f18b12129851da4f1a6784e994f1e6f7e",
360+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250620225651-4a0664421082.zip": "a7619dca2877f739868a0e62ec02537172589edafbbeeeb396e2b63aa04d2845",
361361
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.6.zip": "018eccb5fb9ca52d43ec9eaf213539d01c1f2b94e0e822406ebfb2e9321ef6cf",
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",

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/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55
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-20250616174800-acc4f6d85f26
142+
github.com/cockroachdb/pebble v0.0.0-20250620225651-4a0664421082
143143
github.com/cockroachdb/redact v1.1.6
144144
github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
145145
github.com/cockroachdb/stress v0.0.0-20220803192808-1806698b1b7b

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -580,8 +580,8 @@ github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 h1:ASDL+UJcILM
580580
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506/go.mod h1:Mw7HqKr2kdtu6aYGn3tPmAftiP3QPX63LdK/zcariIo=
581581
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895 h1:XANOgPYtvELQ/h4IrmPAohXqe2pWA8Bwhejr3VQoZsA=
582582
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895/go.mod h1:aPd7gM9ov9M8v32Yy5NJrDyOcD8z642dqs+F0CeNXfA=
583-
github.com/cockroachdb/pebble v0.0.0-20250616174800-acc4f6d85f26 h1:eIkMAiqWpSbB2Ztf254Mi6m3dUWNX6SwRW8D5nBaCVU=
584-
github.com/cockroachdb/pebble v0.0.0-20250616174800-acc4f6d85f26/go.mod h1:cnPe7/4+ZaEoSSlr4P3QT2CBbd6fdnP+JQ6On5PEpoE=
583+
github.com/cockroachdb/pebble v0.0.0-20250620225651-4a0664421082 h1:oHPlpmKCv9MQ0mYNWCBdmvDH3dlHbxOh5xgaKFwSlvg=
584+
github.com/cockroachdb/pebble v0.0.0-20250620225651-4a0664421082/go.mod h1:cnPe7/4+ZaEoSSlr4P3QT2CBbd6fdnP+JQ6On5PEpoE=
585585
github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
586586
github.com/cockroachdb/redact v1.1.6 h1:zXJBwDZ84xJNlHl1rMyCojqyIxv+7YUpQiJLQ7n4314=
587587
github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=

0 commit comments

Comments
 (0)