chore(storage): Remove speedb due to lack of active (apache#2476)

git-hulk · Aug 7, 2024 · 01f353d · 01f353d
1 parent edcb706
commit 01f353d
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 83 deletions.
diff --git a/.github/workflows/kvrocks.yaml b/.github/workflows/kvrocks.yaml
@@ -200,10 +200,6 @@ jobs:
             os: ubuntu-22.04
             compiler: clang
             new_encoding: -DENABLE_NEW_ENCODING=FALSE
-          - name: Ubuntu GCC with speedb enabled
-            os: ubuntu-22.04
-            compiler: gcc
-            with_speedb: -DENABLE_SPEEDB=ON
 
     runs-on: ${{ matrix.os }}
     env:
@@ -269,7 +265,7 @@ jobs:
         run: |
           ./x.py build -j$NPROC --unittest --compiler ${{ matrix.compiler }} ${{ matrix.without_jemalloc }} \
             ${{ matrix.without_luajit }} ${{ matrix.with_ninja }} ${{ matrix.with_sanitizer }} ${{ matrix.with_openssl }} \
-            ${{ matrix.new_encoding }} ${{ matrix.with_speedb }} ${{ env.CMAKE_EXTRA_DEFS }}
+            ${{ matrix.new_encoding }} ${{ env.CMAKE_EXTRA_DEFS }}
 
       - name: Build Kvrocks (SonarCloud)
         if: ${{ matrix.sonarcloud }}

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -29,7 +29,6 @@ option(ENABLE_STATIC_LIBSTDCXX "link kvrocks with static library of libstd++ ins
 option(ENABLE_LUAJIT "enable use of luaJIT instead of lua" ON)
 option(ENABLE_OPENSSL "enable openssl to support tls connection" OFF)
 option(ENABLE_IPO "enable interprocedural optimization" ON)
-option(ENABLE_SPEEDB "enable speedb instead of rocksdb" OFF)
 set(SYMBOLIZE_BACKEND "" CACHE STRING "symbolization backend library for cpptrace (libbacktrace, libdwarf, or empty)")
 set(PORTABLE 0 CACHE STRING "build a portable binary (disable arch-specific optimizations)")
 # TODO: set ENABLE_NEW_ENCODING to ON when we are ready
@@ -156,11 +155,7 @@ include(cmake/lz4.cmake)
 include(cmake/zlib.cmake)
 include(cmake/zstd.cmake)
 include(cmake/tbb.cmake)
-if(ENABLE_SPEEDB)
-    include(cmake/speedb.cmake)
-else()
-    include(cmake/rocksdb.cmake)
-endif()
+include(cmake/rocksdb.cmake)
 include(cmake/libevent.cmake)
 include(cmake/fmt.cmake)
 include(cmake/jsoncons.cmake)
@@ -261,11 +256,7 @@ elseif((CMAKE_CXX_COMPILER_ID STREQUAL "Clang") OR (CMAKE_CXX_COMPILER_ID STREQU
 endif()
 target_link_libraries(kvrocks_objs PUBLIC -fno-omit-frame-pointer)
 target_link_libraries(kvrocks_objs PUBLIC ${EXTERNAL_LIBS})
-if (ENABLE_SPEEDB)
-    target_compile_definitions(kvrocks_objs PUBLIC KVROCKS_STORAGE_ENGINE=Speedb)
-else()
-    target_compile_definitions(kvrocks_objs PUBLIC KVROCKS_STORAGE_ENGINE=RocksDB)
-endif()
+target_compile_definitions(kvrocks_objs PUBLIC KVROCKS_STORAGE_ENGINE=RocksDB)
 if(ENABLE_OPENSSL)
     target_compile_definitions(kvrocks_objs PUBLIC ENABLE_OPENSSL)
 endif()

diff --git a/NOTICE b/NOTICE
@@ -28,7 +28,6 @@ NB: RocksDB is dual-licensed under both the GPLv2 and Apache 2.0 License.
 This product uses it under the Apache 2.0 License.
 
 * oneTBB(https://github.com/oneapi-src/oneTBB)
-* speedb(https://github.com/speedb-io/speedb, alternative to rocksdb)
 
 Files src/common/rocksdb_crc32c.h and src/storage/batch_debugger.h are modified from RocksDB.
 Files src/types/bloom_filter.* are modified from Apache Arrow.

diff --git a/cmake/modules/FindJeMalloc.cmake b/cmake/modules/FindJeMalloc.cmake
@@ -22,5 +22,4 @@ if(jemalloc_SOURCE_DIR)
 
   add_library(JeMalloc::JeMalloc ALIAS jemalloc) # rocksdb use it
   install(TARGETS jemalloc EXPORT RocksDBTargets) # export for install(...)
-  install(TARGETS jemalloc EXPORT SpeedbTargets) # export for install(...)
 endif()
diff --git a/cmake/modules/FindZLIB.cmake b/cmake/modules/FindZLIB.cmake
@@ -25,5 +25,4 @@ if(zlib_SOURCE_DIR)
   target_link_libraries(zlib_with_headers INTERFACE zlibstatic)
   add_library(ZLIB::ZLIB ALIAS zlib_with_headers)
   install(TARGETS zlibstatic zlib_with_headers EXPORT RocksDBTargets) # export for install(...)
-  install(TARGETS zlibstatic zlib_with_headers EXPORT SpeedbTargets) # export for install(...)
 endif()
diff --git a/cmake/modules/Findlz4.cmake b/cmake/modules/Findlz4.cmake
@@ -22,5 +22,4 @@ if(lz4_SOURCE_DIR)
 
   add_library(lz4::lz4 ALIAS lz4) # rocksdb use it
   install(TARGETS lz4 EXPORT RocksDBTargets) # export for install(...)
-  install(TARGETS lz4 EXPORT SpeedbTargets) # export for install(...)
 endif()
diff --git a/cmake/modules/Findzstd.cmake b/cmake/modules/Findzstd.cmake
@@ -22,5 +22,4 @@ if(zstd_SOURCE_DIR)
 
   add_library(zstd::zstd ALIAS zstd) # rocksdb use it
   install(TARGETS zstd EXPORT RocksDBTargets) # export for install(...)
-  install(TARGETS zstd EXPORT SpeedbTargets) # export for install(...)
 endif()
diff --git a/cmake/speedb.cmake b/cmake/speedb.cmake
diff --git a/src/storage/storage.h b/src/storage/storage.h
@@ -48,7 +48,6 @@
 
 enum class StorageEngineType : uint16_t {
   RocksDB,
-  Speedb,
 };
 
 inline constexpr StorageEngineType STORAGE_ENGINE_TYPE = StorageEngineType::KVROCKS_STORAGE_ENGINE;

diff --git a/tests/cppunit/compact_test.cc b/tests/cppunit/compact_test.cc
@@ -51,7 +51,6 @@ TEST(Compact, Filter) {
   auto status = storage->Compact(nullptr, nullptr, nullptr);
   assert(status.ok());
   // Compact twice to workaround issue fixed by: https://github.com/facebook/rocksdb/pull/11468
-  // before rocksdb/speedb 8.1.1. This line can be removed after speedb upgraded above 8.1.1.
   status = storage->Compact(nullptr, nullptr, nullptr);
   assert(status.ok());
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,7 +48,6 @@ @@
     enum class StorageEngineType : uint16_t {
       RocksDB,
-      Speedb,
     };
     inline constexpr StorageEngineType STORAGE_ENGINE_TYPE = StorageEngineType::KVROCKS_STORAGE_ENGINE;
@@ Expand Down @@