kv: always enable rocksdb

RocksDB is included as a submodule of Ceph, there is no need to check
for its existence anymore.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d6b12db1470784d0fb99beecd3042be1c6dd817a..2ccf4c27d6b8f2902fb50f14073d641e52dd89f5 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -466,8 +466,6 @@ if(WITH_REENTRANT_STRSIGNAL)
   set(HAVE_REENTRANT_STRSIGNAL 1 CACHE INTERNAL "Reentrant strsignal is supported.")
 endif()
 
-set(HAVE_LIBROCKSDB 1)
-
 # -lz link into kv
 find_package(ZLIB REQUIRED)
 

diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake
index 2befe3ff1697d264ef5eb5d7c9bb7d3e077cf0b1..1ea3703f620c0c6209bc6d79ed932398cb58e177 100644 (file)
--- a/src/include/config-h.in.cmake
+++ b/src/include/config-h.in.cmake
@@ -205,9 +205,6 @@
 /* Define to 1 if you have fdatasync. */
 #cmakedefine HAVE_FDATASYNC 1
 
-/* Defined if you have librocksdb enabled */
-#cmakedefine HAVE_LIBROCKSDB
-
 /* Define to 1 if you have the <valgrind/helgrind.h> header file. */
 #cmakedefine HAVE_VALGRIND_HELGRIND_H 1
 

diff --git a/src/kv/KeyValueDB.cc b/src/kv/KeyValueDB.cc
index 6cd3bff797acfc580ddd9ec9da48e3aa10376795..f050040c1562263577c01bc0e828e6fbb52c0366 100644 (file)
--- a/src/kv/KeyValueDB.cc
+++ b/src/kv/KeyValueDB.cc
@@ -6,9 +6,7 @@
 #include "LevelDBStore.h"
 #endif
 #include "MemDB.h"
-#ifdef HAVE_LIBROCKSDB
 #include "RocksDBStore.h"
-#endif
 
 using std::map;
 using std::string;
@@ -23,12 +21,9 @@ KeyValueDB *KeyValueDB::create(CephContext *cct, const string& type,
     return new LevelDBStore(cct, dir);
   }
 #endif
-#ifdef HAVE_LIBROCKSDB
   if (type == "rocksdb") {
     return new RocksDBStore(cct, dir, options, p);
   }
-#endif
-
   if ((type == "memdb") && 
     cct->check_experimental_feature_enabled("memdb")) {
     return new MemDB(cct, dir, p);
@@ -43,12 +38,9 @@ int KeyValueDB::test_init(const string& type, const string& dir)
     return LevelDBStore::_test_init(dir);
   }
 #endif
-#ifdef HAVE_LIBROCKSDB
   if (type == "rocksdb") {
     return RocksDBStore::_test_init(dir);
   }
-#endif
-
   if (type == "memdb") {
     return MemDB::_test_init(dir);
   }