Skip to content

Commit

Permalink
Merge #41080
Browse files Browse the repository at this point in the history 
41080: vendor: No-change bump to pebble r=itsbilal a=itsbilal

This bump lets us pick up some iterator fixes in pebble, some
RocksDB manifest compatibility fixes, as well as debug tool
checks.

All pebble changes picked up:
cockroachdb/pebble@efdb7f6...1acac20

Release note: None

Release justification: Improves debugging capability, low-risk
because pebble is currently only used to write to sstables.

Co-authored-by: Bilal Akhtar <bilal@cockroachlabs.com>
  • Loading branch information
@itsbilal
craig[bot] and itsbilal committed Sep 26, 2019
2 parents 33febfc + 387d3d4 commit 6939978
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 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 vendor
Submodule vendor updated 47 files
+24 −15 github.com/cockroachdb/pebble/.travis.yml
+10 −0 github.com/cockroachdb/pebble/Makefile
+5 −1 github.com/cockroachdb/pebble/README.md
+91 −85 github.com/cockroachdb/pebble/batch.go
+13 −15 github.com/cockroachdb/pebble/cache/clockpro.go
+15 −7 github.com/cockroachdb/pebble/commit.go
+31 −16 github.com/cockroachdb/pebble/compaction.go
+96 −67 github.com/cockroachdb/pebble/db.go
+1 −1 github.com/cockroachdb/pebble/filenames.go
+2 −1 github.com/cockroachdb/pebble/go.mod
+2 −0 github.com/cockroachdb/pebble/go.sum
+11 −3 github.com/cockroachdb/pebble/ingest.go
+4 −0 github.com/cockroachdb/pebble/internal/arenaskl/arena.go
+1 −1 github.com/cockroachdb/pebble/internal/arenaskl/flush_iterator.go
+12 −18 github.com/cockroachdb/pebble/internal/arenaskl/iterator.go
+1 −1 github.com/cockroachdb/pebble/internal/arenaskl/skl.go
+11 −14 github.com/cockroachdb/pebble/internal/base/filenames.go
+22 −22 github.com/cockroachdb/pebble/internal/base/iterator.go
+3 −6 github.com/cockroachdb/pebble/internal/base/options.go
+3 −0 github.com/cockroachdb/pebble/internal/batchskl/skl.go
+7 −0 github.com/cockroachdb/pebble/internal/crc/crc.go
+126 −36 github.com/cockroachdb/pebble/internal/manifest/version.go
+157 −46 github.com/cockroachdb/pebble/internal/manifest/version_edit.go
+122 −40 github.com/cockroachdb/pebble/internal/rangedel/fragmenter.go
+17 −15 github.com/cockroachdb/pebble/internal/rangedel/iter.go
+33 −16 github.com/cockroachdb/pebble/internal/record/log_writer.go
+0 −24 github.com/cockroachdb/pebble/level_iter.go
+3 −0 github.com/cockroachdb/pebble/mem_table.go
+147 −155 github.com/cockroachdb/pebble/merging_iter.go
+54 −70 github.com/cockroachdb/pebble/open.go
+0 −10 github.com/cockroachdb/pebble/sstable/block.go
+12 −40 github.com/cockroachdb/pebble/sstable/reader.go
+67 −58 github.com/cockroachdb/pebble/sstable/table.go
+2 −1 github.com/cockroachdb/pebble/sstable/writer.go
+1 −1 github.com/cockroachdb/pebble/table_cache.go
+60 −0 github.com/cockroachdb/pebble/tool/make_incorrect_manifests.go
+120 −9 github.com/cockroachdb/pebble/tool/manifest.go
+19 −4 github.com/cockroachdb/pebble/tool/sstable.go
+7 −0 github.com/cockroachdb/pebble/tool/tool.go
+6 −4 github.com/cockroachdb/pebble/tool/wal.go
+105 −32 github.com/cockroachdb/pebble/version_set.go
+73 −0 github.com/cockroachdb/pebble/vfs/clone.go
+16 −0 github.com/cockroachdb/pebble/vfs/dir_unix.go
+30 −0 github.com/cockroachdb/pebble/vfs/dir_windows.go
+2 −0 github.com/cockroachdb/pebble/vfs/file_lock_windows.go
+46 −18 github.com/cockroachdb/pebble/vfs/mem_fs.go
+19 −5 github.com/cockroachdb/pebble/vfs/vfs.go

0 comments on commit 6939978

Please sign in to comment.