[fix][cmake] Upgrade RocksDB to 9.1.1.

Signed-off-by: Ketor <[email protected]>
DataCanvasIO · Apr 28, 2024 · 39e0308 · 39e0308
1 parent d49794d
commit 39e0308
Show file tree

Hide file tree

Showing 19 changed files with 34 additions and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -117,6 +117,19 @@ elseif(${VECTORIZATION_INSTRUCTION_SET} STREQUAL "avx512")
 endif()
 
 include(CheckCXXCompilerFlag)
+if (NOT CMAKE_CXX_STANDARD)
+    message(STATUS "CMAKE_CXX_STANDARD is not set, will set to 17")
+    set(CMAKE_CXX_STANDARD 17)
+else()
+    set(ALLOWED_CXX_STANDARDS 17 20 23)
+    set_property(CACHE CMAKE_CXX_STANDARD PROPERTY STRINGS ${ALLOWED_CXX_STANDARDS})
+    list(FIND ALLOWED_CXX_STANDARDS ${CMAKE_CXX_STANDARD} POSITION)
+    if (POSITION LESS 0)
+        message(FATAL_ERROR "Invalid CMAKE_CXX_STANDARD: ${CMAKE_CXX_STANDARD}. "
+        "Must be one of: ${ALLOWED_CXX_STANDARDS}")
+    endif()
+endif()
+
 if (CMAKE_CXX_STANDARD EQUAL 23)
     check_cxx_compiler_flag("-std=c++23" COMPILER_SUPPORTS_CXX23)
     if(COMPILER_SUPPORTS_CXX23)
@@ -134,7 +147,6 @@ elseif(CMAKE_CXX_STANDARD EQUAL 20)
         message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++20 support. Please use a different C++ compiler.")
     endif()
 else()
-    message(STATUS "CMAKE_CXX_STANDARD: ${CMAKE_CXX_STANDARD} change to c++17")
     check_cxx_compiler_flag("-std=c++17" COMPILER_SUPPORTS_CXX17)
     if(COMPILER_SUPPORTS_CXX17)
         set(CMAKE_CXX_STANDARD 17)

diff --git a/cmake/braft.cmake b/cmake/braft.cmake
@@ -23,6 +23,7 @@ SET(BRAFT_LIBRARIES "${BRAFT_INSTALL_DIR}/lib/libbraft.a" CACHE FILEPATH "braft
 
 
 set(prefix_path "${THIRD_PARTY_PATH}/install/brpc|${THIRD_PARTY_PATH}/install/gflags|${THIRD_PARTY_PATH}/install/protobuf|${THIRD_PARTY_PATH}/install/zlib|${THIRD_PARTY_PATH}/install/glog|${THIRD_PARTY_PATH}/install/leveldb")
+message(STATUS "braft search prefix_path in ${prefix_path}")
 
 set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -DUSE_BTHREAD_MUTEX)
 

