From d8707c3146b0c4c2d5dc40ff1d09e4ec61590296 Mon Sep 17 00:00:00 2001 From: Peter Mattis Date: Tue, 30 Oct 2018 10:40:21 -0400 Subject: [PATCH] c-deps: bump RocksDB to pick up perf fix Pick up cockroachdb/cockroach#20 which fixes a performance regression that caused range tombstones to be added to some sstables unnecessarily which in turn could cause compactions that are larger than necessary. Revert the workaround to `TestRocksDBDeleteRangeCompaction` which was made due to the now fixed bug. Release note: None --- c-deps/rocksdb | 2 +- pkg/storage/engine/rocksdb_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/c-deps/rocksdb b/c-deps/rocksdb index e48c9a522868..7410b3efc991 160000 --- a/c-deps/rocksdb +++ b/c-deps/rocksdb @@ -1 +1 @@ -Subproject commit e48c9a522868439babe8a7d06e039fb935f45f4d +Subproject commit 7410b3efc991422436764ee503c6e0c5c6965c4b diff --git a/pkg/storage/engine/rocksdb_test.go b/pkg/storage/engine/rocksdb_test.go index 2161c6b004df..3c9d9c25308f 100644 --- 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", 1), makeKey("c", numEntries), false) + _ = db.CompactRange(makeKey("c", 0), makeKey("c", numEntries), false) verifySSTables(` -5: "a000000000" - "c000000000" +5: "a000000000" - "a000000000" 6: "a000000000" - "a000009999" 6: "b000000000" - "b000009999" `)