From da2fd001a6f8ba09f872dbba26064fd76b3d779b Mon Sep 17 00:00:00 2001
From: Mayank Agarwal <amayank@fb.com>
Date: Mon, 14 Oct 2013 11:22:52 -0700
Subject: [PATCH] Fix rocksdb->levledb BytewiseComparator and inverted order of
 error in db/version_set.cc

Summary:
This is needed to make existing dbs be able to open and also because BytewiseComparator was not changed since leveldb.
The inverted order in the error message caused confusion prebiously

Test Plan: make; open existing db

Reviewers: leveldb, dhruba

Reviewed By: dhruba

Differential Revision: https://reviews.facebook.net/D13449
---
 db/version_set.cc  | 12 ++++++------
 util/comparator.cc |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/db/version_set.cc b/db/version_set.cc
index 20de9f6e3..ebd138046 100644
--- a/db/version_set.cc
+++ b/db/version_set.cc
@@ -1430,9 +1430,9 @@ Status VersionSet::Recover() {
       if (s.ok()) {
         if (edit.has_comparator_ &&
             edit.comparator_ != icmp_.user_comparator()->Name()) {
-          s = Status::InvalidArgument(
-              edit.comparator_ + "does not match existing comparator ",
-              icmp_.user_comparator()->Name());
+          s = Status::InvalidArgument(icmp_.user_comparator()->Name(),
+                                      "does not match existing comparator " +
+                                      edit.comparator_);
         }
       }
 
@@ -1548,9 +1548,9 @@ Status VersionSet::DumpManifest(Options& options, std::string& dscname,
       if (s.ok()) {
         if (edit.has_comparator_ &&
             edit.comparator_ != icmp_.user_comparator()->Name()) {
-          s = Status::InvalidArgument(
-              edit.comparator_ + "does not match existing comparator ",
-              icmp_.user_comparator()->Name());
+          s = Status::InvalidArgument(icmp_.user_comparator()->Name(),
+                                      "does not match existing comparator " +
+                                      edit.comparator_);
         }
       }
 
diff --git a/util/comparator.cc b/util/comparator.cc
index 93b4ffafb..6ba1cacfd 100644
--- a/util/comparator.cc
+++ b/util/comparator.cc
@@ -19,7 +19,7 @@ class BytewiseComparatorImpl : public Comparator {
   BytewiseComparatorImpl() { }
 
   virtual const char* Name() const {
-    return "rocksdb.BytewiseComparator";
+    return "leveldb.BytewiseComparator";
   }
 
   virtual int Compare(const Slice& a, const Slice& b) const {
-- 
GitLab