From 64e135311052324bc3aec5b61d74acdb0b986a37 Mon Sep 17 00:00:00 2001 From: Jackson Owens Date: Thu, 3 Nov 2022 14:00:08 -0400 Subject: [PATCH] vendor: bump Pebble to 7486bbcf2861 ``` 7486bbcf db: fix levelIter TrySeekUsingNext optimization 13fbed20 sstable: optimize SeekPrefixGE for two-level indices to use trySeekUsingNext 948d4a01 db: allow for tuning point tombstone weight 8b31184d db: add Experimental.LevelMultiplier option 418733ae db: add LazyValue for a value that may not be stored in-place with the key b53472d0 db: apply TrySeekUsingNext to level metadata b5deee5d tool: print input, output, deleted and moved bytes in compaction tool ``` Release note: None --- DEPS.bzl | 6 +++--- build/bazelutil/distdir_files.bzl | 2 +- go.mod | 2 +- go.sum | 4 ++-- pkg/storage/mvcc_history_test.go | 6 +++++- vendor | 2 +- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/DEPS.bzl b/DEPS.bzl index e5c3b5d7769a..ea856a896f92 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 = "c710c3c2c58e5ba6db43e59d922f45b68abcf805cf56426987af81358e5f656f", - strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20221028144205-37cf5274896b", + sha256 = "b376f29a03170087d45952d3a6878397f2873dbd0fbb6c712604325efc859ef4", + strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20221103174942-7486bbcf2861", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20221028144205-37cf5274896b.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20221103174942-7486bbcf2861.zip", ], ) go_repository( diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl index 3984ab7418e3..b786741bac2d 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-20221028144205-37cf5274896b.zip": "c710c3c2c58e5ba6db43e59d922f45b68abcf805cf56426987af81358e5f656f", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20221103174942-7486bbcf2861.zip": "b376f29a03170087d45952d3a6878397f2873dbd0fbb6c712604325efc859ef4", "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 b79be63b4a55..e644be99aa94 100644 --- a/go.mod +++ b/go.mod @@ -111,7 +111,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-20221028144205-37cf5274896b + github.com/cockroachdb/pebble v0.0.0-20221103174942-7486bbcf2861 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 b11ae291e5b4..36e01789d922 100644 --- a/go.sum +++ b/go.sum @@ -456,8 +456,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-20221028144205-37cf5274896b h1:u6yyw2Yg7omdpnjb661XZc5s9VK/MLtDZPGHspNMAFg= -github.com/cockroachdb/pebble v0.0.0-20221028144205-37cf5274896b/go.mod h1:qf9bLis2yy1XyNYD01wvIHPabuC1STzQsvGibYVsom4= +github.com/cockroachdb/pebble v0.0.0-20221103174942-7486bbcf2861 h1:YarvrMA6pv032mYkBakTCkzqKpatcAZrdIknHJv+yVg= +github.com/cockroachdb/pebble v0.0.0-20221103174942-7486bbcf2861/go.mod h1:qf9bLis2yy1XyNYD01wvIHPabuC1STzQsvGibYVsom4= github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5wfSQ= github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd h1:KFOt5I9nEKZgCnOSmy8r4Oykh8BYQO8bFOTgHDS8YZA= diff --git a/pkg/storage/mvcc_history_test.go b/pkg/storage/mvcc_history_test.go index f090fb37f118..ca8789bdb9c8 100644 --- a/pkg/storage/mvcc_history_test.go +++ b/pkg/storage/mvcc_history_test.go @@ -259,7 +259,7 @@ func TestMVCCHistories(t *testing.T) { return err } defer func() { _ = iter.Close() }() - for k, v := iter.SeekGE(nil, sstable.SeekGEFlags(0)); k != nil; k, v = iter.Next() { + for k, lv := iter.SeekGE(nil, sstable.SeekGEFlags(0)); k != nil; k, lv = iter.Next() { if err := iter.Error(); err != nil { return err } @@ -267,6 +267,10 @@ func TestMVCCHistories(t *testing.T) { if err != nil { return err } + v, _, err := lv.Value(nil) + if err != nil { + return err + } value, err := storage.DecodeMVCCValue(v) if err != nil { return err diff --git a/vendor b/vendor index 025290f349e3..d11e8b15f3b8 160000 --- a/vendor +++ b/vendor @@ -1 +1 @@ -Subproject commit 025290f349e318479bce4925869948f366309443 +Subproject commit d11e8b15f3b888be23715edf1994af5cb5b4e093