From b385a38b6d3f32b91280669286a4846f369581e1 Mon Sep 17 00:00:00 2001 From: Jackson Owens Date: Fri, 9 Dec 2022 11:16:48 -0500 Subject: [PATCH] vendor: bump Pebble to 3a7548740b00 ``` 3a754874 sstable: don't fatal if file no longer exists during readahead 837b5c6f metamorphic: prevent directory collisions ``` Release note: None --- 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 eabe1e83e27a..e79ef3872e8b 100644 --- a/DEPS.bzl +++ b/DEPS.bzl @@ -1307,10 +1307,10 @@ def go_deps(): patches = [ "@cockroach//build/patches:com_github_cockroachdb_pebble.patch", ], - sha256 = "ef66f3bb441a5b6b67982a266eddaf14f4e2f34fbea85ef30fef90174b2e194b", - strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20221110182450-11d901e8d438", + sha256 = "3df3710dfd636430a22632f53033a1fa8231827fc78cb5261874c2895fd5519a", + strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20221207173311-3a7548740b00", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20221110182450-11d901e8d438.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20221207173311-3a7548740b00.zip", ], ) go_repository( diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl index 878a5c818ce0..55667eba2fe9 100644 --- a/build/bazelutil/distdir_files.bzl +++ b/build/bazelutil/distdir_files.bzl @@ -176,7 +176,7 @@ DISTDIR_FILES = { "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/panicparse/v2/com_github_cockroachdb_panicparse_v2-v2.0.0-20211103220158-604c82a44f1e.zip": "a51ff19f83c9a1e468b5d722d0857eb468d0f9baa29365e700c2e6ec24bd47a7", - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20221110182450-11d901e8d438.zip": "ef66f3bb441a5b6b67982a266eddaf14f4e2f34fbea85ef30fef90174b2e194b", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20221207173311-3a7548740b00.zip": "3df3710dfd636430a22632f53033a1fa8231827fc78cb5261874c2895fd5519a", "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 8448edbe827c..4591213df08d 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-20221110182450-11d901e8d438 + github.com/cockroachdb/pebble v0.0.0-20221207173311-3a7548740b00 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 4ff574791dc8..12e5d0d2af29 100644 --- a/go.sum +++ b/go.sum @@ -442,8 +442,8 @@ github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f h1:6jduT9Hfc0n github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= github.com/cockroachdb/panicparse/v2 v2.0.0-20211103220158-604c82a44f1e h1:FrERdkPlRj+v7fc+PGpey3GUiDGuTR5CsmLCA54YJ8I= github.com/cockroachdb/panicparse/v2 v2.0.0-20211103220158-604c82a44f1e/go.mod h1:pMxsKyCewnV3xPaFvvT9NfwvDTcIx2Xqg0qL5Gq0SjM= -github.com/cockroachdb/pebble v0.0.0-20221110182450-11d901e8d438 h1:oDqLSCzPnmPV4Mn3/WqI4oj46e0nxqhoc65D4sqzmGQ= -github.com/cockroachdb/pebble v0.0.0-20221110182450-11d901e8d438/go.mod h1:buxOO9GBtOcq1DiXDpIPYrmxY020K2A8lOrwno5FetU= +github.com/cockroachdb/pebble v0.0.0-20221207173311-3a7548740b00 h1:GfxBS4WM0SAvl1usdkf7EHBjFE+ZPEtSSPkWA7yz7DQ= +github.com/cockroachdb/pebble v0.0.0-20221207173311-3a7548740b00/go.mod h1:buxOO9GBtOcq1DiXDpIPYrmxY020K2A8lOrwno5FetU= 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 b61820f54297..1e8a863e68d6 160000 --- a/vendor +++ b/vendor @@ -1 +1 @@ -Subproject commit b61820f54297835af33f6a8dfe305677c7b05030 +Subproject commit 1e8a863e68d69368f668d93ff40c26a75c0c3443