Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Aug 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions .github/workflows/kvrocks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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 }}
Expand Down
13 changes: 2 additions & 11 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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()
Expand Down
1 change: 0 additions & 1 deletion NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 0 additions & 1 deletion cmake/modules/FindJeMalloc.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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()
1 change: 0 additions & 1 deletion cmake/modules/FindZLIB.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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()
1 change: 0 additions & 1 deletion cmake/modules/Findlz4.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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()
1 change: 0 additions & 1 deletion cmake/modules/Findzstd.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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()
60 changes: 0 additions & 60 deletions cmake/speedb.cmake

This file was deleted.

1 change: 0 additions & 1 deletion src/storage/storage.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@

enum class StorageEngineType : uint16_t {
RocksDB,
Speedb,
mapleFU marked this conversation as resolved.
Show resolved Hide resolved
};

inline constexpr StorageEngineType STORAGE_ENGINE_TYPE = StorageEngineType::KVROCKS_STORAGE_ENGINE;
Expand Down
1 change: 0 additions & 1 deletion tests/cppunit/compact_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand Down
Loading