Merge src/leveldb changes for LevelDB 1.18.

2014-10-16 12:23:50 -07:00
parent e8f6d54f1f 4b0e2d75d7
commit 5b9f8425a5
40 changed files with 602 additions and 282 deletions
--- a/src/leveldb/util/bloom.cc
+++ b/src/leveldb/util/bloom.cc
@@ -29,7 +29,7 @@ class BloomFilterPolicy : public FilterPolicy {
  }

  virtual const char* Name() const {
-    return "leveldb.BuiltinBloomFilter";
+    return "leveldb.BuiltinBloomFilter2";
  }

  virtual void CreateFilter(const Slice* keys, int n, std::string* dst) const {