Skip to content

Commit 4523f85

Browse files
committed
go.mod: bump Pebble to c70ddd4f9c9e
Changes: * [`c70ddd4f`](cockroachdb/pebble@c70ddd4f) db: test replica removal of snapshot sstable * [`c5327549`](cockroachdb/pebble@c5327549) manifest,record: disambiguate unexpected EOFs * [`57c482fb`](cockroachdb/pebble@57c482fb) db: run score-based compactions before manual compactions * [`7ed6738a`](cockroachdb/pebble@7ed6738a) go.mod: update axisds * [`a7c678d0`](cockroachdb/pebble@a7c678d0) db: avoid use of internal type in ValueSeparationPolicy * [`30569643`](cockroachdb/pebble@30569643) db: export FormatExperimentalValueSeparation * [`c25e82e6`](cockroachdb/pebble@c25e82e6) tool: add blob handle print mode to tools * [`6816ec8c`](cockroachdb/pebble@6816ec8c) manifest: rename AddedTablesByFileNum to AllAddedTables * [`e589e571`](cockroachdb/pebble@e589e571) base: introduce TableNum * [`b99c8d26`](cockroachdb/pebble@b99c8d26) db: add TestLargeKeys * [`aa0446ac`](cockroachdb/pebble@aa0446ac) objstorageprovider: support blob files * [`243d3baf`](cockroachdb/pebble@243d3baf) manifest: remove redundant smallest, largest bounds in TableMetadata * [`decdc6ff`](cockroachdb/pebble@decdc6ff) db: deflake TestCheckpoint * [`6e324c22`](cockroachdb/pebble@6e324c22) db: include blob files in checkpoints * [`0ef24272`](cockroachdb/pebble@0ef24272) db: fix TestCompaction/value_separation merge skew Release note: none. Epic: none.
1 parent 3f1bae1 commit 4523f85

File tree

4 files changed

+28
-14
lines changed

4 files changed

+28
-14
lines changed

