Clean up dependency on proxygen libs (#488)

* Clean up dependency on proxygen libs * Address comments
vesoft-inc · Jun 1, 2019 · c50426e · c50426e
1 parent ea06060
commit c50426e
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 53 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -277,8 +277,6 @@ macro(nebula_link_libraries target)
     target_link_libraries(
         ${target}
         ${ARGN}
-        proxygenhttpserver
-        proxygenlib
         folly
         glog
         gflags

diff --git a/src/daemons/CMakeLists.txt b/src/daemons/CMakeLists.txt
@@ -2,6 +2,7 @@ add_executable(
     nebula-graphd
     GraphDaemon.cpp
     $<TARGET_OBJECTS:meta_client>
+    $<TARGET_OBJECTS:graph_http_obj>
     $<TARGET_OBJECTS:meta_thrift_obj>
     $<TARGET_OBJECTS:graph_obj>
     $<TARGET_OBJECTS:base_obj>
@@ -38,6 +39,7 @@ add_executable(
     nebula-storaged
     StorageDaemon.cpp
     $<TARGET_OBJECTS:storage_service_handler>
+    $<TARGET_OBJECTS:storage_http_handler>
     $<TARGET_OBJECTS:storage_thrift_obj>
     $<TARGET_OBJECTS:kvstore_obj>
     $<TARGET_OBJECTS:meta_client>
@@ -69,6 +71,7 @@ add_executable(
     nebula-metad
     MetaDaemon.cpp
     $<TARGET_OBJECTS:meta_service_handler>
+    $<TARGET_OBJECTS:meta_http_handler>
     $<TARGET_OBJECTS:kvstore_obj>
     $<TARGET_OBJECTS:schema_obj>
     $<TARGET_OBJECTS:meta_client>

diff --git a/src/graph/CMakeLists.txt b/src/graph/CMakeLists.txt
@@ -2,7 +2,6 @@ add_library(
     graph_obj OBJECT
     GraphFlags.cpp
     GraphService.cpp
-    GraphHttpHandler.cpp
     ClientSession.cpp
     SessionManager.cpp
     ExecutionEngine.cpp
@@ -40,12 +39,15 @@ add_dependencies(
     base_obj
     parser_obj
     graph_thrift_obj
-    ws_obj
     meta_thrift_obj
     meta_client
     schema_obj
     stats_obj
 )
 
+add_library(
+    graph_http_obj OBJECT
+    GraphHttpHandler.cpp
+)
 
 add_subdirectory(test)
diff --git a/src/graph/test/CMakeLists.txt b/src/graph/test/CMakeLists.txt
@@ -125,6 +125,7 @@ add_executable(
     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>

diff --git a/src/meta/CMakeLists.txt b/src/meta/CMakeLists.txt
@@ -11,7 +11,6 @@ add_library(
     meta_service_handler OBJECT
     MetaServiceHandler.cpp
     MetaServiceUtils.cpp
-    MetaHttpHandler.cpp
     processors/partsMan/AddHostsProcessor.cpp
     processors/partsMan/ListHostsProcessor.cpp
     processors/partsMan/RemoveHostsProcessor.cpp
@@ -45,10 +44,13 @@ add_dependencies(
     common_thrift_obj
     kvstore_obj
     thread_obj
-    ws_obj
     stats_obj
 )
 
+add_library(
+    meta_http_handler OBJECT
+    MetaHttpHandler.cpp
+)
 
 add_library(
     meta_client OBJECT

diff --git a/src/meta/test/CMakeLists.txt b/src/meta/test/CMakeLists.txt
@@ -36,8 +36,6 @@ add_executable(
 )
 nebula_link_libraries(
     processor_test
-    proxygenhttpserver
-    proxygenlib
     ${ROCKSDB_LIBRARIES}
     ${THRIFT_LIBRARIES}
     wangle
@@ -63,8 +61,6 @@ add_executable(
 )
 nebula_link_libraries(
     hb_processor_test
-    proxygenhttpserver
-    proxygenlib
     ${ROCKSDB_LIBRARIES}
     ${THRIFT_LIBRARIES}
     wangle
@@ -91,8 +87,6 @@ add_executable(
 )
 nebula_link_libraries(
     meta_client_test
-    proxygenhttpserver
-    proxygenlib
     ${ROCKSDB_LIBRARIES}
     ${THRIFT_LIBRARIES}
     wangle
@@ -121,6 +115,7 @@ nebula_add_test(active_hosts_man_test)
 add_executable(
     meta_http_test
     MetaHttpHandlerTest.cpp
+    $<TARGET_OBJECTS:meta_http_handler>
     $<TARGET_OBJECTS:meta_client>
     $<TARGET_OBJECTS:meta_service_handler>
     $<TARGET_OBJECTS:kvstore_obj>

diff --git a/src/storage/CMakeLists.txt b/src/storage/CMakeLists.txt
@@ -1,7 +1,6 @@
 add_library(
     storage_service_handler OBJECT
     StorageServiceHandler.cpp
-    StorageHttpHandler.cpp
     AddVerticesProcessor.cpp
     AddEdgesProcessor.cpp
     QueryBoundProcessor.cpp
@@ -16,10 +15,13 @@ add_dependencies(
     kvstore_obj
     dataman_obj
     thread_obj
-    ws_obj
     stats_obj
 )
 
+add_library(
+    storage_http_handler OBJECT
+    StorageHttpHandler.cpp
+)
 
 add_library(
     storage_client OBJECT
@@ -32,5 +34,4 @@ add_dependencies(
     dataman_obj
 )
 
-
 add_subdirectory(test)
diff --git a/src/storage/test/CMakeLists.txt b/src/storage/test/CMakeLists.txt
@@ -238,17 +238,7 @@ nebula_add_test(storage_client_test)
 add_executable(
     storage_http_test
     StorageHttpHandlerTest.cpp
-    $<TARGET_OBJECTS:storage_client>
-    $<TARGET_OBJECTS:storage_service_handler>
-    $<TARGET_OBJECTS:meta_service_handler>
-    $<TARGET_OBJECTS:kvstore_obj>
-    $<TARGET_OBJECTS:meta_client>
-    $<TARGET_OBJECTS:meta_thrift_obj>
-    $<TARGET_OBJECTS:storage_thrift_obj>
-    $<TARGET_OBJECTS:common_thrift_obj>
-    $<TARGET_OBJECTS:thrift_obj>
-    $<TARGET_OBJECTS:dataman_obj>
-    $<TARGET_OBJECTS:schema_obj>
+    $<TARGET_OBJECTS:storage_http_handler>
     $<TARGET_OBJECTS:ws_obj>
     $<TARGET_OBJECTS:base_obj>
     $<TARGET_OBJECTS:fs_obj>
@@ -257,7 +247,6 @@ add_executable(
     $<TARGET_OBJECTS:network_obj>
     $<TARGET_OBJECTS:thread_obj>
     $<TARGET_OBJECTS:process_obj>
-    $<TARGET_OBJECTS:adHocSchema_obj>
 )
 
  nebula_link_libraries(

diff --git a/src/storage/test/StorageHttpHandlerTest.cpp b/src/storage/test/StorageHttpHandlerTest.cpp
@@ -43,32 +43,6 @@ class StorageHttpHandlerTestEnv : public ::testing::Environment {
 
 
 TEST(StoragehHttpHandlerTest, StorageStatusTest) {
-    FLAGS_load_data_interval_secs = 1;
-
-    fs::TempDir rootPath("/tmp/StorageClientTest.XXXXXX");
-    uint32_t localIp;
-    network::NetworkUtils::ipv4ToInt("127.0.0.1", localIp);
-    uint32_t localMetaPort = 10001;
-    uint32_t localDataPort = 20002;
-
-    LOG(INFO) << "Start meta server....";
-    std::string metaPath = folly::stringPrintf("%s/meta", rootPath.path());
-    auto metaServerContext = meta::TestUtils::mockMetaServer(localMetaPort, metaPath.c_str());
-
-    LOG(INFO) << "Start storage server....";
-    auto threadPool = std::make_shared<folly::IOThreadPoolExecutor>(1);
-    auto addrsRet
-        = network::NetworkUtils::toHosts(folly::stringPrintf("127.0.0.1:%d", localMetaPort));
-    CHECK(addrsRet.ok()) << addrsRet.status();
-    auto mClient
-        = std::make_unique<meta::MetaClient>(threadPool, std::move(addrsRet.value()), true);
-    mClient->init();
-    std::string dataPath = folly::stringPrintf("%s/data", rootPath.path());
-    auto sc = TestUtils::mockStorageServer(mClient.get(),
-                                           dataPath.c_str(),
-                                           localIp,
-                                           localDataPort);
-
     {
         std::string resp;
         ASSERT_TRUE(getUrl("/status", resp));