diff --git a/db/version_set.cc b/db/version_set.cc index 20de9f6e3a3ad271a73ad152f178a6100e3362e0..ebd1380461cc5a809f423d39c5e69f542f087935 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 93b4ffafbb69edceb6ce0afa3ab7e75a90dd0e08..6ba1cacfd089654d2893f7ee38bab1a0dfffde63 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 {