[cmake][git] Remove rocksdb dependencies

SHtress · Apr 15, 2023 · 9bfb954 · 9bfb954
1 parent 5dd8635
commit 9bfb954
Show file tree

Hide file tree

Showing 16 changed files with 7 additions and 122 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -33,7 +33,7 @@ jobs:
 
       - name: Install dependencies
         id: install_deps
-        run: scripts/install_deps_ubuntu.sh --dev --rocksdb
+        run: scripts/install_deps_ubuntu.sh --dev
 
       - name: Restore build caches
         uses: hendrikmuhs/ccache-action@v1.2

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -35,7 +35,7 @@ jobs:
 
       - name: Install dependencies (Ubuntu)
         if: startswith(matrix.os, 'ubuntu')
-        run: scripts/install_deps_ubuntu.sh --dev --rocksdb
+        run: scripts/install_deps_ubuntu.sh --dev
 
       - name: Restore build caches
         uses: hendrikmuhs/ccache-action@v1.2

diff --git a/.github/workflows/sanitizers.yml b/.github/workflows/sanitizers.yml
@@ -33,7 +33,7 @@ jobs:
 
       - name: Install dependencies
         id: install_deps
-        run: scripts/install_deps_ubuntu.sh --dev --rocksdb
+        run: scripts/install_deps_ubuntu.sh --dev
 
       - name: Restore build caches
         uses: hendrikmuhs/ccache-action@v1.2

diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
@@ -45,7 +45,7 @@ jobs:
 
       - name: Install dependencies
         id: install_deps
-        run: ./scripts/install_deps_ubuntu.sh --dev --rocksdb
+        run: ./scripts/install_deps_ubuntu.sh --dev
 
       - name: Checking the code with clang
         run: |

diff --git a/cmake/FindRocksDB.cmake b/cmake/FindRocksDB.cmake
diff --git a/dependencies.cmake b/dependencies.cmake
@@ -27,10 +27,6 @@ macro(sc_linux_target_dependencies)
     find_package(Boost 1.71 REQUIRED COMPONENTS filesystem system program_options)
     find_package(websocketpp REQUIRED 0.8.3)
 
-    if(${SC_FILE_MEMORY} MATCHES "Rocksdb")
-	    find_package(RocksDB REQUIRED)
-    endif()
-
     find_package(PkgConfig REQUIRED)
     pkg_search_module(GLIB2 REQUIRED glib-2.0)
     pkg_search_module(GLIB2_MODULE REQUIRED gmodule-2.0)
@@ -70,9 +66,6 @@ macro(sc_win_target_dependencies _PACKAGES_CONFIG _THIRDPARTY_PATH _BIN_PATH)
 
     set(GLIB_PATH "${PACKAGES_PATH}/glib.2.36.2.11/build/native")
     set(BOOST_PATH "${PACKAGES_PATH}/boost.${BOOST_VERSION}/lib/native")
-    if (${SC_FILE_MEMORY} MATCHES "Rocksdb")
-	    set(ROCKSDB_PATH "${SC_MACHINE_THIRDPARTY_PATH}/rocksdb")
-    endif()
 
     set(LIBCLANG_INCLUDE_DIRS "${_THIRDPARTY_PATH}/clang/include")
     set(LIBCLANG_LIBRARY "libclang")
@@ -84,11 +77,6 @@ macro(sc_win_target_dependencies _PACKAGES_CONFIG _THIRDPARTY_PATH _BIN_PATH)
     set(LIBCURL_INCLUDE_DIRS "${LIBCURL_PATH}/include")
     set(LIBCURL_LIBRARIES "${LIBCURL_PATH}/lib/libcurl.lib" "WSock32.lib" "Ws2_32.lib")
 
-    if(${SC_FILE_MEMORY} MATCHES "Rocksdb")
-	    set(RocksDB_INCLUDE_DIR "${ROCKSDB_PATH}/include")
-	    set(RocksDB_LIBRARIES "${ROCKSDB_PATH}/rocksdb-shared.lib")
-    endif()
-
     include_directories("${BOOST_PATH}/include" "${LIBCURL_INCLUDE_DIRS}")
 
     link_directories(
@@ -121,7 +109,6 @@ macro(sc_win_target_dependencies _PACKAGES_CONFIG _THIRDPARTY_PATH _BIN_PATH)
         "${LIBCURL_RUNTIME_PATH}/libcurl.dll"
         "${LIBCURL_RUNTIME_PATH}/libeay32.dll"
         "${LIBCURL_RUNTIME_PATH}/ssleay32.dll"
-        "${ROCKSDB_PATH}/rocksdb-shared.dll"
     )
     file(COPY ${WIN_RUNTIME_LIBRARIES} DESTINATION "${_BIN_PATH}")
 endmacro()
