Skip to content

Commit 4f422e8

Browse files
craig[bot]RaduBerinde
craig[bot]
and
RaduBerinde
committed
Merge #147959
147959: go.mod: bump Pebble to 056234f760e0 r=RaduBerinde a=RaduBerinde Changes: * [`056234f7`](cockroachdb/pebble@056234f7) pebble: replace Compression with CompressionProfile * [`38d40226`](cockroachdb/pebble@38d40226) scripts: run-crossversion-meta: use artifacts subdir * [`343ddcd3`](cockroachdb/pebble@343ddcd3) scripts: run-crossversion-meta: use go 1.22 to build 24.1 test * [`21551faa`](cockroachdb/pebble@21551faa) metamorphic: show only the last part of the history * [`f117f8bf`](cockroachdb/pebble@f117f8bf) metamorphic: crossversion debugging improvements * [`afcc8e48`](cockroachdb/pebble@afcc8e48) metamorphic: user-friendly diff output Release note: none. Epic: none. Co-authored-by: Radu Berinde <[email protected]>
2 parents 027fb22 + 8aa6cbd commit 4f422e8

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
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 = "f2d23b2843a639e87910bfa009913af4553cd1004f8b014dd65d0ed23690ab1f",
1889-
strip_prefix = "github.com/cockroachdb/[email protected]20250607002512-1f0f159d4671",
1888+
sha256 = "aa3192e19d3a56ab0eebb4bc6d2950dd392daa3f6aafdccba8ec69e75c478ef3",
1889+
strip_prefix = "github.com/cockroachdb/[email protected]20250607160804-056234f760e0",
18901890
urls = [
1891-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250607002512-1f0f159d4671.zip",
1891+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250607160804-056234f760e0.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-20250607002512-1f0f159d4671.zip": "f2d23b2843a639e87910bfa009913af4553cd1004f8b014dd65d0ed23690ab1f",
369+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250607160804-056234f760e0.zip": "aa3192e19d3a56ab0eebb4bc6d2950dd392daa3f6aafdccba8ec69e75c478ef3",
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-20250607002512-1f0f159d4671
142+
github.com/cockroachdb/pebble v0.0.0-20250607160804-056234f760e0
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-20250607002512-1f0f159d4671 h1:wdLk4pQoCKsCHDoAWuuiYomB1CKwF9Nd9Uiga7Xz04M=
601-
github.com/cockroachdb/pebble v0.0.0-20250607002512-1f0f159d4671/go.mod h1:cnPe7/4+ZaEoSSlr4P3QT2CBbd6fdnP+JQ6On5PEpoE=
600+
github.com/cockroachdb/pebble v0.0.0-20250607160804-056234f760e0 h1:n3qVQukPDHgfy3IRUt9D2zdU2BDc25xnetEzhMwbIFo=
601+
github.com/cockroachdb/pebble v0.0.0-20250607160804-056234f760e0/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=

‎pkg/storage/pebble.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -272,11 +272,11 @@ var CompressionAlgorithmBackupTransport = RegisterCompressionAlgorithmClusterSet
272272
defaultCompressionAlgorithm,
273273
)
274274

275-
func getCompressionAlgorithm(
275+
func getCompressionProfile(
276276
ctx context.Context,
277277
settings *cluster.Settings,
278278
setting *settings.EnumSetting[CompressionAlgorithm],
279-
) pebble.Compression {
279+
) *pebble.CompressionProfile {
280280
switch setting.Get(&settings.SV) {
281281
case CompressionAlgorithmSnappy:
282282
return pebble.SnappyCompression
@@ -740,8 +740,8 @@ func newPebble(ctx context.Context, cfg engineConfig) (p *Pebble, err error) {
740740
cfg.opts.Lock = cfg.env.DirectoryLock
741741
cfg.opts.ErrorIfNotExists = cfg.mustExist
742742
for i := range cfg.opts.Levels {
743-
cfg.opts.Levels[i].Compression = func() block.Compression {
744-
return getCompressionAlgorithm(ctx, cfg.settings, CompressionAlgorithmStorage)
743+
cfg.opts.Levels[i].Compression = func() *block.CompressionProfile {
744+
return getCompressionProfile(ctx, cfg.settings, CompressionAlgorithmStorage)
745745
}
746746
}
747747
// Note: the CompactionConcurrencyRange function will be wrapped below to

‎pkg/storage/sst_writer.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ func MakeIngestionWriterOptions(ctx context.Context, cs *cluster.Settings) sstab
9595
// There are other, more specific, use cases that may call for a different
9696
// algorithm, which can be set by overriding the default (see
9797
// MakeIngestionSSTWriterWithOverrides).
98-
opts.Compression = getCompressionAlgorithm(ctx, cs, CompressionAlgorithmStorage)
98+
opts.Compression = getCompressionProfile(ctx, cs, CompressionAlgorithmStorage)
9999
opts.MergerName = "nullptr"
100100
if !IngestionValueBlocksEnabled.Get(&cs.SV) {
101101
opts.DisableValueBlocks = true
@@ -142,7 +142,7 @@ func MakeTransportSSTWriter(ctx context.Context, cs *cluster.Settings, f io.Writ
142142
// block checksums and more index entries are just overhead and smaller blocks
143143
// reduce compression ratio.
144144
opts.BlockSize = 128 << 10
145-
opts.Compression = getCompressionAlgorithm(ctx, cs, CompressionAlgorithmBackupTransport)
145+
opts.Compression = getCompressionProfile(ctx, cs, CompressionAlgorithmBackupTransport)
146146
opts.MergerName = "nullptr"
147147
return SSTWriter{
148148
fw: sstable.NewWriter(&noopFinishAbort{f}, opts),
@@ -174,7 +174,7 @@ func WithCompressionFromClusterSetting(
174174
ctx context.Context, cs *cluster.Settings, setting *settings.EnumSetting[CompressionAlgorithm],
175175
) SSTWriterOption {
176176
return func(opts *sstable.WriterOptions) {
177-
opts.Compression = getCompressionAlgorithm(ctx, cs, setting)
177+
opts.Compression = getCompressionProfile(ctx, cs, setting)
178178
}
179179
}
180180

0 commit comments

Comments
 (0)