From 8926b7275169e4a5f58322fede45f3a93d26bacc Mon Sep 17 00:00:00 2001
From: Deon Nicholas <dnicholas@fb.com>
Date: Fri, 14 Jun 2013 16:44:39 -0700
Subject: [PATCH] Minor tweaks to StringAppend MergeOperator.

Summary:
I'm concerned about a random seg-fault that sometimes occurs when
running stringappend_test. I will investigate further. First, I am removing
stringappend_test from the regular release tests, and making some clean-ups
to the code.

Test Plan:
1. make stringappend_test
2. ./stringappend_test

Reviewers: haobo, dhruba

Reviewed By: haobo

CC: leveldb

Differential Revision: https://reviews.facebook.net/D11313
---
 Makefile                                                     | 1 -
 utilities/merge_operators/string_append/stringappend.cc      | 4 +---
 utilities/merge_operators/string_append/stringappend_test.cc | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index c8f3dacb4..80ed1889f 100644
--- a/Makefile
+++ b/Makefile
@@ -62,7 +62,6 @@ TESTS = \
 	auto_roll_logger_test \
 	filelock_test \
 	merge_test \
-	stringappend_test \
 	redis_test
 
 TOOLS = \
diff --git a/utilities/merge_operators/string_append/stringappend.cc b/utilities/merge_operators/string_append/stringappend.cc
index 60216c2bf..06056c429 100644
--- a/utilities/merge_operators/string_append/stringappend.cc
+++ b/utilities/merge_operators/string_append/stringappend.cc
@@ -16,7 +16,7 @@
 namespace leveldb {
 
 
-// Constructor: also specify the  delimiter character.
+// Constructor: also specify the delimiter character.
 StringAppendOperator::StringAppendOperator(char delim_char)
     : delim_(delim_char) {
 }
@@ -43,8 +43,6 @@ void StringAppendOperator::Merge(const Slice& key,
     new_value->append(1,delim_);
     new_value->append(value.data(), value.size());
   }
-
-  return;
 }
 
 const char* StringAppendOperator::Name() const  {
diff --git a/utilities/merge_operators/string_append/stringappend_test.cc b/utilities/merge_operators/string_append/stringappend_test.cc
index 34782f02a..70128b02c 100644
--- a/utilities/merge_operators/string_append/stringappend_test.cc
+++ b/utilities/merge_operators/string_append/stringappend_test.cc
@@ -77,7 +77,7 @@ class StringLists {
 
     //NotFound is okay; just return empty (similar to std::map)
     //But network or db errors, etc, should fail the test (or at least yell)
-    if (s.ToString() != "NotFound: "){
+    if (!s.IsNotFound()) {
       std::cerr << "ERROR " << s.ToString() << std::endl;
     }