Skip to content

Commit 56c99de

Browse files
craig[bot]jbowens
andcommitted
Merge #148402
148402: go.mod: bump Pebble to acc4f6d85f26 r=RaduBerinde a=jbowens Changes: * [`acc4f6d8`](cockroachdb/pebble@acc4f6d8) db: define a new value separation format major version * [`f195c694`](cockroachdb/pebble@f195c694) manifest: remove BlobReference.OriginalMetadata * [`6f75f52f`](cockroachdb/pebble@6f75f52f) pebble: update comments about the max batch size * [`cd8f2d41`](cockroachdb/pebble@cd8f2d41) metamorphic: error out if flags are used incorrectly * [`b2c5cabe`](cockroachdb/pebble@b2c5cabe) sstable: add blob reference value liveness index block * [`4e652eb4`](cockroachdb/pebble@4e652eb4) db: add blobRefValueLivenessWriter * [`9807b3bb`](cockroachdb/pebble@9807b3bb) colblk: introduce value liveness block encoder, decoder * [`8a9e8d9e`](cockroachdb/pebble@8a9e8d9e) sstable: add run-length bitmap encoder, decoder * [`0d712ee7`](cockroachdb/pebble@0d712ee7) metamorphic: remove obj metadata created from previous ops * [`efa3ebe2`](cockroachdb/pebble@efa3ebe2) sstable: fix crash in copyFilter * [`3747415b`](cockroachdb/pebble@3747415b) manifest: support blob file replacement * [`8866088c`](cockroachdb/pebble@8866088c) manifest: explicitly encode deleted physical blob file numbers * [`2ca2aeb8`](cockroachdb/pebble@2ca2aeb8) blob,manifest: lookup physical blob file in Version * [`2eabac8d`](cockroachdb/pebble@2eabac8d) crossversion: pass all previous ops * [`d26e8baf`](cockroachdb/pebble@d26e8baf) metamorphic: tolerate integers for user key suffixes * [`9c9786fb`](cockroachdb/pebble@9c9786fb) metamorphic: tolerate extra arg for IngestAndExcise * [`2c57303d`](cockroachdb/pebble@2c57303d) db: maintain a Version reference during compactions * [`8e93f830`](cockroachdb/pebble@8e93f830) db: add a code comment about flaws in FlushThroughput * [`549acfee`](cockroachdb/pebble@549acfee) manifest: clean up SortBySeqNum, SortBySmallest Release note: none. Epic: none. Co-authored-by: Jackson Owens <[email protected]>
2 parents 8264829 + 8a2e496 commit 56c99de

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
@@ -1885,10 +1885,10 @@ def go_deps():
18851885
patches = [
18861886
"@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
18871887
],
1888-
sha256 = "66a7caf0461fd298e3208b6ef9d225b956fbd997eb086d1c464c743f3204dd44",
1889-
strip_prefix = "github.com/cockroachdb/[email protected]20250610195649-24730ad60ca6",
1888+
sha256 = "9829156559e966e2594026d1eb66db9f18b12129851da4f1a6784e994f1e6f7e",
1889+
strip_prefix = "github.com/cockroachdb/[email protected]20250616174800-acc4f6d85f26",
18901890
urls = [
1891-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250610195649-24730ad60ca6.zip",
1891+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250616174800-acc4f6d85f26.zip",
18921892
],
18931893
)
18941894
go_repository(

build/bazelutil/distdir_files.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ DISTDIR_FILES = {
366366
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gostdlib/com_github_cockroachdb_gostdlib-v1.19.0.zip": "c4d516bcfe8c07b6fc09b8a9a07a95065b36c2855627cb3514e40c98f872b69e",
367367
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20241215232642-bb51bb14a506.zip": "920068af09e3846d9ebb4e4a7787ff1dd10f3989c5f940ad861b0f6a9f824f6e",
368368
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/metamorphic/com_github_cockroachdb_metamorphic-v0.0.0-20231108215700-4ba948b56895.zip": "28c8cf42192951b69378cf537be5a9a43f2aeb35542908cc4fe5f689505853ea",
369-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250610195649-24730ad60ca6.zip": "66a7caf0461fd298e3208b6ef9d225b956fbd997eb086d1c464c743f3204dd44",
369+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250616174800-acc4f6d85f26.zip": "9829156559e966e2594026d1eb66db9f18b12129851da4f1a6784e994f1e6f7e",
370370
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.6.zip": "018eccb5fb9ca52d43ec9eaf213539d01c1f2b94e0e822406ebfb2e9321ef6cf",
371371
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/returncheck/com_github_cockroachdb_returncheck-v0.0.0-20200612231554-92cdbca611dd.zip": "ce92ba4352deec995b1f2eecf16eba7f5d51f5aa245a1c362dfe24c83d31f82b",
372372
"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-20250610195649-24730ad60ca6
142+
github.com/cockroachdb/pebble v0.0.0-20250616174800-acc4f6d85f26
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
@@ -597,8 +597,8 @@ github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 h1:ASDL+UJcILM
597597
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506/go.mod h1:Mw7HqKr2kdtu6aYGn3tPmAftiP3QPX63LdK/zcariIo=
598598
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895 h1:XANOgPYtvELQ/h4IrmPAohXqe2pWA8Bwhejr3VQoZsA=
599599
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895/go.mod h1:aPd7gM9ov9M8v32Yy5NJrDyOcD8z642dqs+F0CeNXfA=
600-
github.com/cockroachdb/pebble v0.0.0-20250610195649-24730ad60ca6 h1:J9+QrMWdFk+LCg2Ht2wZo+clzTxEv6yiucRVSSQuUVI=
601-
github.com/cockroachdb/pebble v0.0.0-20250610195649-24730ad60ca6/go.mod h1:cnPe7/4+ZaEoSSlr4P3QT2CBbd6fdnP+JQ6On5PEpoE=
600+
github.com/cockroachdb/pebble v0.0.0-20250616174800-acc4f6d85f26 h1:eIkMAiqWpSbB2Ztf254Mi6m3dUWNX6SwRW8D5nBaCVU=
601+
github.com/cockroachdb/pebble v0.0.0-20250616174800-acc4f6d85f26/go.mod h1:cnPe7/4+ZaEoSSlr4P3QT2CBbd6fdnP+JQ6On5PEpoE=
602602
github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
603603
github.com/cockroachdb/redact v1.1.6 h1:zXJBwDZ84xJNlHl1rMyCojqyIxv+7YUpQiJLQ7n4314=
604604
github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=

0 commit comments

Comments
 (0)