From 3a8c331aa6cfa1059a7ec38e123b85a6f782f4ee Mon Sep 17 00:00:00 2001 From: Nick Travers Date: Thu, 20 Oct 2022 16:22:27 -0700 Subject: [PATCH] vendor: bump Pebble to 0d8cae91763c ``` 0d8cae91 manifest: unref files with range keys when version refcnt is zero 8ed3a9e4 metamorphic: Flush before close if DisableWAL is true 4f0ec6bd db: fix FormatPrePebblev1Marked migration ab1e28f6 metamorphic: Copy data/wal dirs from initial state ``` Release note: None. Release justification: Fixes a high severity issue. Epic: None. Informs #90149. --- DEPS.bzl | 6 +++--- build/bazelutil/distdir_files.bzl | 2 +- go.mod | 2 +- go.sum | 4 ++-- vendor | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/DEPS.bzl b/DEPS.bzl index f492d6e28467..caaa638b61a3 100644 --- a/DEPS.bzl +++ b/DEPS.bzl @@ -1425,10 +1425,10 @@ def go_deps(): patches = [ "@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch", ], - sha256 = "abbea9a211cc11eafcc2b51993ebc52929ce0348a575a41de18e22ec33a8bd11", - strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20221019003737-20de6220b828", + sha256 = "ee2a03b3cb1ed2dcdb10f428b54cad0070441f8b5d419d2c34d6e119f56d313b", + strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20221020225018-0d8cae91763c", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20221019003737-20de6220b828.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20221020225018-0d8cae91763c.zip", ], ) go_repository( diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl index a646627c9c00..63b082d744bf 100644 --- a/build/bazelutil/distdir_files.bzl +++ b/build/bazelutil/distdir_files.bzl @@ -186,7 +186,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-20221019003737-20de6220b828.zip": "abbea9a211cc11eafcc2b51993ebc52929ce0348a575a41de18e22ec33a8bd11", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20221020225018-0d8cae91763c.zip": "ee2a03b3cb1ed2dcdb10f428b54cad0070441f8b5d419d2c34d6e119f56d313b", "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 840d3de2fad5..166bc7540fc0 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-20221019003737-20de6220b828 + github.com/cockroachdb/pebble v0.0.0-20221020225018-0d8cae91763c github.com/cockroachdb/redact v1.1.3 github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd github.com/cockroachdb/stress v0.0.0-20220803192808-1806698b1b7b diff --git a/go.sum b/go.sum index 141cc1cb1ca7..404a5a79b23b 100644 --- a/go.sum +++ b/go.sum @@ -470,8 +470,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-20221019003737-20de6220b828 h1:WvnQaA9W42RknnRpkje26a8od1m86ay3F/j26q9bblU= -github.com/cockroachdb/pebble v0.0.0-20221019003737-20de6220b828/go.mod h1:890yq1fUb9b6dGNwssgeUO5vQV9qfXnCPxAJhBQfXw0= +github.com/cockroachdb/pebble v0.0.0-20221020225018-0d8cae91763c h1:Jxl/sW2tHdTCSMyp8pV4GDHIdMVFtcgxK4F725WnSfc= +github.com/cockroachdb/pebble v0.0.0-20221020225018-0d8cae91763c/go.mod h1:890yq1fUb9b6dGNwssgeUO5vQV9qfXnCPxAJhBQfXw0= 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/vendor b/vendor index ca891bf12f84..c1bb03b2eb5c 160000 --- a/vendor +++ b/vendor @@ -1 +1 @@ -Subproject commit ca891bf12f84afc398fdf2be1cf937fcf6eff867 +Subproject commit c1bb03b2eb5c85b4b2375db6aad6812b256dffb0