Integrate raft into storage (vesoft-inc#405)

* Integrate raft into storage All UTs pass. At the moment, all parts still running with single copy. Will enable multiple copies in the future PR Implemented vesoft-inc#178 * Addressed @dangleptr's comments and rebased * Addressed @dangleptr's comments and rebased * Addressed @laura-ding's @dangleptr's comments Rebased as well
yixinglu · Jun 6, 2019 · c12dc14 · c12dc14
1 parent cb1dbe5
commit c12dc14
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 82 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -304,8 +304,8 @@ macro(nebula_link_libraries target)
  ${OPENSSL_CRYPTO_LIBRARY}
  ${KRB5_LIBRARIES}
  ${COMPRESSION_LIBRARIES}
- ${JEMALLOC_LIB}
  ${LIBUNWIND_LIBRARIES}
+ ${JEMALLOC_LIB}
  dl
  ${GETTIME_LIB}
  -pthread

diff --git a/cmake/FindNCURSES.cmake b/cmake/FindNCURSES.cmake
@@ -24,7 +24,7 @@ find_path(
 
 find_path(
  NCURSES_INCLUDE_DIR
- NAMES ncurses/curses.h
+ NAMES ncurses.h curses.h ncurses/curses.h
  HINTS ${NCURSES_ROOT_DIR}/include
 )
 

diff --git a/src/daemons/CMakeLists.txt b/src/daemons/CMakeLists.txt
@@ -45,10 +45,13 @@ add_executable(
  $<TARGET_OBJECTS:meta_client>
  $<TARGET_OBJECTS:meta_thrift_obj>
  $<TARGET_OBJECTS:common_thrift_obj>
- $<TARGET_OBJECTS:thrift_obj>
+ $<TARGET_OBJECTS:raftex_obj>
+ $<TARGET_OBJECTS:raftex_thrift_obj>
+ $<TARGET_OBJECTS:wal_obj>
  $<TARGET_OBJECTS:dataman_obj>
  $<TARGET_OBJECTS:schema_obj>
  $<TARGET_OBJECTS:base_obj>
+ $<TARGET_OBJECTS:thrift_obj>
  $<TARGET_OBJECTS:thread_obj>
  $<TARGET_OBJECTS:time_obj>
  $<TARGET_OBJECTS:fs_obj>
@@ -77,9 +80,11 @@ add_executable(
  $<TARGET_OBJECTS:meta_client>
  $<TARGET_OBJECTS:meta_thrift_obj>
  $<TARGET_OBJECTS:common_thrift_obj>
- $<TARGET_OBJECTS:thrift_obj>
- $<TARGET_OBJECTS:network_obj>
+ $<TARGET_OBJECTS:raftex_obj>
+ $<TARGET_OBJECTS:raftex_thrift_obj>
+ $<TARGET_OBJECTS:wal_obj>
  $<TARGET_OBJECTS:base_obj>
+ $<TARGET_OBJECTS:thrift_obj>
  $<TARGET_OBJECTS:network_obj>
  $<TARGET_OBJECTS:thread_obj>
  $<TARGET_OBJECTS:time_obj>

diff --git a/src/executor/test/CMakeLists.txt b/src/executor/test/CMakeLists.txt
@@ -1,29 +1,35 @@
-add_executable(
- session_manager_test
- SessionManagerTest.cpp
- $<TARGET_OBJECTS:meta_client>
- $<TARGET_OBJECTS:meta_thrift_obj>
+set(GRAPH_TEST_LIBS
  $<TARGET_OBJECTS:graph_obj>
  $<TARGET_OBJECTS:base_obj>
  $<TARGET_OBJECTS:graph_thrift_obj>
+ $<TARGET_OBJECTS:storage_service_handler>
  $<TARGET_OBJECTS:storage_thrift_obj>
  $<TARGET_OBJECTS:common_thrift_obj>
- $<TARGET_OBJECTS:meta_thrift_obj>
- $<TARGET_OBJECTS:time_obj>
- $<TARGET_OBJECTS:fs_obj>
- $<TARGET_OBJECTS:network_obj>
- $<TARGET_OBJECTS:thread_obj>
- $<TARGET_OBJECTS:thrift_obj>
  $<TARGET_OBJECTS:parser_obj>
  $<TARGET_OBJECTS:filter_obj>
  $<TARGET_OBJECTS:schema_obj>
  $<TARGET_OBJECTS:dataman_obj>
  $<TARGET_OBJECTS:storage_client>
  $<TARGET_OBJECTS:meta_client>
+ $<TARGET_OBJECTS:meta_thrift_obj>
  $<TARGET_OBJECTS:meta_service_handler>
  $<TARGET_OBJECTS:kvstore_obj>
+ $<TARGET_OBJECTS:raftex_obj>
+ $<TARGET_OBJECTS:raftex_thrift_obj>
+ $<TARGET_OBJECTS:wal_obj>
+ $<TARGET_OBJECTS:time_obj>
+ $<TARGET_OBJECTS:fs_obj>
+ $<TARGET_OBJECTS:network_obj>
+ $<TARGET_OBJECTS:thread_obj>
+ $<TARGET_OBJECTS:thrift_obj>
 )
 
+
+add_executable(
+ session_manager_test
+ SessionManagerTest.cpp
+ ${GRAPH_TEST_LIBS}
+)
 nebula_link_libraries(
  session_manager_test
  ${THRIFT_LIBRARIES}
@@ -32,7 +38,6 @@ nebula_link_libraries(
  gtest
  gtest_main
 )
-
 nebula_add_test(session_manager_test)
 
 
@@ -43,32 +48,10 @@ add_executable(
  TestBase.cpp
  YieldTest.cpp
  SchemaTest.cpp
- $<TARGET_OBJECTS:meta_client>
- $<TARGET_OBJECTS:meta_thrift_obj>
- $<TARGET_OBJECTS:graph_obj>
  $<TARGET_OBJECTS:client_cpp_obj>
- $<TARGET_OBJECTS:base_obj>
- $<TARGET_OBJECTS:graph_thrift_obj>
- $<TARGET_OBJECTS:storage_thrift_obj>
- $<TARGET_OBJECTS:common_thrift_obj>
- $<TARGET_OBJECTS:meta_thrift_obj>
- $<TARGET_OBJECTS:time_obj>
- $<TARGET_OBJECTS:network_obj>
- $<TARGET_OBJECTS:fs_obj>
- $<TARGET_OBJECTS:thread_obj>
- $<TARGET_OBJECTS:thrift_obj>
- $<TARGET_OBJECTS:parser_obj>
- $<TARGET_OBJECTS:filter_obj>
- $<TARGET_OBJECTS:schema_obj>
- $<TARGET_OBJECTS:dataman_obj>
- $<TARGET_OBJECTS:storage_client>
- $<TARGET_OBJECTS:meta_client>
- $<TARGET_OBJECTS:meta_service_handler>
- $<TARGET_OBJECTS:kvstore_obj>
- $<TARGET_OBJECTS:storage_service_handler>
  $<TARGET_OBJECTS:adHocSchema_obj>
+ ${GRAPH_TEST_LIBS}
 )
-
 nebula_link_libraries(
  query_engine_test
  ${THRIFT_LIBRARIES}
@@ -85,28 +68,9 @@ add_executable(
  TestEnv.cpp
  TestBase.cpp
  GoTest.cpp
- $<TARGET_OBJECTS:graph_obj>
  $<TARGET_OBJECTS:client_cpp_obj>
- $<TARGET_OBJECTS:base_obj>
- $<TARGET_OBJECTS:graph_thrift_obj>
- $<TARGET_OBJECTS:storage_thrift_obj>
- $<TARGET_OBJECTS:meta_thrift_obj>
- $<TARGET_OBJECTS:common_thrift_obj>
- $<TARGET_OBJECTS:schema_obj>
- $<TARGET_OBJECTS:time_obj>
- $<TARGET_OBJECTS:network_obj>
- $<TARGET_OBJECTS:fs_obj>
- $<TARGET_OBJECTS:thread_obj>
- $<TARGET_OBJECTS:thrift_obj>
- $<TARGET_OBJECTS:parser_obj>
- $<TARGET_OBJECTS:filter_obj>
- $<TARGET_OBJECTS:dataman_obj>
- $<TARGET_OBJECTS:storage_client>
- $<TARGET_OBJECTS:meta_client>
- $<TARGET_OBJECTS:meta_service_handler>
- $<TARGET_OBJECTS:kvstore_obj>
- $<TARGET_OBJECTS:storage_service_handler>
  $<TARGET_OBJECTS:adHocSchema_obj>
+ ${GRAPH_TEST_LIBS}
 )
 nebula_link_libraries(
  go_test
@@ -124,33 +88,13 @@ add_executable(
  TestEnv.cpp
  TestBase.cpp
  GraphHttpHandlerTest.cpp
- $<TARGET_OBJECTS:graph_obj>
  $<TARGET_OBJECTS:graph_http_obj>
  $<TARGET_OBJECTS:client_cpp_obj>
- $<TARGET_OBJECTS:base_obj>
- $<TARGET_OBJECTS:graph_thrift_obj>
- $<TARGET_OBJECTS:storage_thrift_obj>
- $<TARGET_OBJECTS:common_thrift_obj>
- $<TARGET_OBJECTS:meta_thrift_obj>
- $<TARGET_OBJECTS:schema_obj>
- $<TARGET_OBJECTS:time_obj>
- $<TARGET_OBJECTS:network_obj>
- $<TARGET_OBJECTS:fs_obj>
- $<TARGET_OBJECTS:thread_obj>
- $<TARGET_OBJECTS:thrift_obj>
- $<TARGET_OBJECTS:parser_obj>
- $<TARGET_OBJECTS:filter_obj>
- $<TARGET_OBJECTS:dataman_obj>
- $<TARGET_OBJECTS:storage_client>
- $<TARGET_OBJECTS:meta_client>
- $<TARGET_OBJECTS:meta_service_handler>
- $<TARGET_OBJECTS:kvstore_obj>
- $<TARGET_OBJECTS:process_obj>
  $<TARGET_OBJECTS:ws_obj>
  $<TARGET_OBJECTS:stats_obj>
  $<TARGET_OBJECTS:process_obj>
- $<TARGET_OBJECTS:storage_service_handler>
  $<TARGET_OBJECTS:adHocSchema_obj>
+ ${GRAPH_TEST_LIBS}
 )
 nebula_link_libraries(
  graph_http_test

diff --git a/src/executor/test/TestUtils.h b/src/executor/test/TestUtils.h
@@ -19,7 +19,7 @@ class TestUtils {
  auto sc = std::make_unique<test::ServerContext>();
  auto threadPool = std::make_shared<folly::IOThreadPoolExecutor>(1);
  auto interface = std::make_shared<GraphService>(threadPool);
- test::mockCommon(sc.get(), "graph", port, interface);
+ sc->mockCommon("graph", port, interface);
  LOG(INFO) << "Starting the graph Daemon on port " << sc->port_;
  return sc;
  }