From 9c6fea7fe12910f07c1c8e1eb5e03c210b12e171 Mon Sep 17 00:00:00 2001
From: Abhishek Madan <abhishekmadan@fb.com>
Date: Wed, 10 Oct 2018 12:08:06 -0700
Subject: [PATCH] Update HISTORY.md, fix unity_test failure (#4479)

Summary:
Follow-up to https://github.com/facebook/rocksdb/pull/4432.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/4479

Differential Revision: D10304151

Pulled By: abhimadan

fbshipit-source-id: 3608b95c324702ca26791f95cb26dae1d49efbe7
---
 HISTORY.md                 | 1 +
 db/range_del_aggregator.cc | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 75161a326..38eade89c 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -5,6 +5,7 @@
 
 ### Bug Fixes
 * Fix corner case where a write group leader blocked due to write stall blocks other writers in queue with WriteOptions::no_slowdown set.
+* Fix in-memory range tombstone truncation to avoid erroneously covering newer keys at a lower level, and include range tombstones in compacted files whose largest key is the range tombstone's start key.
 
 ## 5.17.0 (10/05/2018)
 ### Public API Change
diff --git a/db/range_del_aggregator.cc b/db/range_del_aggregator.cc
index 194a20ed0..f25a149d1 100644
--- a/db/range_del_aggregator.cc
+++ b/db/range_del_aggregator.cc
@@ -10,8 +10,6 @@
 
 namespace rocksdb {
 
-namespace {
-
 struct TombstoneStartKeyComparator {
   explicit TombstoneStartKeyComparator(const InternalKeyComparator* c)
       : cmp(c) {}
@@ -36,8 +34,6 @@ struct ParsedInternalKeyComparator {
   const InternalKeyComparator* cmp;
 };
 
-}  // namespace
-
 // An UncollapsedRangeDelMap is quick to create but slow to answer ShouldDelete
 // queries.
 class UncollapsedRangeDelMap : public RangeDelMap {