diff --git a/docs/build/cmake-flags.md b/docs/build/cmake-flags.md
@@ -8,9 +8,6 @@ cmake -B build -DSC_BUILD_TESTS=ON -DSC_AUTO_TEST=ON
 cmake --build build -j$(nproc)
 ```
 
-To build with `Sc-dictionary` or `Rocksdb` file system storage change variable `SC_FILE_MEMORY` in CMakeLists.txt by 
-`Dictionary` or `Rocksdb` alternatively.
-
 Additionally you can use `-DSC_BUILD_BENCH=ON` flag to build performance tests
 
 

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -169,6 +169,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Removed
 
+- Remove rocksdb
 - Remove find by substring logic from sc-dictionary
 - Remove legacy gwf-translator for 0.3.0 gwf sources from sc-builder
 - Remove legacy glib-based tests

diff --git a/docs/thirdparty.md b/docs/thirdparty.md
@@ -3,7 +3,6 @@ Based on refactored code from: [CPP-Reflection](https://github.com/AustinBrunkho
 
 ## Sc-memory
 * [JSON for Modern C++](https://github.com/nlohmann/json)
-* [RocksDB](https://rocksdb.org/)
 * [Antlr 4](https://github.com/antlr/antlr4)
 * [libclang](https://clang.llvm.org/docs/Tooling.html)
 * [Websocketcpp](https://docs.websocketpp.org/)
diff --git a/sc-memory/sc-core/CMakeLists.txt b/sc-memory/sc-core/CMakeLists.txt
@@ -7,11 +7,6 @@ add_library(sc-core SHARED ${SOURCES})
 target_include_directories(sc-core PRIVATE ${GLIB2_INCLUDE_DIRS})
 target_link_libraries(sc-core ${GLIB2_LIBRARIES})
 
-if(${SC_FILE_MEMORY} MATCHES "Rocksdb")
-    target_include_directories(sc-core PRIVATE ${RocksDB_INCLUDE_DIR})
-    target_link_libraries(sc-core ${RocksDB_LIBRARIES})
-endif()
-
 if(${SC_COVERAGE})
     if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
 	    target_link_libraries(sc-core gcov)

diff --git a/sc-memory/sc-core/sc-store/sc_link_helpers.c b/sc-memory/sc-core/sc-store/sc_link_helpers.c
diff --git a/sc-memory/sc-core/sc-store/sc_link_helpers.h b/sc-memory/sc-core/sc-store/sc_link_helpers.h
diff --git a/sc-memory/sc-core/sc-store/sc_storage.c b/sc-memory/sc-core/sc-store/sc_storage.c
@@ -9,7 +9,6 @@
 #include "sc_defines.h"
 #include "sc_segment.h"
 #include "sc_element.h"
-#include "sc_link_helpers.h"
 #include "sc_event.h"
 #include "sc_stream_memory.h"
 

diff --git a/sc-memory/sc-core/sc-store/sc_types.h b/sc-memory/sc-core/sc-store/sc_types.h
@@ -227,19 +227,6 @@ struct _sc_stat
   sc_uint32 segments_count;
 };
 
-#  ifdef SC_ROCKSDB_FS_STORAGE
-// contents
-#    define SC_MAX_CHECKSUM_LEN 32
-//! Structure to store checksum information
-struct _sc_check_sum
-{
-  char data[SC_MAX_CHECKSUM_LEN];  // maximum checksum length
-  sc_uint8 len;                    // checksum length
-};
-#  endif
-
-typedef struct _sc_check_sum sc_check_sum;
-typedef struct _sc_content sc_content;
 #endif
 
 typedef struct _sc_arc sc_arc;

diff --git a/scripts/install_deps_macOS.sh b/scripts/install_deps_macOS.sh
@@ -1 +1 @@
-brew install boost glib llvm@14 antlr antlr4-cpp-runtime temurin pkgconfig rocksdb cmake boost-python3 ccache websocketpp nlohmann-json
+brew install boost glib llvm@14 antlr antlr4-cpp-runtime temurin pkgconfig cmake boost-python3 ccache websocketpp nlohmann-json
diff --git a/scripts/install_deps_ubuntu.sh b/scripts/install_deps_ubuntu.sh
@@ -6,10 +6,9 @@ APP_ROOT_PATH=$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && cd .. &
 function usage() {
     cat <<USAGE
 
-    Usage: $0 [--rocksdb] [--dev]
+    Usage: $0 [--dev]
 
     Options:
-        --rocksdb:      installs deps required for RocksDB storage backend
         --dev:          installs dependencies required to compile sc-machine
 USAGE
     exit 1
@@ -49,10 +48,6 @@ packagelist_dev=(
     python3-dev
 )
 
-packagelist_rocksdb=(
-librocksdb-dev
-)
-
 packages=() 
 packages+=(${packagelist_runtime[@]})
 
@@ -61,9 +56,6 @@ while [ "$1" != "" ]; do
     --dev)
        packages+=(${packagelist_dev[@]})
         ;;
-    --rocksdb)
-       packages+=(${packagelist_rocksdb[@]}) 
-        ;;
     -h | --help)
         usage # show help
         ;;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		brew install boost glib llvm@14 antlr antlr4-cpp-runtime temurin pkgconfig rocksdb cmake boost-python3 ccache websocketpp nlohmann-json
		brew install boost glib llvm@14 antlr antlr4-cpp-runtime temurin pkgconfig cmake boost-python3 ccache websocketpp nlohmann-json