andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make range deletion inclusive-exclusive

Browse Source 
Summary:
This makes it easier to implement future optimizations like range collapsing.
Closes https://github.com/facebook/rocksdb/pull/1504

Differential Revision: D4172214

Pulled By: ajkr

fbshipit-source-id: ac4942f
This commit is contained in:
Andrew Kryczka 2016-11-14 17:35:17 -08:00 committed by Facebook Github Bot
parent 425210cc48
commit 6c57952002
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
db/flush_job_test.cc
View File

@ -125,9 +125,9 @@ TEST_F(FlushJobTest, NonEmpty) {
inserted_keys.insert({internal_key.Encode().ToString(), value}); inserted_keys.insert({internal_key.Encode().ToString(), value});
} }
} }
new_mem->Add(SequenceNumber(10000), kTypeRangeDeletion, "9995", "9999"); new_mem->Add(SequenceNumber(10000), kTypeRangeDeletion, "9995", "9999a");
InternalKey internal_key("9995", SequenceNumber(10000), kTypeRangeDeletion); InternalKey internal_key("9995", SequenceNumber(10000), kTypeRangeDeletion);
inserted_keys.insert({internal_key.Encode().ToString(), "9999"}); inserted_keys.insert({internal_key.Encode().ToString(), "9999a"});
autovector<MemTable*> to_delete; autovector<MemTable*> to_delete;
cfd->imm()->Add(new_mem, &to_delete); cfd->imm()->Add(new_mem, &to_delete);
@ -147,7 +147,7 @@ TEST_F(FlushJobTest, NonEmpty) {
ASSERT_OK(flush_job.Run(&fd)); ASSERT_OK(flush_job.Run(&fd));
mutex_.Unlock(); mutex_.Unlock();
ASSERT_EQ(ToString(0), fd.smallest.user_key().ToString()); ASSERT_EQ(ToString(0), fd.smallest.user_key().ToString());
ASSERT_EQ(ToString(9999), ASSERT_EQ("9999a",
fd.largest.user_key().ToString()); // range tombstone end key fd.largest.user_key().ToString()); // range tombstone end key
ASSERT_EQ(1, fd.smallest_seqno); ASSERT_EQ(1, fd.smallest_seqno);
ASSERT_EQ(10000, fd.largest_seqno); // range tombstone seqnum 10000 ASSERT_EQ(10000, fd.largest_seqno); // range tombstone seqnum 10000

2
db/range_del_aggregator.cc
View File

@ -41,7 +41,7 @@ bool RangeDelAggregator::ShouldDelete(const ParsedInternalKey& parsed) {
break; break;
} }
if (parsed.sequence < tombstone.seq_ && if (parsed.sequence < tombstone.seq_ &&
icmp_.user_comparator()->Compare(parsed.user_key, tombstone.end_key_) <= icmp_.user_comparator()->Compare(parsed.user_key, tombstone.end_key_) <
0) { 0) {
return true; return true;
} }