diff --git a/DEPS.bzl b/DEPS.bzl index 1141a3f1d006..7bbb66cdf6ec 100644 --- a/DEPS.bzl +++ b/DEPS.bzl @@ -1427,10 +1427,10 @@ def go_deps(): patches = [ "@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch", ], - sha256 = "ec4ac067a239d05ea2c7b7d0ffccdcf7546ba6835da701595217fe7dfaadcb31", - strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20220624201436-71d17c2a007b", + sha256 = "41cee4a297dc7e9242c4e821832973c4470ed86c902b979c61d4925512a8756b", + strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20220627233705-85bb1c759894", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20220624201436-71d17c2a007b.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20220627233705-85bb1c759894.zip", ], ) go_repository( diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl index f4ec26515234..3e0f1b429d5d 100644 --- a/build/bazelutil/distdir_files.bzl +++ b/build/bazelutil/distdir_files.bzl @@ -187,7 +187,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.13.0.zip": "b3d43d8f95edf65f73a5348f29e1159823cac64b148f8d3bb48340bf55d70872", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20211118104740-dabe8e521a4f.zip": "1972c3f171f118add3fd9e64bcea6cbb9959a3b7fa0ada308e8a7310813fea74", - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20220624201436-71d17c2a007b.zip": "ec4ac067a239d05ea2c7b7d0ffccdcf7546ba6835da701595217fe7dfaadcb31", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20220627233705-85bb1c759894.zip": "41cee4a297dc7e9242c4e821832973c4470ed86c902b979c61d4925512a8756b", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.3.zip": "7778b1e4485e4f17f35e5e592d87eb99c29e173ac9507801d000ad76dd0c261e", "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/sentry-go/com_github_cockroachdb_sentry_go-v0.6.1-cockroachdb.2.zip": "fbb2207d02aecfdd411b1357efe1192dbb827959e36b7cab7491731ac55935c9", diff --git a/go.mod b/go.mod index 89231375b69c..afadc87c7d56 100644 --- a/go.mod +++ b/go.mod @@ -47,7 +47,7 @@ require ( github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55 github.com/cockroachdb/gostdlib v1.13.0 github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f - github.com/cockroachdb/pebble v0.0.0-20220624201436-71d17c2a007b + github.com/cockroachdb/pebble v0.0.0-20220627233705-85bb1c759894 github.com/cockroachdb/redact v1.1.3 github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd github.com/cockroachdb/stress v0.0.0-20220310203902-58fb4627376e diff --git a/go.sum b/go.sum index b1527100d7ce..b51ddfbc826d 100644 --- a/go.sum +++ b/go.sum @@ -468,8 +468,8 @@ github.com/cockroachdb/gostdlib v1.13.0/go.mod h1:eXX95p9QDrYwJfJ6AgeN9QnRa/lqqi github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f h1:6jduT9Hfc0njg5jJ1DdKCFPdMBrp/mdZfCpa5h+WM74= github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= -github.com/cockroachdb/pebble v0.0.0-20220624201436-71d17c2a007b h1:4IzbYFgF+NdvAZDMUgV1nEVszyHH3i8kgplHFfAwruk= -github.com/cockroachdb/pebble v0.0.0-20220624201436-71d17c2a007b/go.mod h1:pr479tNxFRmcfDyklTqoRMDDVmRlEbL+d7a7rhKnrI4= +github.com/cockroachdb/pebble v0.0.0-20220627233705-85bb1c759894 h1:UQ6vBnOM2Ru+UThk+GusrFYUFz8d8f+F5kFtfE2yOdQ= +github.com/cockroachdb/pebble v0.0.0-20220627233705-85bb1c759894/go.mod h1:pr479tNxFRmcfDyklTqoRMDDVmRlEbL+d7a7rhKnrI4= github.com/cockroachdb/redact v1.0.8/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5wfSQ= github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= diff --git a/pkg/storage/BUILD.bazel b/pkg/storage/BUILD.bazel index 9251142095c8..5fce60a01a30 100644 --- a/pkg/storage/BUILD.bazel +++ b/pkg/storage/BUILD.bazel @@ -80,6 +80,7 @@ go_library( "@com_github_cockroachdb_logtags//:logtags", "@com_github_cockroachdb_pebble//:pebble", "@com_github_cockroachdb_pebble//bloom", + "@com_github_cockroachdb_pebble//rangekey", "@com_github_cockroachdb_pebble//record", "@com_github_cockroachdb_pebble//sstable", "@com_github_cockroachdb_pebble//vfs", diff --git a/pkg/storage/pebble.go b/pkg/storage/pebble.go index e86107e12d02..8df7fc919d0b 100644 --- a/pkg/storage/pebble.go +++ b/pkg/storage/pebble.go @@ -49,6 +49,7 @@ import ( "github.com/cockroachdb/logtags" "github.com/cockroachdb/pebble" "github.com/cockroachdb/pebble/bloom" + "github.com/cockroachdb/pebble/rangekey" "github.com/cockroachdb/pebble/sstable" "github.com/cockroachdb/pebble/vfs" "github.com/cockroachdb/redact" @@ -358,7 +359,7 @@ func (tc *pebbleDataBlockMVCCTimeIntervalRangeCollector) Add( ) error { // TODO(erikgrinaker): should reuse a buffer for keysDst, but keyspan.Key is // not exported by Pebble. - span, err := sstable.DecodeRangeKey(key, value, nil) + span, err := rangekey.Decode(key, value, nil) if err != nil { return errors.Wrapf(err, "decoding range key at %s", key) } diff --git a/vendor b/vendor index 951dbe569a7d..4801ff7a272f 160000 --- a/vendor +++ b/vendor @@ -1 +1 @@ -Subproject commit 951dbe569a7d7eacf3aea38241ac483eaf23468a +Subproject commit 4801ff7a272f9cbfa3e1addfd2ba159d20be4fe9