Skip to content

Commit

Permalink
Merge branch 'unstable' into strings
Browse files Browse the repository at this point in the history
  • Loading branch information
lqxhub authored Nov 22, 2023
2 parents 1933ab5 + bf3368c commit 2134676
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 0 deletions.
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ include(cmake/fmt.cmake)
include(cmake/spdlog.cmake)
include(cmake/folly.cmake)
include(cmake/gtest.cmake)
include(cmake/rocksdb.cmake)


enable_testing()

Expand Down
14 changes: 14 additions & 0 deletions cmake/rocksdb.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Copyright (c) 2023-present, Qihoo, Inc. All rights reserved.
# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree. An additional grant
# of patent rights can be found in the PATENTS file in the same directory.
include_guard()

FetchContent_Declare(
rocksdb
GIT_REPOSITORY https://github.com/facebook/rocksdb.git
GIT_TAG v8.6.7
)

FetchContent_MakeAvailable(rocksdb)
include_directories(${rocksdb_SOURCE_DIR}/include)
2 changes: 2 additions & 0 deletions src/pikiwidb.cc
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include <thread>

#include "log.h"
#include "rocksdb/db.h"

#include "client.h"
#include "command.h"
Expand Down Expand Up @@ -292,6 +293,7 @@ static void InitLogs() {
}

int main(int ac, char* av[]) {
[[maybe_unused]] rocksdb::DB* db;
g_pikiwidb = std::make_unique<PikiwiDB>();
pstd::InitRandom();
InitSignal();
Expand Down

0 comments on commit 2134676

Please sign in to comment.