Skip to content

Commit

Permalink
Merge #50394 #50395
Browse files Browse the repository at this point in the history 
50394: vendor: bump Pebble to bc7bb07c r=jbowens a=jbowens

```
bc7bb07 tool: Enhance lsm visualization to show L0 sublevels
6b96ab6 internal/manifest: rename L0Sublevels.Files to L0Sublevels.Levels
0b22ec2 internal/manifest: rename Version.Files to Version.Levels
3b241b7 db: implement min-overlapping ratio heuristic
7ad569c use lockfree rand for skiplist
eb0a851 db: fix race in NewSnapshot
e941125 db: fix Checkpoint race condition
81f4ebe cmd/pebble: replace keys/sec with ops/sec(cum)
```

50395: c-deps/rocksdb: update to 2512e96f r=jbowens a=jbowens

```
069b29cae backport of facebook/rocksdb#6973
f928a7207 RocksDB Cmake changes for Arm64 CRC32 Optimization (#5304)
```

Co-authored-by: Jackson Owens <[email protected]>
  • Loading branch information
@jbowens
craig[bot] and jbowens committed Jun 18, 2020
3 parents 993ec11 + bd2702d + 27eb88c commit 264ab25
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions Gopkg.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion c-deps/rocksdb
Submodule rocksdb updated 5 files
+15 −1 CMakeLists.txt
+25 −5 db/db_impl.cc
+2 −0 db/db_impl.h
+4 −2 db/db_iter.cc
+88 −0 db/db_test2.cc
2 changes: 1 addition & 1 deletion vendor
Submodule vendor updated 23 files
+10 −3 github.com/cockroachdb/pebble/checkpoint.go
+15 −6 github.com/cockroachdb/pebble/compaction.go
+102 −52 github.com/cockroachdb/pebble/compaction_picker.go
+41 −14 github.com/cockroachdb/pebble/db.go
+21 −0 github.com/cockroachdb/pebble/event.go
+1 −0 github.com/cockroachdb/pebble/flush_external.go
+2 −2 github.com/cockroachdb/pebble/get_iter.go
+19 −3 github.com/cockroachdb/pebble/ingest.go
+2 −12 github.com/cockroachdb/pebble/internal/arenaskl/skl.go
+13 −0 github.com/cockroachdb/pebble/internal/fastrand/fastrand.go
+29 −29 github.com/cockroachdb/pebble/internal/manifest/l0_sublevels.go
+57 −23 github.com/cockroachdb/pebble/internal/manifest/version.go
+14 −14 github.com/cockroachdb/pebble/internal/manifest/version_edit.go
+16 −16 github.com/cockroachdb/pebble/level_checker.go
+4 −0 github.com/cockroachdb/pebble/open.go
+13 −4 github.com/cockroachdb/pebble/options.go
+2 −0 github.com/cockroachdb/pebble/sstable/writer.go
+345 −0 github.com/cockroachdb/pebble/table_stats.go
+1 −1 github.com/cockroachdb/pebble/tool/db.go
+22 −0 github.com/cockroachdb/pebble/tool/lsm.go
+344 −162 github.com/cockroachdb/pebble/tool/lsm_data.go
+6 −6 github.com/cockroachdb/pebble/tool/manifest.go
+7 −7 github.com/cockroachdb/pebble/version_set.go

0 comments on commit 264ab25

Please sign in to comment.