Merge #31700

31700: c-deps: bump RocksDB to pick up more range deletion fixes r=petermattis a=benesch Picks up cockroachdb/rocksdb#17 and cockroachdb/rocksdb#18, which fix a rare edge case in which keys could go missing if a range deletion spanned SSTs in the wrong way. Release note: None Co-authored-by: Nikhil Benesch <[email protected]>
cockroachdb · Oct 26, 2018 · 1bc1bb0 · 1bc1bb0
2 parents 09d139a + 9fb8899
commit 1bc1bb0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/c-deps/rocksdb b/c-deps/rocksdb
diff --git a/pkg/storage/engine/rocksdb_test.go b/pkg/storage/engine/rocksdb_test.go
@@ -1389,9 +1389,9 @@ func TestRocksDBDeleteRangeCompaction(t *testing.T) {
 	// sstable being deleted. Prior to the hack in dbClearRange, all of the
 	// sstables would be compacted resulting in 2 L6 sstables with different
 	// boundaries than the ones below.
-	_ = db.CompactRange(makeKey("c", 0), makeKey("c", numEntries), false)
+	_ = db.CompactRange(makeKey("c", 1), makeKey("c", numEntries), false)
 	verifySSTables(`
-5: "a000000000" - "a000000000"
+5: "a000000000" - "c000000000"
 6: "a000000000" - "a000009999"
 6: "b000000000" - "b000009999"
 `)