Skip to content

Commit

Permalink
vendor: bump Pebble to 7486bbcf2861
Browse files Browse the repository at this point in the history
```
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
  • Loading branch information
jbowens committed Nov 4, 2022
1 parent c57b340 commit 64e1353
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 9 deletions.
6 changes: 3 additions & 3 deletions DEPS.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion build/bazelutil/distdir_files.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
6 changes: 5 additions & 1 deletion pkg/storage/mvcc_history_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -259,14 +259,18 @@ 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
}
key, err := storage.DecodeMVCCKey(k.UserKey)
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
Expand Down
2 changes: 1 addition & 1 deletion vendor
Submodule vendor updated 29 files
+68 −76 github.com/cockroachdb/pebble/batch.go
+12 −2 github.com/cockroachdb/pebble/compaction_iter.go
+24 −16 github.com/cockroachdb/pebble/compaction_picker.go
+14 −14 github.com/cockroachdb/pebble/error_iter.go
+20 −14 github.com/cockroachdb/pebble/external_iterator.go
+15 −23 github.com/cockroachdb/pebble/get_iter.go
+13 −9 github.com/cockroachdb/pebble/internal/arenaskl/flush_iterator.go
+28 −28 github.com/cockroachdb/pebble/internal/arenaskl/iterator.go
+23 −20 github.com/cockroachdb/pebble/internal/base/iterator.go
+256 −0 github.com/cockroachdb/pebble/internal/base/lazy_value.go
+33 −23 github.com/cockroachdb/pebble/internal/keyspan/interleaving_iter.go
+11 −11 github.com/cockroachdb/pebble/internal/keyspan/internal_iter_shim.go
+101 −27 github.com/cockroachdb/pebble/iterator.go
+9 −4 github.com/cockroachdb/pebble/level_checker.go
+109 −55 github.com/cockroachdb/pebble/level_iter.go
+1 −1 github.com/cockroachdb/pebble/mem_table.go
+51 −32 github.com/cockroachdb/pebble/merging_iter.go
+3 −1 github.com/cockroachdb/pebble/merging_iter_heap.go
+26 −1 github.com/cockroachdb/pebble/options.go
+13 −9 github.com/cockroachdb/pebble/range_keys.go
+40 −34 github.com/cockroachdb/pebble/sstable/block.go
+8 −2 github.com/cockroachdb/pebble/sstable/block_property.go
+2 −14 github.com/cockroachdb/pebble/sstable/raw_block.go
+168 −146 github.com/cockroachdb/pebble/sstable/reader.go
+7 −2 github.com/cockroachdb/pebble/sstable/suffix_rewriter.go
+6 −3 github.com/cockroachdb/pebble/tool/find.go
+133 −76 github.com/cockroachdb/pebble/tool/logs/compaction.go
+7 −1 github.com/cockroachdb/pebble/tool/sstable.go
+1 −1 modules.txt

0 comments on commit 64e1353

Please sign in to comment.