DEPS.bzl

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1915,10 +1915,10 @@ def go_deps():
19151915
patches = [
19161916
"@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
19171917
],
1918-
sha256 = "177126dda72103d057a70dbe645a344506b9a0f4a88b2d3ace9f5880c3af05db",
1919-
strip_prefix = "github.com/cockroachdb/[email protected]20250417234720-091ed497241b",
1918+
sha256 = "8feaf8e2bf545b0e31247314d9b4f894b13e08aedc9bb425ae27966144e6c234",
1919+
strip_prefix = "github.com/cockroachdb/[email protected]20250423160643-c70ddd4f9c9e",
19201920
urls = [
1921-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250417234720-091ed497241b.zip",
1921+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250423160643-c70ddd4f9c9e.zip",
19221922
],
19231923
)
19241924
go_repository(
@@ -7986,10 +7986,10 @@ def go_deps():
79867986
name = "com_github_raduberinde_axisds",
79877987
build_file_proto_mode = "disable_global",
79887988
importpath = "github.com/RaduBerinde/axisds",
7989-
sha256 = "53a2821f7d7cc76e91278e457d5f58bc5a856c7968d4170435dac86f2d003a87",
7990-
strip_prefix = "github.com/RaduBerinde/[email protected]20250405232732-ecb85bedf677",
7989+
sha256 = "e943d3ac26630cf9e337483450ad9db7f43b6a0372a79d5a691aad8c3c92f9e3",
7990+
strip_prefix = "github.com/RaduBerinde/[email protected]20250419182453-5135a0650657",
79917991
urls = [
7992-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/RaduBerinde/axisds/com_github_raduberinde_axisds-v0.0.0-20250405232732-ecb85bedf677.zip",
7992+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/RaduBerinde/axisds/com_github_raduberinde_axisds-v0.0.0-20250419182453-5135a0650657.zip",
79937993
],
79947994
)
79957995
go_repository(
@@ -8002,6 +8002,16 @@ def go_deps():
80028002
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/RaduBerinde/btree/com_github_raduberinde_btree-v1.0.2-0.20250415192849-8beea01764ce.zip",
80038003
],
80048004
)
8005+
go_repository(
8006+
name = "com_github_raduberinde_btreemap",
8007+
build_file_proto_mode = "disable_global",
8008+
importpath = "github.com/RaduBerinde/btreemap",
8009+
sha256 = "81b6e0391c0bceadab0bc56184a7ed25dfe81daaa04916900f66b55f34590f6b",
8010+
strip_prefix = "github.com/RaduBerinde/[email protected]",
8011+
urls = [
8012+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/RaduBerinde/btreemap/com_github_raduberinde_btreemap-v0.0.0-20250419174037-3d62b7205d54.zip",
8013+
],
8014+
)
80058015
go_repository(
80068016
name = "com_github_rcrowley_go_metrics",
80078017
build_file_proto_mode = "disable_global",

build/bazelutil/distdir_files.bzl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,9 @@ DISTDIR_FILES = {
207207
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/PuerkitoBio/goquery/com_github_puerkitobio_goquery-v1.5.1.zip": "9d5bbc466dc4fac7ad872f69eeb9dcf6ddfd925821c4699226fbdeae117839a2",
208208
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/PuerkitoBio/purell/com_github_puerkitobio_purell-v1.1.1.zip": "59e636760d7f2ab41c2f80c1784b1c73d381d44888d1999228dedd634ddcf5ed",
209209
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/PuerkitoBio/urlesc/com_github_puerkitobio_urlesc-v0.0.0-20170810143723-de5bf2ad4578.zip": "1793124273dd94e7089e95716d40529bcf70b9e87162d60218f68dde4d6aeb9d",
210-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/RaduBerinde/axisds/com_github_raduberinde_axisds-v0.0.0-20250405232732-ecb85bedf677.zip": "53a2821f7d7cc76e91278e457d5f58bc5a856c7968d4170435dac86f2d003a87",
210+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/RaduBerinde/axisds/com_github_raduberinde_axisds-v0.0.0-20250419182453-5135a0650657.zip": "e943d3ac26630cf9e337483450ad9db7f43b6a0372a79d5a691aad8c3c92f9e3",
211211
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/RaduBerinde/btree/com_github_raduberinde_btree-v1.0.2-0.20250415192849-8beea01764ce.zip": "1c845dc6e77f27888fa66c8521df4d1d30f3ccf6892e8c1ba0aab4db24e717c1",
212+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/RaduBerinde/btreemap/com_github_raduberinde_btreemap-v0.0.0-20250419174037-3d62b7205d54.zip": "81b6e0391c0bceadab0bc56184a7ed25dfe81daaa04916900f66b55f34590f6b",
212213
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/SAP/go-hdb/com_github_sap_go_hdb-v0.14.1.zip": "273de28a254c39e9f24293b864c1d664488e4a5d44d535755a5e5b68ae7eed8d",
213214
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/Shopify/goreferrer/com_github_shopify_goreferrer-v0.0.0-20220729165902-8cddb4f5de06.zip": "280a2f55812e8b475cfd9d467a3b3d5859315788e68592a8fc5d6cedadc0503f",
214215
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/Shopify/logrus-bugsnag/com_github_shopify_logrus_bugsnag-v0.0.0-20171204204709-577dee27f20d.zip": "a4cc3fa4b7b493b36b96ea035caa7afcf7307b0c4efc5e523a46597e171b95ce",
@@ -365,7 +366,7 @@ DISTDIR_FILES = {
365366
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gostdlib/com_github_cockroachdb_gostdlib-v1.19.0.zip": "c4d516bcfe8c07b6fc09b8a9a07a95065b36c2855627cb3514e40c98f872b69e",
366367
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20241215232642-bb51bb14a506.zip": "920068af09e3846d9ebb4e4a7787ff1dd10f3989c5f940ad861b0f6a9f824f6e",
367368
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/metamorphic/com_github_cockroachdb_metamorphic-v0.0.0-20231108215700-4ba948b56895.zip": "28c8cf42192951b69378cf537be5a9a43f2aeb35542908cc4fe5f689505853ea",
368-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250417234720-091ed497241b.zip": "177126dda72103d057a70dbe645a344506b9a0f4a88b2d3ace9f5880c3af05db",
369+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250423160643-c70ddd4f9c9e.zip": "8feaf8e2bf545b0e31247314d9b4f894b13e08aedc9bb425ae27966144e6c234",
369370
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.6.zip": "018eccb5fb9ca52d43ec9eaf213539d01c1f2b94e0e822406ebfb2e9321ef6cf",
370371
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/returncheck/com_github_cockroachdb_returncheck-v0.0.0-20200612231554-92cdbca611dd.zip": "ce92ba4352deec995b1f2eecf16eba7f5d51f5aa245a1c362dfe24c83d31f82b",
371372
"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: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ require (
138138
github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55
139139
github.com/cockroachdb/gostdlib v1.19.0
140140
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506
141-
github.com/cockroachdb/pebble v0.0.0-20250417234720-091ed497241b
141+
github.com/cockroachdb/pebble v0.0.0-20250423160643-c70ddd4f9c9e
142142
github.com/cockroachdb/redact v1.1.6
143143
github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
144144
github.com/cockroachdb/stress v0.0.0-20220803192808-1806698b1b7b
@@ -289,7 +289,8 @@ require (
289289
github.com/Masterminds/semver v1.5.0 // indirect
290290
github.com/Masterminds/sprig v2.22.0+incompatible // indirect
291291
github.com/Microsoft/go-winio v0.5.2 // indirect
292-
github.com/RaduBerinde/axisds v0.0.0-20250405232732-ecb85bedf677 // indirect
292+
github.com/RaduBerinde/axisds v0.0.0-20250419182453-5135a0650657 // indirect
293+
github.com/RaduBerinde/btreemap v0.0.0-20250419174037-3d62b7205d54 // indirect
293294
github.com/abbot/go-http-auth v0.4.1-0.20181019201920-860ed7f246ff // indirect
294295
github.com/aclements/go-moremath v0.0.0-20210112150236-f10218a38794 // indirect
295296
github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b // indirect

go.sum

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -266,10 +266,12 @@ github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbt
266266
github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
267267
github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
268268
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
269-
github.com/RaduBerinde/axisds v0.0.0-20250405232732-ecb85bedf677 h1:NofOMIO/Z3301wDc9gIM/M0/+YjvOYSvUe7+30bkxkA=
270-
github.com/RaduBerinde/axisds v0.0.0-20250405232732-ecb85bedf677/go.mod h1:YO26VdZg1RVVjEhjmeEJE/4bLnD2mowj5eDiZQSLtlE=
269+
github.com/RaduBerinde/axisds v0.0.0-20250419182453-5135a0650657 h1:8XBWWQD+vFF+JqOsm16t0Kab1a7YWV8+GISVEP8AuZ8=
270+
github.com/RaduBerinde/axisds v0.0.0-20250419182453-5135a0650657/go.mod h1:UHGJonU9z4YYGKJxSaC6/TNcLOBptpmM5m2Cksbnw0Y=
271271
github.com/RaduBerinde/btree v1.0.2-0.20250415192849-8beea01764ce h1:jmg1o6EkSTLFQ4vdTBzob5AjFBzNH4ELn56iKhMVk48=
272272
github.com/RaduBerinde/btree v1.0.2-0.20250415192849-8beea01764ce/go.mod h1:1+GykKoq3bIUWDVjNWWxWYblBduYahx5NGepZjgYqvI=
273+
github.com/RaduBerinde/btreemap v0.0.0-20250419174037-3d62b7205d54 h1:bsU8Tzxr/PNz75ayvCnxKZWEYdLMPDkUgticP4a4Bvk=
274+
github.com/RaduBerinde/btreemap v0.0.0-20250419174037-3d62b7205d54/go.mod h1:0tr7FllbE9gJkHq7CVeeDDFAFKQVy5RnCSSNBOvdqbc=
273275
github.com/SAP/go-hdb v0.14.1/go.mod h1:7fdQLVC2lER3urZLjZCm0AuMQfApof92n3aylBPEkMo=
274276
github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0=
275277
github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ=
@@ -593,8 +595,8 @@ github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 h1:ASDL+UJcILM
593595
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506/go.mod h1:Mw7HqKr2kdtu6aYGn3tPmAftiP3QPX63LdK/zcariIo=
594596
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895 h1:XANOgPYtvELQ/h4IrmPAohXqe2pWA8Bwhejr3VQoZsA=
595597
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895/go.mod h1:aPd7gM9ov9M8v32Yy5NJrDyOcD8z642dqs+F0CeNXfA=
596-
github.com/cockroachdb/pebble v0.0.0-20250417234720-091ed497241b h1:x0mDX6DRVJphx9xkup4N00L6nDn6K+cSOIUXKvbmeSI=
597-
github.com/cockroachdb/pebble v0.0.0-20250417234720-091ed497241b/go.mod h1:ONMS0WzY11hEvOyO3Cl6fyfaDduyiz42cYeQAcqHRNQ=
598+
github.com/cockroachdb/pebble v0.0.0-20250423160643-c70ddd4f9c9e h1:zG2jqS8AgpMbLThyQm3HrKs/yaLV8CORKLn0N4hoGxA=
599+
github.com/cockroachdb/pebble v0.0.0-20250423160643-c70ddd4f9c9e/go.mod h1:jyGqUZ9jl6TVX9HHi12f0JQ+h+oL75De//O43X898BA=
598600
github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
599601
github.com/cockroachdb/redact v1.1.6 h1:zXJBwDZ84xJNlHl1rMyCojqyIxv+7YUpQiJLQ7n4314=
600602
github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=

0 commit comments

Comments
 (0)