Skip to content

Commit 832527c

Browse files
craig[bot]jbowens
craig[bot]
and
jbowens
committed
Merge #150872
150872: go.mod: bump Pebble to e2a0f833e83b r=RaduBerinde a=jbowens Changes: * [`e2a0f833`](cockroachdb/pebble@e2a0f833) replay: adding ingestion testing * [`38de796d`](cockroachdb/pebble@38de796d) sstable: move block transforms to blockiter * [`c42ae487`](cockroachdb/pebble@c42ae487) sstable: move block iterator interfaces to blockiter * [`d88ea553`](cockroachdb/pebble@d88ea553) bitflip: add missing copyright notice * [`134168d0`](cockroachdb/pebble@134168d0) sstable: remove checksummer from blockBuf * [`4fa1e6a4`](cockroachdb/pebble@4fa1e6a4) db: deflake TestCompactionCorruption * [`ce33973e`](cockroachdb/pebble@ce33973e) sstable: expand blob reference index comments, assertions * [`2c6d18ca`](cockroachdb/pebble@2c6d18ca) github: include go version in issue message * [`d8bd7ffa`](cockroachdb/pebble@d8bd7ffa) colblk: fix 386 build * [`bb252436`](cockroachdb/pebble@bb252436) metrics: replace horizontal dividers between tables with newlines * [`5a78b807`](cockroachdb/pebble@5a78b807) fix merge skew * [`85743aca`](cockroachdb/pebble@85743aca) metrics: improve tables for compaction kinds and files * [`12f45681`](cockroachdb/pebble@12f45681) metrics: use compact humanization * [`78a43161`](cockroachdb/pebble@78a43161) metrics: improve exampleMetrics * [`d35993e1`](cockroachdb/pebble@d35993e1) sstable: avoid overflow in GetScaledProperties * [`1e81d2b8`](cockroachdb/pebble@1e81d2b8) sstable: move GetScaledProperties * [`ec6a6bb0`](cockroachdb/pebble@ec6a6bb0) go.mod: update crlib * [`c21fd8d1`](cockroachdb/pebble@c21fd8d1) colblk: remove unnecessary start ptr from RawBytes * [`635423ea`](cockroachdb/pebble@635423ea) constants: remove package Release note: none. Epic: none. Co-authored-by: Jackson Owens <[email protected]>
2 parents 162e51b + fceaee7 commit 832527c

File tree

6 files changed

+18
-18
lines changed

6 files changed

+18
-18
lines changed