diff --git a/cmake/brpc.cmake b/cmake/brpc.cmake
@@ -24,6 +24,7 @@ SET(BRPC_LIBRARIES "${BRPC_INSTALL_DIR}/lib/libbrpc.a" CACHE FILEPATH "brpc libr
 
 # Reference https://stackoverflow.com/questions/45414507/pass-a-list-of-prefix-paths-to-externalproject-add-in-cmake-args
 set(prefix_path "${THIRD_PARTY_PATH}/install/gflags|${THIRD_PARTY_PATH}/install/openssl|${THIRD_PARTY_PATH}/install/protobuf|${THIRD_PARTY_PATH}/install/zlib|${THIRD_PARTY_PATH}/install/glog|${THIRD_PARTY_PATH}/install/leveldb")
+message(STATUS "brpc search prefix_path in ${prefix_path}")
 
 # If minimal .a is need, you can set  WITH_DEBUG_SYMBOLS=OFF
 ExternalProject_Add(

diff --git a/cmake/faiss-mkl.cmake b/cmake/faiss-mkl.cmake
@@ -27,7 +27,6 @@ elseif(${VECTORIZATION_INSTRUCTION_SET} STREQUAL "avx512")
     SET(FAISS_OPT_LEVEL avx512)
     SET(FAISS_LIBRARIES "${FAISS_INSTALL_DIR}/lib/libfaiss_avx512.a" CACHE FILEPATH "faiss library." FORCE)
 else()
-    message(STATUS "faiss use generic instruction set")
     SET(FAISS_OPT_LEVEL generic)
     SET(FAISS_LIBRARIES "${FAISS_INSTALL_DIR}/lib/libfaiss.a" CACHE FILEPATH "faiss library." FORCE)
 endif()

diff --git a/cmake/glog.cmake b/cmake/glog.cmake
@@ -29,6 +29,7 @@ ELSE (WIN32)
 ENDIF (WIN32)
 
 set(prefix_path "${THIRD_PARTY_PATH}/install/gflags")
+message(STATUS "glog search prefix_path in ${prefix_path}")
 
 SET(gflags_BUILD_STATIC_LIBS ON)
 

diff --git a/cmake/leveldb.cmake b/cmake/leveldb.cmake
@@ -21,6 +21,9 @@ SET(LEVELDB_INSTALL_DIR ${THIRD_PARTY_PATH}/install/leveldb)
 SET(LEVELDB_INCLUDE_DIR "${LEVELDB_INSTALL_DIR}/include" CACHE PATH "leveldb include directory." FORCE)
 SET(LEVELDB_LIBRARIES "${LEVELDB_INSTALL_DIR}/lib/libleveldb.a" CACHE FILEPATH "leveldb library." FORCE)
 
+set(prefix_path "${THIRD_PARTY_PATH}/install/snappy")
+message(STATUS "leveldb search prefix_path in ${prefix_path}")
+
 ExternalProject_Add(
     extern_leveldb
     ${EXTERNAL_PROJECT_LOG_ARGS}

diff --git a/cmake/rocksdb.cmake b/cmake/rocksdb.cmake
@@ -22,10 +22,11 @@ SET(ROCKSDB_INCLUDE_DIR "${ROCKSDB_INSTALL_DIR}/include" CACHE PATH "rocksdb inc
 SET(ROCKSDB_LIBRARIES "${ROCKSDB_INSTALL_DIR}/lib/librocksdb.a" CACHE FILEPATH "rocksdb library." FORCE)
 
 set(prefix_path "${THIRD_PARTY_PATH}/install/snappy|${THIRD_PARTY_PATH}/install/zlib|${THIRD_PARTY_PATH}/install/lz4|${THIRD_PARTY_PATH}/install/zstd|${THIRD_PARTY_PATH}/install/gflags")
+message(STATUS "rocksdb search prefix_path in ${prefix_path}")
 
 # To avoid rocksdb PROTABLE options on old arch machine when build using docker
 set(ROCKSDB_PROTABLE_OPTION "0" CACHE STRING "An option for rocksdb PROTABLE, default 0")
-message(STATUS "Rocksdb protable option(ROCKSDB_PROTABLE_OPTION): ${ROCKSDB_PROTABLE_OPTION}")
+message(STATUS "rocksdb protable option: ${ROCKSDB_PROTABLE_OPTION}")
 
 ExternalProject_Add(
     extern_rocksdb

diff --git a/cmake/snappy.cmake b/cmake/snappy.cmake
@@ -22,6 +22,7 @@ SET(SNAPPY_INCLUDE_DIR "${SNAPPY_INSTALL_DIR}/include" CACHE PATH "snappy includ
 SET(SNAPPY_LIBRARIES "${SNAPPY_INSTALL_DIR}/lib/libsnappy.a" CACHE FILEPATH "snappy library." FORCE)
 
 set(prefix_path "${THIRD_PARTY_PATH}/install/gflags")
+message(STATUS "snappy search prefix_path in ${prefix_path}")
 
 ExternalProject_Add(
     extern_snappy

diff --git a/contrib/braft b/contrib/braft
diff --git a/contrib/brpc b/contrib/brpc
diff --git a/contrib/faiss b/contrib/faiss
diff --git a/contrib/hdf5 b/contrib/hdf5
diff --git a/contrib/libbacktrace b/contrib/libbacktrace
diff --git a/contrib/openblas b/contrib/openblas
diff --git a/contrib/openssl b/contrib/openssl
diff --git a/contrib/rapidjson b/contrib/rapidjson
diff --git a/contrib/rocksdb b/contrib/rocksdb
diff --git a/contrib/zstd b/contrib/zstd
diff --git a/src/engine/rocks_raw_engine.cc b/src/engine/rocks_raw_engine.cc
@@ -213,7 +213,7 @@ butil::Status Checkpoint::Create(const std::string& dirpath, const std::vector<s
 
   status = checkpoint->CreateCheckpoint(dirpath);
   if (!status.ok()) {
-    GetDB()->EnableFileDeletions(false);
+    GetDB()->EnableFileDeletions();
     DINGO_LOG(ERROR) << fmt::format("[rocksdb] export column family checkpoint failed, error: {}.", status.ToString());
     delete checkpoint;
     return butil::Status(status.code(), status.ToString());
@@ -228,7 +228,7 @@ butil::Status Checkpoint::Create(const std::string& dirpath, const std::vector<s
     meta_datas.push_back(meta_data);
   }
 
-  status = GetDB()->EnableFileDeletions(false);
+  status = GetDB()->EnableFileDeletions();
   if (!status.ok()) {
     DINGO_LOG(ERROR) << fmt::format("[rocksdb] enable file deletion failed, error: {}.", status.ToString());
     return butil::Status(status.code(), status.ToString());