Skip to content

Commit

Permalink
go.mod: bump Pebble to 593a72bf8976
Browse files Browse the repository at this point in the history
```
593a72bf db: add NewIterWithContext to Reader
f6cde3fc internal/manual,internal/rawalloc: Reduce max array size to support MIPS.
6205042b compaction: remove the useless condition in check delete compactions
5807b591 use the constant manifest.NumLevels instead of literal value
94ccf353 vfs/errorfs: add facilities for error injection in datadriven tests
8c13366c compaction: remove the duplicated function mergeFileInfo
bbbf3df1 objstorage: fix up redaction, error message formatting
```

Release note: None.
  • Loading branch information
nicktrav committed Oct 23, 2023
1 parent fbc0cc7 commit 66c3e60
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 10 deletions.
6 changes: 3 additions & 3 deletions DEPS.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -1599,10 +1599,10 @@ def go_deps():
patches = [
"@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
],
sha256 = "548a4f3696216b6ed586dc01c9e29ddddab2b2b6c872376bd6f9e51b83cea5a4",
strip_prefix = "github.com/cockroachdb/[email protected]20231011191824-ede31f1a8e4b",
sha256 = "f37a56b82a2106551b09bb776c664d64d1df576d941df566de081e3fc2a27541",
strip_prefix = "github.com/cockroachdb/[email protected]20231019221832-593a72bf8976",
urls = [
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20231011191824-ede31f1a8e4b.zip",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20231019221832-593a72bf8976.zip",
],
)
go_repository(
Expand Down
2 changes: 1 addition & 1 deletion build/bazelutil/distdir_files.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ DISTDIR_FILES = {
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/go-test-teamcity/com_github_cockroachdb_go_test_teamcity-v0.0.0-20191211140407-cff980ad0a55.zip": "bac30148e525b79d004da84d16453ddd2d5cd20528e9187f1d7dac708335674b",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gostdlib/com_github_cockroachdb_gostdlib-v1.19.0.zip": "c4d516bcfe8c07b6fc09b8a9a07a95065b36c2855627cb3514e40c98f872b69e",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20230118201751-21c54148d20b.zip": "ca7776f47e5fecb4c495490a679036bfc29d95bd7625290cfdb9abb0baf97476",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20231011191824-ede31f1a8e4b.zip": "548a4f3696216b6ed586dc01c9e29ddddab2b2b6c872376bd6f9e51b83cea5a4",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20231019221832-593a72bf8976.zip": "f37a56b82a2106551b09bb776c664d64d1df576d941df566de081e3fc2a27541",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.5.zip": "11b30528eb0dafc8bc1a5ba39d81277c257cbe6946a7564402f588357c164560",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/returncheck/com_github_cockroachdb_returncheck-v0.0.0-20200612231554-92cdbca611dd.zip": "ce92ba4352deec995b1f2eecf16eba7f5d51f5aa245a1c362dfe24c83d31f82b",
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/stress/com_github_cockroachdb_stress-v0.0.0-20220803192808-1806698b1b7b.zip": "3fda531795c600daf25532a4f98be2a1335cd1e5e182c72789bca79f5f69fcc1",
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ require (
github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55
github.com/cockroachdb/gostdlib v1.19.0
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b
github.com/cockroachdb/pebble v0.0.0-20231011191824-ede31f1a8e4b
github.com/cockroachdb/pebble v0.0.0-20231019221832-593a72bf8976
github.com/cockroachdb/redact v1.1.5
github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
github.com/cockroachdb/stress v0.0.0-20220803192808-1806698b1b7b
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -489,8 +489,8 @@ github.com/cockroachdb/gostdlib v1.19.0/go.mod h1:+dqqpARXbE/gRDEhCak6dm0l14AaTy
github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE=
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
github.com/cockroachdb/pebble v0.0.0-20231011191824-ede31f1a8e4b h1:/fElHApeWG4Btj37APrPuilBce1sinPUEjEXCFs8Tds=
github.com/cockroachdb/pebble v0.0.0-20231011191824-ede31f1a8e4b/go.mod h1:sEHm5NOXxyiAoKWhoFxT8xMgd/f3RA6qUqQ1BXKrh2E=
github.com/cockroachdb/pebble v0.0.0-20231019221832-593a72bf8976 h1:6r7ojt66fRPE93ygtJHUUNd3r+9mQHXpNgYEinDJKpY=
github.com/cockroachdb/pebble v0.0.0-20231019221832-593a72bf8976/go.mod h1:sEHm5NOXxyiAoKWhoFxT8xMgd/f3RA6qUqQ1BXKrh2E=
github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30=
github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
Expand Down
9 changes: 6 additions & 3 deletions pkg/ccl/storageccl/engineccl/encrypted_fs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -455,9 +455,9 @@ type errorInjector struct {
startInjecting bool
}

func (i *errorInjector) MaybeError(op errorfs.Op, path string) error {
if i.startInjecting && op.OpKind() == errorfs.OpKindWrite &&
!strings.HasPrefix(path, "TEST") && i.rand.Float64() < i.prob {
func (i *errorInjector) MaybeError(op errorfs.Op) error {
if i.startInjecting && op.Kind.ReadOrWrite() == errorfs.OpIsWrite &&
!strings.HasPrefix(op.Path, "TEST") && i.rand.Float64() < i.prob {
return errors.WithStack(errorfs.ErrInjected)
}
return nil
Expand All @@ -467,6 +467,9 @@ func (i *errorInjector) startErrors() {
i.startInjecting = true
}

// String implements fmt.Stringer.
func (i *errorInjector) String() string { return "<opaque>" }

// testFS is the interface implemented by a plain FS and encrypted FS being
// tested.
type testFS interface {
Expand Down

0 comments on commit 66c3e60

Please sign in to comment.