‎DEPS.bzl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1755,10 +1755,10 @@ def go_deps():
17551755
name = "com_github_cockroachdb_crlib",
17561756
build_file_proto_mode = "disable_global",
17571757
importpath = "github.com/cockroachdb/crlib",
1758-
sha256 = "47ee61f8b5cc8327e3b3b65a93dee277137e762a73650c2f0a75a24a37361114",
1759-
strip_prefix = "github.com/cockroachdb/[email protected]20250617202621-0794c595bbe6",
1758+
sha256 = "4fb4d32f15fb3c63decb9625406f291874f975518d5937493a7a9d1f3a644f18",
1759+
strip_prefix = "github.com/cockroachdb/[email protected]20250718215705-7ff5051265b9",
17601760
urls = [
1761-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/crlib/com_github_cockroachdb_crlib-v0.0.0-20250617202621-0794c595bbe6.zip",
1761+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/crlib/com_github_cockroachdb_crlib-v0.0.0-20250718215705-7ff5051265b9.zip",
17621762
],
17631763
)
17641764
go_repository(
@@ -1835,10 +1835,10 @@ def go_deps():
18351835
patches = [
18361836
"@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
18371837
],
1838-
sha256 = "dc82ab51494c5580be75fd82dfefd78b17ce7868d21ff9c44f4feecc71a56de9",
1839-
strip_prefix = "github.com/cockroachdb/[email protected]20250717215536-273e26653683",
1838+
sha256 = "f2643ce893f0d1e69b1881680d3e30770ae632898f531cece73cbfc948bbb838",
1839+
strip_prefix = "github.com/cockroachdb/[email protected]20250728193538-e2a0f833e83b",
18401840
urls = [
1841-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250717215536-273e26653683.zip",
1841+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250728193538-e2a0f833e83b.zip",
18421842
],
18431843
)
18441844
go_repository(

‎build/bazelutil/distdir_files.bzl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ DISTDIR_FILES = {
348348
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/cmux/com_github_cockroachdb_cmux-v0.0.0-20250514152509-914d3bf9ec58.zip": "c1cf4cd99a1ad6a00f2ccd4188cbcf004cb0d56895670b2c171061ce564cd791",
349349
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/cockroach-go/v2/com_github_cockroachdb_cockroach_go_v2-v2.4.1.zip": "ba646db91152f3121a6812c7b74d12d8c0e126f7b4d3b927618b159692ceb424",
350350
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/crlfmt/com_github_cockroachdb_crlfmt-v0.0.0-20221214225007-b2fc5c302548.zip": "fedc01bdd6d964da0425d5eaac8efadc951e78e13f102292cc0774197f09ab63",
351-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/crlib/com_github_cockroachdb_crlib-v0.0.0-20250617202621-0794c595bbe6.zip": "47ee61f8b5cc8327e3b3b65a93dee277137e762a73650c2f0a75a24a37361114",
351+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/crlib/com_github_cockroachdb_crlib-v0.0.0-20250718215705-7ff5051265b9.zip": "4fb4d32f15fb3c63decb9625406f291874f975518d5937493a7a9d1f3a644f18",
352352
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/datadriven/com_github_cockroachdb_datadriven-v1.0.3-0.20250407164829-2945557346d5.zip": "251593cd9c040fe84a99a3919de7ce6f85030d522159a37d625dc2dea7a4d17f",
353353
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/drpc/com_github_cockroachdb_drpc-v0.0.0-20250618091105-e79a954a2193.zip": "612016b7a145f386a2163d788e3376cb0f63410b8423f2ef3f723f7aa24c1971",
354354
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/errors/com_github_cockroachdb_errors-v1.12.0.zip": "f73d8a5f4d8fcbc4ed61db2b47f17e2601d8b32e9a49c0665667489d9d9d6e7c",
@@ -358,7 +358,7 @@ DISTDIR_FILES = {
358358
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gostdlib/com_github_cockroachdb_gostdlib-v1.19.0.zip": "c4d516bcfe8c07b6fc09b8a9a07a95065b36c2855627cb3514e40c98f872b69e",
359359
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20241215232642-bb51bb14a506.zip": "920068af09e3846d9ebb4e4a7787ff1dd10f3989c5f940ad861b0f6a9f824f6e",
360360
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/metamorphic/com_github_cockroachdb_metamorphic-v0.0.0-20231108215700-4ba948b56895.zip": "28c8cf42192951b69378cf537be5a9a43f2aeb35542908cc4fe5f689505853ea",
361-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250717215536-273e26653683.zip": "dc82ab51494c5580be75fd82dfefd78b17ce7868d21ff9c44f4feecc71a56de9",
361+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250728193538-e2a0f833e83b.zip": "f2643ce893f0d1e69b1881680d3e30770ae632898f531cece73cbfc948bbb838",
362362
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.6.zip": "018eccb5fb9ca52d43ec9eaf213539d01c1f2b94e0e822406ebfb2e9321ef6cf",
363363
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/returncheck/com_github_cockroachdb_returncheck-v0.0.0-20200612231554-92cdbca611dd.zip": "ce92ba4352deec995b1f2eecf16eba7f5d51f5aa245a1c362dfe24c83d31f82b",
364364
"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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,13 +134,13 @@ require (
134134
github.com/cockroachdb/cmux v0.0.0-20250514152509-914d3bf9ec58
135135
github.com/cockroachdb/cockroach-go/v2 v2.4.1
136136
github.com/cockroachdb/crlfmt v0.0.0-20221214225007-b2fc5c302548
137-
github.com/cockroachdb/crlib v0.0.0-20250617202621-0794c595bbe6
137+
github.com/cockroachdb/crlib v0.0.0-20250718215705-7ff5051265b9
138138
github.com/cockroachdb/datadriven v1.0.3-0.20250407164829-2945557346d5
139139
github.com/cockroachdb/errors v1.12.0
140140
github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55
141141
github.com/cockroachdb/gostdlib v1.19.0
142142
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506
143-
github.com/cockroachdb/pebble v0.0.0-20250717215536-273e26653683
143+
github.com/cockroachdb/pebble v0.0.0-20250728193538-e2a0f833e83b
144144
github.com/cockroachdb/redact v1.1.6
145145
github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
146146
github.com/cockroachdb/stress v0.0.0-20220803192808-1806698b1b7b

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -558,8 +558,8 @@ github.com/cockroachdb/cockroach-go/v2 v2.4.1 h1:ACVT/zXsuK6waRPVYtDQpsM8pPA7IA/
558558
github.com/cockroachdb/cockroach-go/v2 v2.4.1/go.mod h1:9U179XbCx4qFWtNhc7BiWLPfuyMVQ7qdAhfrwLz1vH0=
559559
github.com/cockroachdb/crlfmt v0.0.0-20221214225007-b2fc5c302548 h1:i0bnjanlWAvM50wHMT7EFyxlt5HQusznWrkwl+HBIsU=
560560
github.com/cockroachdb/crlfmt v0.0.0-20221214225007-b2fc5c302548/go.mod h1:qtkxNlt5i3rrdirfJE/bQeW/IeLajKexErv7jEIV+Uc=
561-
github.com/cockroachdb/crlib v0.0.0-20250617202621-0794c595bbe6 h1:PZVolkXzVqPQQZ7Jm8/lGpI9ZM086mB55oOWqy0wG6E=
562-
github.com/cockroachdb/crlib v0.0.0-20250617202621-0794c595bbe6/go.mod h1:Gq51ZeKaFCXk6QwuGM0w1dnaOqc/F5zKT2zA9D6Xeac=
561+
github.com/cockroachdb/crlib v0.0.0-20250718215705-7ff5051265b9 h1:eNjHrT3pPlP1q/4VT/IRGzl8Jiq1XHrSpLJmrGFJDT8=
562+
github.com/cockroachdb/crlib v0.0.0-20250718215705-7ff5051265b9/go.mod h1:Gq51ZeKaFCXk6QwuGM0w1dnaOqc/F5zKT2zA9D6Xeac=
563563
github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
564564
github.com/cockroachdb/datadriven v1.0.2/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU=
565565
github.com/cockroachdb/datadriven v1.0.3-0.20250407164829-2945557346d5 h1:UycK/E0TkisVrQbSoxvU827FwgBBcZ95nRRmpj/12QI=
@@ -582,8 +582,8 @@ github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 h1:ASDL+UJcILM
582582
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506/go.mod h1:Mw7HqKr2kdtu6aYGn3tPmAftiP3QPX63LdK/zcariIo=
583583
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895 h1:XANOgPYtvELQ/h4IrmPAohXqe2pWA8Bwhejr3VQoZsA=
584584
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895/go.mod h1:aPd7gM9ov9M8v32Yy5NJrDyOcD8z642dqs+F0CeNXfA=
585-
github.com/cockroachdb/pebble v0.0.0-20250717215536-273e26653683 h1:MZ0Sqn8yxrgOtLw2rAGSlgzNMDkFzc86nOa7mUjALyc=
586-
github.com/cockroachdb/pebble v0.0.0-20250717215536-273e26653683/go.mod h1:LLa+I2vZrOsrsy4QcuZ6wSXBNQll7erNg3GCr8NpE90=
585+
github.com/cockroachdb/pebble v0.0.0-20250728193538-e2a0f833e83b h1:f8bXwp9lAJUg8ld1UxO8e2XsP7XRdTP97EvQYvTvqj8=
586+
github.com/cockroachdb/pebble v0.0.0-20250728193538-e2a0f833e83b/go.mod h1:m1E2qCthmjzpvzktMEjYXj0eykYI325brUhFJU6VRis=
587587
github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
588588
github.com/cockroachdb/redact v1.1.6 h1:zXJBwDZ84xJNlHl1rMyCojqyIxv+7YUpQiJLQ7n4314=
589589
github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=

‎pkg/testutils/storageutils/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ go_library(
2929
"@com_github_cockroachdb_errors//:errors",
3030
"@com_github_cockroachdb_pebble//:pebble",
3131
"@com_github_cockroachdb_pebble//sstable",
32-
"@com_github_cockroachdb_pebble//sstable/block",
32+
"@com_github_cockroachdb_pebble//sstable/blockiter",
3333
"@com_github_cockroachdb_redact//:redact",
3434
"@com_github_stretchr_testify//require",
3535
],

‎pkg/testutils/storageutils/sst.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"github.com/cockroachdb/errors"
2222
"github.com/cockroachdb/pebble"
2323
"github.com/cockroachdb/pebble/sstable"
24-
"github.com/cockroachdb/pebble/sstable/block"
24+
"github.com/cockroachdb/pebble/sstable/blockiter"
2525
"github.com/cockroachdb/redact"
2626
"github.com/stretchr/testify/require"
2727
)
@@ -181,7 +181,7 @@ func ReportSSTEntries(buf *redact.StringBuilder, name string, sst []byte) error
181181
}
182182

183183
// Dump rangedels.
184-
if rdIter, err := r.NewRawRangeDelIter(context.Background(), block.NoFragmentTransforms, sstable.NoReadEnv); err != nil {
184+
if rdIter, err := r.NewRawRangeDelIter(context.Background(), blockiter.NoFragmentTransforms, sstable.NoReadEnv); err != nil {
185185
return err
186186
} else if rdIter != nil {
187187
defer rdIter.Close()
@@ -206,7 +206,7 @@ func ReportSSTEntries(buf *redact.StringBuilder, name string, sst []byte) error
206206
}
207207

208208
// Dump range keys.
209-
if rkIter, err := r.NewRawRangeKeyIter(context.Background(), block.NoFragmentTransforms, sstable.NoReadEnv); err != nil {
209+
if rkIter, err := r.NewRawRangeKeyIter(context.Background(), blockiter.NoFragmentTransforms, sstable.NoReadEnv); err != nil {
210210
return err
211211
} else if rkIter != nil {
212212
defer rkIter.Close()

0 commit comments

Comments
 (0)