From f5b00e27d8f4d55ba3235061c24cc1978327e3f7 Mon Sep 17 00:00:00 2001
From: zhao liwei <zlw5307@163.com>
Date: Fri, 10 Jul 2020 15:36:05 +0800
Subject: [PATCH] refactor: modify the dependent lib names which are generated
 by rdsn (#557)

---
 rdsn                                  | 2 +-
 src/client_lib/CMakeLists.txt         | 4 ++--
 src/server/CMakeLists.txt             | 3 +--
 src/server/test/CMakeLists.txt        | 3 +--
 src/shell/CMakeLists.txt              | 3 +--
 src/test/function_test/CMakeLists.txt | 2 +-
 src/test/function_test/global_env.cpp | 1 -
 src/test/function_test/global_env.h   | 7 +++----
 src/test/kill_test/CMakeLists.txt     | 2 +-
 src/test/upgrade_test/CMakeLists.txt  | 2 +-
 10 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/rdsn b/rdsn
index a53199d..4d6561d 160000
--- a/rdsn
+++ b/rdsn
@@ -1 +1 @@
-Subproject commit a53199d2b237388852298b230cededb2100f7029
+Subproject commit 4d6561d3885042548177e5d7d71e15b5cbefa99f
diff --git a/src/client_lib/CMakeLists.txt b/src/client_lib/CMakeLists.txt
index 37d022f..2c47dd6 100644
--- a/src/client_lib/CMakeLists.txt
+++ b/src/client_lib/CMakeLists.txt
@@ -13,7 +13,7 @@ target_include_directories(pegasus_client_impl_objects PUBLIC $<TARGET_PROPERTY:
 set(pegasus_client_static_lib ${CMAKE_CURRENT_BINARY_DIR}/libpegasus_client_static.a)
 add_custom_target(combine_lib
     COMMAND ar -x ${DSN_ROOT}/lib/libdsn_runtime.a
-    COMMAND ar -x ${DSN_ROOT}/lib/libdsn_replication_client.a
+    COMMAND ar -x ${DSN_ROOT}/lib/libdsn_client.a
     COMMAND ar -x ${DSN_ROOT}/lib/libdsn_replication_common.a
     COMMAND ar -x ${DSN_THIRDPARTY_ROOT}/lib/libthrift.a
     COMMAND ar -x ${CMAKE_BINARY_DIR}/base/libpegasus_base.a
@@ -36,7 +36,7 @@ add_library(pegasus_client_shared SHARED $<TARGET_OBJECTS:pegasus_client_impl_ob
 target_link_libraries(pegasus_client_shared PRIVATE
     pegasus_base
     dsn_runtime
-    dsn_replication_client
+    dsn_client
     dsn_replication_common
     thrift)
 install(TARGETS pegasus_client_shared DESTINATION "lib")
diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
index 3af9fe4..319538a 100644
--- a/src/server/CMakeLists.txt
+++ b/src/server/CMakeLists.txt
@@ -13,12 +13,11 @@ set(MY_PROJ_LIBS
     dsn_replica_server
     dsn_meta_server
     dsn_replication_common
-    dsn.replication.ddlclient
+    dsn_client
     dsn.block_service.local
     dsn.block_service.fds
     dsn.block_service
     dsn.failure_detector
-    dsn.failure_detector.multimaster
     dsn.replication.zookeeper_provider
     RocksDB::rocksdb
     pegasus_reporter
diff --git a/src/server/test/CMakeLists.txt b/src/server/test/CMakeLists.txt
index e305c24..5912876 100644
--- a/src/server/test/CMakeLists.txt
+++ b/src/server/test/CMakeLists.txt
@@ -18,12 +18,11 @@ set(MY_PROJ_LIBS
         dsn_replica_server
         dsn_meta_server
         dsn_replication_common
-        dsn.replication.ddlclient
+        dsn_client
         dsn.block_service.local
         dsn.block_service.fds
         dsn.block_service
         dsn.failure_detector
-        dsn.failure_detector.multimaster
         dsn.replication.zookeeper_provider
         pegasus_reporter
         RocksDB::rocksdb
diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt
index 856b0b7..11305a6 100644
--- a/src/shell/CMakeLists.txt
+++ b/src/shell/CMakeLists.txt
@@ -15,12 +15,11 @@ set(MY_PROJ_LIBS
     dsn.replication.tool
     dsn_replica_server
     dsn_replication_common
-    dsn.replication.ddlclient
+    dsn_client
     dsn.block_service.local
     dsn.block_service.fds
     dsn.block_service
     dsn.failure_detector
-    dsn.failure_detector.multimaster
     pegasus_client_static
     galaxy-fds-sdk-cpp
     PocoNet
diff --git a/src/test/function_test/CMakeLists.txt b/src/test/function_test/CMakeLists.txt
index c5700a9..0ad0aad 100644
--- a/src/test/function_test/CMakeLists.txt
+++ b/src/test/function_test/CMakeLists.txt
@@ -11,7 +11,7 @@ set(MY_PROJ_SRC "")
 set(MY_SRC_SEARCH_MODE "GLOB")
 
 set(MY_PROJ_LIBS
-    dsn.replication.ddlclient
+    dsn_client
     dsn_replication_common
     pegasus_client_static
     gtest
diff --git a/src/test/function_test/global_env.cpp b/src/test/function_test/global_env.cpp
index ad7f474..f546dae 100644
--- a/src/test/function_test/global_env.cpp
+++ b/src/test/function_test/global_env.cpp
@@ -14,7 +14,6 @@
 #include <arpa/inet.h>
 
 #include "global_env.h"
-global_env global_env::inst;
 
 global_env::global_env()
 {
diff --git a/src/test/function_test/global_env.h b/src/test/function_test/global_env.h
index 543c907..41ed13e 100644
--- a/src/test/function_test/global_env.h
+++ b/src/test/function_test/global_env.h
@@ -7,15 +7,13 @@
 #include <string>
 #include <sstream>
 
-class global_env
+class global_env : public dsn::utils::singleton<global_env>
 {
 public:
     std::string _pegasus_root;
     std::string _working_dir;
     std::string _host_ip;
 
-    static global_env &instance() { return inst; }
-
 private:
     global_env();
     global_env(const global_env &other) = delete;
@@ -23,5 +21,6 @@ private:
 
     void get_hostip();
     void get_dirs();
-    static global_env inst;
+
+    friend dsn::utils::singleton<global_env>;
 };
diff --git a/src/test/kill_test/CMakeLists.txt b/src/test/kill_test/CMakeLists.txt
index 6246d20..2706310 100644
--- a/src/test/kill_test/CMakeLists.txt
+++ b/src/test/kill_test/CMakeLists.txt
@@ -13,7 +13,7 @@ set(MY_SRC_SEARCH_MODE "GLOB")
 set(MY_PROJ_LIBS
     pegasus_base
     pegasus_client_static
-    dsn.replication.ddlclient
+    dsn_client
     dsn_replication_common
     dsn_dist_cmd
     dsn_runtime
diff --git a/src/test/upgrade_test/CMakeLists.txt b/src/test/upgrade_test/CMakeLists.txt
index e84b9e9..e1e7ea4 100644
--- a/src/test/upgrade_test/CMakeLists.txt
+++ b/src/test/upgrade_test/CMakeLists.txt
@@ -13,7 +13,7 @@ set(MY_SRC_SEARCH_MODE "GLOB")
 set(MY_PROJ_LIBS
     pegasus_base
     pegasus_client_static
-    dsn.replication.ddlclient
+    dsn_client
     dsn_replication_common
     dsn_runtime
     )
-- 
GitLab