Merge #70212

70212: vendor: bump Pebble to 0f7e73483566 r=bananabrick a=bananabrick 557c7059 pebble: Export table cache related constants for use in cockroach baf10971 db: improve use-after-free test coverage for compactions Release note: None Co-authored-by: Arjun Nair <[email protected]>
cockroachdb · Sep 14, 2021 · b4ad7fe · b4ad7fe
2 parents a79a082 + a8c3a39
commit b4ad7fe
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/DEPS.bzl b/DEPS.bzl
@@ -648,8 +648,8 @@ def go_deps():
         name = "com_github_cockroachdb_pebble",
         build_file_proto_mode = "disable_global",
         importpath = "github.com/cockroachdb/pebble",
-        sum = "h1:N3usKNz4UIz0BbMvDoHzra+BkG7/Uy8qG3figVLRotY=",
-        version = "v0.0.0-20210913202921-bd92c6f1b074",
+        sum = "h1:NBzearGbADR609fptc7ATDj14I2Gji7ne2mphj0j+r4=",
+        version = "v0.0.0-20210914174700-0f7e73483566",
     )
 
     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-20210913202921-bd92c6f1b074
+	github.com/cockroachdb/pebble v0.0.0-20210914174700-0f7e73483566
 	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
@@ -279,8 +279,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-20210913202921-bd92c6f1b074 h1:N3usKNz4UIz0BbMvDoHzra+BkG7/Uy8qG3figVLRotY=
-github.com/cockroachdb/pebble v0.0.0-20210913202921-bd92c6f1b074/go.mod h1:JXfQr3d+XO4bL1pxGwKKo09xylQSdZ/mpZ9b2wfVcPs=
+github.com/cockroachdb/pebble v0.0.0-20210914174700-0f7e73483566 h1:NBzearGbADR609fptc7ATDj14I2Gji7ne2mphj0j+r4=
+github.com/cockroachdb/pebble v0.0.0-20210914174700-0f7e73483566/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
+41 −0		github.com/cockroachdb/pebble/compaction_iter.go
+5 −5		github.com/cockroachdb/pebble/db.go
+3 −3		github.com/cockroachdb/pebble/internal/cache/value_invariants.go
+3 −3		github.com/cockroachdb/pebble/open.go
+4 −0		github.com/cockroachdb/pebble/sstable/block.go
+1 −1		modules.txt