From ed343ba4df2305b83a894c529497ed71e651c8aa Mon Sep 17 00:00:00 2001 From: Nick Travers Date: Wed, 2 Feb 2022 10:35:21 -0800 Subject: [PATCH] vendor: bump Pebble to 38b68e17aa97 Pebble commits: ``` 38b68e17 internal/batchskl: return error on index overflow 8440f290 internal/manifest: use a line sweep to optimize NewL0Sublevels 0f5acb26 sstable: add direct block reading to suffix rewriter 26856d10 db: avoid stats flake in TestMemTableReservation b452808f sstable: Make sstable Writer.Close idempotent 17fe1a65 sstable: add RewriteKeySuffixes function c9e6edfc db: expose metrics on count and earliest seqnum of snapshots b958d9a7 sstable: add a writeQueue to the sstable writer c8dad06c db: disable automatic compactions in `MetricsTest` 015f5e38 internal/rangekey: fix range key iteration bug The commit 38b68e17 contains the fix for #69906. ``` Closes #69906. Release note: none --- DEPS.bzl | 6 +++--- go.mod | 2 +- go.sum | 4 ++-- vendor | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/DEPS.bzl b/DEPS.bzl index 3760e715deed..8667ebb14217 100644 --- a/DEPS.bzl +++ b/DEPS.bzl @@ -1263,10 +1263,10 @@ def go_deps(): patches = [ "@cockroach//build/patches:com_github_cockroachdb_pebble.patch", ], - sha256 = "0018bcef357bf7bba06d5e3eb35277709b5fd98ee437924001531fa935d8c76d", - strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20220126162719-a5c1766b568a", + sha256 = "e411c1b5f5c7d2ef9dc337615de7b51051a182bba9c298f540d74d95d8a8f279", + strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20220201221612-38b68e17aa97", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20220126162719-a5c1766b568a.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20220201221612-38b68e17aa97.zip", ], ) go_repository( diff --git a/go.mod b/go.mod index 144730b939c3..904b6fceff6c 100644 --- a/go.mod +++ b/go.mod @@ -43,7 +43,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-20220126162719-a5c1766b568a + github.com/cockroachdb/pebble v0.0.0-20220201221612-38b68e17aa97 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 index 050463e12415..460fc5b70cb4 100644 --- a/go.sum +++ b/go.sum @@ -427,8 +427,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-20220126162719-a5c1766b568a h1:JY8MIjk2GyMHjCqmHkNBekLi2N/kNS3uAKheGe78huM= -github.com/cockroachdb/pebble v0.0.0-20220126162719-a5c1766b568a/go.mod h1:buxOO9GBtOcq1DiXDpIPYrmxY020K2A8lOrwno5FetU= +github.com/cockroachdb/pebble v0.0.0-20220201221612-38b68e17aa97 h1:zHSurQDtRibMUCQnJhUeV96D5tO8Vq9L39L/xr4BayI= +github.com/cockroachdb/pebble v0.0.0-20220201221612-38b68e17aa97/go.mod h1:buxOO9GBtOcq1DiXDpIPYrmxY020K2A8lOrwno5FetU= github.com/cockroachdb/redact v1.0.8/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/cockroachdb/redact v1.1.1/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5wfSQ= diff --git a/vendor b/vendor index 6c582acbc4a7..ed53f102e86b 160000 --- a/vendor +++ b/vendor @@ -1 +1 @@ -Subproject commit 6c582acbc4a78cdeaf1b117e7df8527e881b90c7 +Subproject commit ed53f102e86b51c228b61d3ad54f1428982fe75e