Skip to content

Commit 8a383b1

Browse files
craig[bot]RaduBerinde
craig[bot]
and
RaduBerinde
committed
Merge #158689
158689: go.mod: bump Pebble to 36cb7a24d395 r=RaduBerinde a=RaduBerinde Changes: * [`36cb7a24`](cockroachdb/pebble@36cb7a24) valsep: do not embed sstable.Writer methods on SSTBlobWriter * [`3735f59e`](cockroachdb/pebble@3735f59e) db: change panic to fatalf for better debuggability * [`e494c554`](cockroachdb/pebble@e494c554) objstorage: move ReadableFile and SimpleReadable form sstable -> objstorage Release note: none. Epic: none. Co-authored-by: Radu Berinde <[email protected]>
2 parents d1fac3e + b4ca58e commit 8a383b1

File tree

16 files changed

+29
-32
lines changed

16 files changed

+29
-32
lines changed

‎DEPS.bzl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1834,10 +1834,10 @@ def go_deps():
18341834
patches = [
18351835
"@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
18361836
],
1837-
sha256 = "f7297c003d1fc223ee139c0d27827072c4b4b2f131d391fb521eac598bd63b86",
1838-
strip_prefix = "github.com/cockroachdb/[email protected]20251125175721-de16e1520951",
1837+
sha256 = "f318e608fa935791ce965dfab8693db54e101de66b4961a7bd1877c76e3083a1",
1838+
strip_prefix = "github.com/cockroachdb/[email protected]20251202161204-36cb7a24d395",
18391839
urls = [
1840-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20251125175721-de16e1520951.zip",
1840+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20251202161204-36cb7a24d395.zip",
18411841
],
18421842
)
18431843
go_repository(

‎build/bazelutil/distdir_files.bzl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ DISTDIR_FILES = {
352352
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gostdlib/com_github_cockroachdb_gostdlib-v1.19.0.zip": "c4d516bcfe8c07b6fc09b8a9a07a95065b36c2855627cb3514e40c98f872b69e",
353353
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20241215232642-bb51bb14a506.zip": "920068af09e3846d9ebb4e4a7787ff1dd10f3989c5f940ad861b0f6a9f824f6e",
354354
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/metamorphic/com_github_cockroachdb_metamorphic-v0.0.0-20231108215700-4ba948b56895.zip": "28c8cf42192951b69378cf537be5a9a43f2aeb35542908cc4fe5f689505853ea",
355-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20251125175721-de16e1520951.zip": "f7297c003d1fc223ee139c0d27827072c4b4b2f131d391fb521eac598bd63b86",
355+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20251202161204-36cb7a24d395.zip": "f318e608fa935791ce965dfab8693db54e101de66b4961a7bd1877c76e3083a1",
356356
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.6.zip": "018eccb5fb9ca52d43ec9eaf213539d01c1f2b94e0e822406ebfb2e9321ef6cf",
357357
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/returncheck/com_github_cockroachdb_returncheck-v0.0.0-20200612231554-92cdbca611dd.zip": "ce92ba4352deec995b1f2eecf16eba7f5d51f5aa245a1c362dfe24c83d31f82b",
358358
"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
@@ -137,7 +137,7 @@ require (
137137
github.com/cockroachdb/errors v1.12.1-0.20251010171200-64801262cd6f
138138
github.com/cockroachdb/gostdlib v1.19.0
139139
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506
140-
github.com/cockroachdb/pebble v0.0.0-20251125175721-de16e1520951
140+
github.com/cockroachdb/pebble v0.0.0-20251202161204-36cb7a24d395
141141
github.com/cockroachdb/redact v1.1.6
142142
github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
143143
github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -572,8 +572,8 @@ github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 h1:ASDL+UJcILM
572572
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506/go.mod h1:Mw7HqKr2kdtu6aYGn3tPmAftiP3QPX63LdK/zcariIo=
573573
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895 h1:XANOgPYtvELQ/h4IrmPAohXqe2pWA8Bwhejr3VQoZsA=
574574
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895/go.mod h1:aPd7gM9ov9M8v32Yy5NJrDyOcD8z642dqs+F0CeNXfA=
575-
github.com/cockroachdb/pebble v0.0.0-20251125175721-de16e1520951 h1:42C86t1Su5UyfzfdYU2lr+ehW41s4f734JHMMGLcW+o=
576-
github.com/cockroachdb/pebble v0.0.0-20251125175721-de16e1520951/go.mod h1:4p9u+hqtw8sRxiY5cNFWETymMf4brYGG90pS8MzlXmg=
575+
github.com/cockroachdb/pebble v0.0.0-20251202161204-36cb7a24d395 h1:12Csn16z4ZsuLBzwRZYmSNhrScE7cnU99n+z9gj2laM=
576+
github.com/cockroachdb/pebble v0.0.0-20251202161204-36cb7a24d395/go.mod h1:4p9u+hqtw8sRxiY5cNFWETymMf4brYGG90pS8MzlXmg=
577577
github.com/cockroachdb/redact v1.1.6 h1:zXJBwDZ84xJNlHl1rMyCojqyIxv+7YUpQiJLQ7n4314=
578578
github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
579579
github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd h1:KFOt5I9nEKZgCnOSmy8r4Oykh8BYQO8bFOTgHDS8YZA=

‎pkg/backup/BUILD.bazel‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,6 @@ go_test(
342342
"@com_github_cockroachdb_errors//:errors",
343343
"@com_github_cockroachdb_errors//oserror",
344344
"@com_github_cockroachdb_pebble//objstorage",
345-
"@com_github_cockroachdb_pebble//sstable",
346345
"@com_github_cockroachdb_pebble//vfs",
347346
"@com_github_cockroachdb_redact//:redact",
348347
"@com_github_fatih_structs//:structs",

‎pkg/backup/restore_data_processor_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ import (
4747
"github.com/cockroachdb/cockroach/pkg/util/mon"
4848
"github.com/cockroachdb/cockroach/pkg/util/timeutil"
4949
"github.com/cockroachdb/pebble/objstorage"
50-
"github.com/cockroachdb/pebble/sstable"
5150
"github.com/cockroachdb/pebble/vfs"
5251
"github.com/stretchr/testify/require"
5352
)
@@ -73,7 +72,7 @@ func slurpSSTablesLatestKey(
7372
LowerBound: keys.LocalMax,
7473
UpperBound: keys.MaxKey,
7574
}
76-
sst, err := storage.NewSSTIterator([][]sstable.ReadableFile{{file}}, iterOpts)
75+
sst, err := storage.NewSSTIterator([][]objstorage.ReadableFile{{file}}, iterOpts)
7776
if err != nil {
7877
t.Fatal(err)
7978
}

‎pkg/ccl/storageccl/BUILD.bazel‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ go_library(
1919
"//pkg/util/retry",
2020
"@com_github_cockroachdb_errors//:errors",
2121
"@com_github_cockroachdb_pebble//objstorage",
22-
"@com_github_cockroachdb_pebble//sstable",
2322
"@com_github_cockroachdb_pebble//vfs",
2423
"@org_golang_x_crypto//pbkdf2",
2524
],

‎pkg/ccl/storageccl/encryption.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"github.com/cockroachdb/cockroach/pkg/util/mon"
2121
"github.com/cockroachdb/errors"
2222
"github.com/cockroachdb/pebble/objstorage"
23-
"github.com/cockroachdb/pebble/sstable"
2423
"github.com/cockroachdb/pebble/vfs"
2524
"golang.org/x/crypto/pbkdf2"
2625
)
@@ -220,7 +219,7 @@ type readerAndReaderAt interface {
220219
io.ReaderAt
221220
}
222221

223-
func decryptingReader(ciphertext readerAndReaderAt, key []byte) (sstable.ReadableFile, error) {
222+
func decryptingReader(ciphertext readerAndReaderAt, key []byte) (objstorage.ReadableFile, error) {
224223
gcm, err := aesgcm(key)
225224
if err != nil {
226225
return nil, err

‎pkg/ccl/storageccl/external_sst_reader.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"github.com/cockroachdb/cockroach/pkg/util/mon"
2121
"github.com/cockroachdb/cockroach/pkg/util/retry"
2222
"github.com/cockroachdb/errors"
23-
"github.com/cockroachdb/pebble/sstable"
23+
"github.com/cockroachdb/pebble/objstorage"
2424
"github.com/cockroachdb/pebble/vfs"
2525
)
2626

@@ -123,7 +123,7 @@ func ExternalSSTReader(
123123
return newMemPebbleSSTReader(ctx, storeFiles, encryption, iterOpts)
124124
}
125125
remoteCacheSize := remoteSSTSuffixCacheSize.Get(&storeFiles[0].Store.Settings().SV)
126-
openedReadersByLevel := make([][]sstable.ReadableFile, 0, len(storeFiles))
126+
openedReadersByLevel := make([][]objstorage.ReadableFile, 0, len(storeFiles))
127127

128128
// Cleanup any files we've opened if we fail with an error.
129129
defer func() {
@@ -153,7 +153,7 @@ func ExternalSSTReader(
153153
},
154154
}
155155

156-
var reader sstable.ReadableFile
156+
var reader objstorage.ReadableFile
157157

158158
if encryption != nil {
159159
r, err := decryptingReader(raw, encryption.Key)
@@ -171,7 +171,7 @@ func ExternalSSTReader(
171171
}
172172
reader = raw
173173
}
174-
openedReadersByLevel = append(openedReadersByLevel, []sstable.ReadableFile{reader})
174+
openedReadersByLevel = append(openedReadersByLevel, []objstorage.ReadableFile{reader})
175175
}
176176

177177
readerLevels := openedReadersByLevel

‎pkg/kv/kvserver/kvstorage/snaprecv/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ go_test(
5151
"@com_github_cockroachdb_errors//:errors",
5252
"@com_github_cockroachdb_errors//oserror",
5353
"@com_github_cockroachdb_pebble//:pebble",
54+
"@com_github_cockroachdb_pebble//objstorage",
5455
"@com_github_cockroachdb_pebble//rangekey",
55-
"@com_github_cockroachdb_pebble//sstable",
5656
"@com_github_cockroachdb_pebble//vfs",
5757
"@com_github_cockroachdb_redact//:redact",
5858
"@com_github_stretchr_testify//require",

0 commit comments

Comments
 (0)