Merge #70652

70652: vendor: bump Pebble to 031921b4 r=sumeerbhola a=sumeerbhola 031921b4 metamorphic: add keyManager abstraction and SetWithDelete bug fix 3584eb6d internal/cache: recalculate hot, cold and test stats in metaCheck 20f0f9f7 internal/cache: include countCold and sizeCold in runHandCold stack traces 7992aeaa internal/cache: add hot, cold, test entry counts Release note: None Co-authored-by: sumeerbhola <[email protected]>
cockroachdb · Sep 24, 2021 · 9167a60 · 9167a60
2 parents 6994559 + 4de8194
commit 9167a60
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/DEPS.bzl b/DEPS.bzl
@@ -651,8 +651,8 @@ def go_deps():
         name = "com_github_cockroachdb_pebble",
         build_file_proto_mode = "disable_global",
         importpath = "github.com/cockroachdb/pebble",
-        sum = "h1:1eWG3mTDzXwh7WFCZt8pO3bw/xnGLJ9kAHVmoqxDSWE=",
-        version = "v0.0.0-20210922174139-9656de4a3019",
+        sum = "h1:mrTfq/wTxwcjRvjspJpBWhhymTWu4ALjbSvhhTsktAg=",
+        version = "v0.0.0-20210923210902-031921b4a1c6",
     )
 
     go_repository(

diff --git a/go.mod b/go.mod
@@ -44,7 +44,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-20190617123548-eb05cc24525f
-	github.com/cockroachdb/pebble v0.0.0-20210922174139-9656de4a3019
+	github.com/cockroachdb/pebble v0.0.0-20210923210902-031921b4a1c6
 	github.com/cockroachdb/redact v1.1.3
 	github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
 	github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2

diff --git a/go.sum b/go.sum
@@ -280,8 +280,8 @@ github.com/cockroachdb/gostdlib v1.13.0 h1:TzSEPYgkKDNei3gbLc0rrHu4iHyBp7/+NxPOF
 github.com/cockroachdb/gostdlib v1.13.0/go.mod h1:eXX95p9QDrYwJfJ6AgeN9QnRa/lqqid9LAzWz/l5OgA=
 github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f h1:o/kfcElHqOiXqcou5a3rIlMc7oJbMQkeLk0VQJ7zgqY=
 github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
-github.com/cockroachdb/pebble v0.0.0-20210922174139-9656de4a3019 h1:1eWG3mTDzXwh7WFCZt8pO3bw/xnGLJ9kAHVmoqxDSWE=
-github.com/cockroachdb/pebble v0.0.0-20210922174139-9656de4a3019/go.mod h1:JXfQr3d+XO4bL1pxGwKKo09xylQSdZ/mpZ9b2wfVcPs=
+github.com/cockroachdb/pebble v0.0.0-20210923210902-031921b4a1c6 h1:mrTfq/wTxwcjRvjspJpBWhhymTWu4ALjbSvhhTsktAg=
+github.com/cockroachdb/pebble v0.0.0-20210923210902-031921b4a1c6/go.mod h1:JXfQr3d+XO4bL1pxGwKKo09xylQSdZ/mpZ9b2wfVcPs=
 github.com/cockroachdb/redact v1.0.8/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
 github.com/cockroachdb/redact v1.1.0/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
 github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5wfSQ=

diff --git a/vendor b/vendor
+30 −26		github.com/cockroachdb/pebble/compaction_iter.go
+3 −2		github.com/cockroachdb/pebble/internal/base/internal.go
+92 −5		github.com/cockroachdb/pebble/internal/cache/clockpro.go
+1 −1		modules.txt