replication: rename clientlib to common (#137)

XiaoMi · Jul 17, 2018 · a1060c3 · a1060c3
1 parent 0a1eb68
commit a1060c3
Show file tree

Hide file tree

Showing 38 changed files with 48 additions and 89 deletions.
diff --git a/src/dist/replication/CMakeLists.txt b/src/dist/replication/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_subdirectory(client_lib)
+add_subdirectory(common)
 add_subdirectory(ddl_lib)
 add_subdirectory(tool_lib)
 add_subdirectory(meta_server)

diff --git a/src/dist/replication/client_lib/replication_ds.h b/src/dist/replication/client_lib/replication_ds.h
diff --git a/...ist/replication/client_lib/CMakeLists.txt → src/dist/replication/common/CMakeLists.txt b/...ist/replication/client_lib/CMakeLists.txt → src/dist/replication/common/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(MY_PROJ_NAME dsn.replication.clientlib)
+set(MY_PROJ_NAME dsn_replication_common)
 
 # Source files under CURRENT project directory will be automatically included.
 # You can manually set MY_PROJ_SRC to include source files under other directories.

diff --git a/...tion/client_lib/block_service_manager.cpp → ...lication/common/block_service_manager.cpp b/...tion/client_lib/block_service_manager.cpp → ...lication/common/block_service_manager.cpp
diff --git a/...cation/client_lib/block_service_manager.h → ...eplication/common/block_service_manager.h b/...cation/client_lib/block_service_manager.h → ...eplication/common/block_service_manager.h
diff --git a/...ist/replication/client_lib/fs_manager.cpp → src/dist/replication/common/fs_manager.cpp b/...ist/replication/client_lib/fs_manager.cpp → src/dist/replication/common/fs_manager.cpp
diff --git a/src/dist/replication/client_lib/fs_manager.h → src/dist/replication/common/fs_manager.h b/src/dist/replication/client_lib/fs_manager.h → src/dist/replication/common/fs_manager.h
@@ -38,7 +38,7 @@
 #include <dsn/cpp/zlocks.h>
 #include <dsn/perf_counter/perf_counter_wrapper.h>
 #include <memory>
-#include "dist/replication/client_lib/replication_common.h"
+#include "dist/replication/common/replication_common.h"
 
 namespace dsn {
 namespace replication {

diff --git a/...ication/client_lib/replication_common.cpp → ...replication/common/replication_common.cpp b/...ication/client_lib/replication_common.cpp → ...replication/common/replication_common.cpp
diff --git a/...plication/client_lib/replication_common.h → ...t/replication/common/replication_common.h b/...plication/client_lib/replication_common.h → ...t/replication/common/replication_common.h
@@ -37,7 +37,6 @@
 
 #include <dsn/dist/replication.h>
 #include <string>
-#include "dist/replication/client_lib/replication_ds.h"
 
 using namespace ::dsn::service;
 

diff --git a/...lication/client_lib/replication_types.cpp → .../replication/common/replication_types.cpp b/...lication/client_lib/replication_types.cpp → .../replication/common/replication_types.cpp
diff --git a/src/dist/replication/lib/CMakeLists.txt b/src/dist/replication/lib/CMakeLists.txt
@@ -12,7 +12,7 @@ set(MY_SRC_SEARCH_MODE "GLOB")
 set(MY_PROJ_INC_PATH "")
 
 set(MY_PROJ_LIBS 
-    dsn.replication.clientlib
+    dsn_replication_common
     dsn.failure_detector
     dsn.failure_detector.multimaster
     )

diff --git a/src/dist/replication/lib/mutation.h b/src/dist/replication/lib/mutation.h
@@ -35,7 +35,7 @@
 
 #pragma once
 
-#include "../client_lib/replication_common.h"
+#include "../common/replication_common.h"
 #include <list>
 #include <atomic>
 #include <dsn/utility/link.h>

diff --git a/src/dist/replication/lib/mutation_cache.h b/src/dist/replication/lib/mutation_cache.h
@@ -35,7 +35,7 @@
 
 #pragma once
 
-#include "../client_lib/replication_common.h"
+#include "../common/replication_common.h"
 #include "mutation.h"
 #include <vector>
 #include <atomic>

diff --git a/src/dist/replication/lib/mutation_log.h b/src/dist/replication/lib/mutation_log.h
@@ -35,7 +35,7 @@
 
 #pragma once
 
-#include "../client_lib/replication_common.h"
+#include "../common/replication_common.h"
 #include "mutation.h"
 #include <atomic>
 

diff --git a/src/dist/replication/lib/replica.h b/src/dist/replication/lib/replica.h
@@ -49,7 +49,7 @@
 #include <dsn/perf_counter/perf_counter_wrapper.h>
 #include <dsn/dist/replication/replica_base.h>
 
-#include "dist/replication/client_lib/replication_common.h"
+#include "dist/replication/common/replication_common.h"
 #include "mutation.h"
 #include "mutation_log.h"
 #include "prepare_list.h"

diff --git a/src/dist/replication/lib/replica_backup.cpp b/src/dist/replication/lib/replica_backup.cpp
@@ -3,7 +3,7 @@
 #include <dsn/utility/filesystem.h>
 #include <dsn/dist/replication/replication_app_base.h>
 
-#include "dist/replication/client_lib/block_service_manager.h"
+#include "dist/replication/common/block_service_manager.h"
 
 #include "replica.h"
 #include "mutation.h"

diff --git a/src/dist/replication/lib/replica_context.cpp b/src/dist/replication/lib/replica_context.cpp
@@ -41,7 +41,7 @@
 #include "replica_stub.h"
 #include "mutation.h"
 #include "mutation_log.h"
-#include "../client_lib/block_service_manager.h"
+#include "../common/block_service_manager.h"
 
 namespace dsn {
 namespace replication {

diff --git a/src/dist/replication/lib/replica_restore.cpp b/src/dist/replication/lib/replica_restore.cpp
@@ -11,7 +11,7 @@
 #include "replica.h"
 #include "mutation_log.h"
 #include "replica_stub.h"
-#include "../client_lib/block_service_manager.h"
+#include "../common/block_service_manager.h"
 
 using namespace dsn::dist::block_service;
 

diff --git a/src/dist/replication/lib/replica_stub.h b/src/dist/replication/lib/replica_stub.h
@@ -32,9 +32,9 @@
 //   replica_stub(singleton) --> replica --> replication_app
 //
 
-#include "../client_lib/replication_common.h"
-#include "../client_lib/fs_manager.h"
-#include "../client_lib/block_service_manager.h"
+#include "../common/replication_common.h"
+#include "../common/fs_manager.h"
+#include "../common/block_service_manager.h"
 #include "replica.h"
 #include <dsn/perf_counter/perf_counter_wrapper.h>
 #include <dsn/dist/failure_detector_multimaster.h>

diff --git a/src/dist/replication/lib/replication_service_app.cpp b/src/dist/replication/lib/replication_service_app.cpp
@@ -34,7 +34,7 @@
  */
 
 #include <dsn/dist/replication/replication_service_app.h>
-#include "dist/replication/client_lib/replication_common.h"
+#include "dist/replication/common/replication_common.h"
 #include "replica_stub.h"
 
 namespace dsn {

diff --git a/src/dist/replication/meta_server/CMakeLists.txt b/src/dist/replication/meta_server/CMakeLists.txt
@@ -12,7 +12,7 @@ set(MY_SRC_SEARCH_MODE "GLOB_RECURSE")
 set(MY_PROJ_INC_PATH)
 
 set(MY_PROJ_LIBS
-    dsn.replication.clientlib
+    dsn_replication_common
     dsn.block_service.local
     dsn.block_service.fds
     dsn.failure_detector

diff --git a/src/dist/replication/meta_server/distributed_lock_service_simple.cpp b/src/dist/replication/meta_server/distributed_lock_service_simple.cpp
@@ -35,7 +35,7 @@
 
 #include <dsn/tool-api/async_calls.h>
 
-#include "dist/replication/client_lib/replication_common.h"
+#include "dist/replication/common/replication_common.h"
 #include "distributed_lock_service_simple.h"
 
 namespace dsn {

diff --git a/src/dist/replication/meta_server/meta_backup_service.cpp b/src/dist/replication/meta_server/meta_backup_service.cpp
@@ -3,7 +3,7 @@
 #include "meta_backup_service.h"
 #include "dist/replication/meta_server/meta_service.h"
 #include "dist/replication/meta_server/server_state.h"
-#include "dist/replication/client_lib/block_service_manager.h"
+#include "dist/replication/common/block_service_manager.h"
 
 namespace dsn {
 namespace replication {

diff --git a/src/dist/replication/meta_server/meta_server_failure_detector.h b/src/dist/replication/meta_server/meta_server_failure_detector.h
@@ -38,7 +38,7 @@
 #include <dsn/dist/failure_detector.h>
 #include <dsn/dist/distributed_lock_service.h>
 
-#include "dist/replication/client_lib/replication_common.h"
+#include "dist/replication/common/replication_common.h"
 #include "dist/replication/meta_server/meta_options.h"
 
 namespace dsn {

diff --git a/src/dist/replication/meta_server/meta_service.h b/src/dist/replication/meta_server/meta_service.h
@@ -41,11 +41,11 @@
 #include <dsn/dist/meta_state_service.h>
 #include <dsn/perf_counter/perf_counter_wrapper.h>
 
-#include "dist/replication/client_lib/replication_common.h"
+#include "dist/replication/common/replication_common.h"
 #include "dist/replication/meta_server/meta_options.h"
 #include "dist/replication/meta_server/meta_backup_service.h"
 #include "dist/replication/meta_server/meta_state_service_utils.h"
-#include "dist/replication/client_lib/block_service_manager.h"
+#include "dist/replication/common/block_service_manager.h"
 
 class meta_service_test_app;
 namespace dsn {

diff --git a/src/dist/replication/meta_server/meta_state_service_simple.h b/src/dist/replication/meta_server/meta_state_service_simple.h
@@ -34,7 +34,7 @@
  */
 
 #include <dsn/dist/meta_state_service.h>
-#include "dist/replication/client_lib/replication_common.h"
+#include "dist/replication/common/replication_common.h"
 
 #include <queue>
 

diff --git a/src/dist/replication/meta_server/server_state.h b/src/dist/replication/meta_server/server_state.h
@@ -43,7 +43,7 @@
 #include <dsn/tool-api/task_tracker.h>
 #include <dsn/perf_counter/perf_counter_wrapper.h>
 
-#include "dist/replication/client_lib/replication_common.h"
+#include "dist/replication/common/replication_common.h"
 #include "dist/replication/meta_server/meta_data.h"
 
 #include "meta_service.h"

diff --git a/src/dist/replication/meta_server/server_state_restore.cpp b/src/dist/replication/meta_server/server_state_restore.cpp
@@ -28,8 +28,8 @@
 #include <dsn/dist/block_service.h>
 #include <boost/lexical_cast.hpp>
 
-#include "dist/replication/client_lib/block_service_manager.h"
-#include "dist/replication/client_lib/replication_common.h"
+#include "dist/replication/common/block_service_manager.h"
+#include "dist/replication/common/replication_common.h"
 #include "dist/replication/meta_server/meta_service.h"
 #include "dist/replication/meta_server/server_state.h"
 

diff --git a/src/dist/replication/test/meta_test/balancer_simulator/CMakeLists.txt b/src/dist/replication/test/meta_test/balancer_simulator/CMakeLists.txt
@@ -12,7 +12,7 @@ set(MY_SRC_SEARCH_MODE "GLOB")
 set(MY_PROJ_INC_PATH)
 
 set(MY_PROJ_LIBS dsn_meta_server
-                 dsn.replication.clientlib
+                 dsn_replication_common
                  dsn.block_service.local
                  dsn.block_service.fds
                  fmt

diff --git a/src/dist/replication/test/meta_test/misc/misc.cpp b/src/dist/replication/test/meta_test/misc/misc.cpp
@@ -3,7 +3,7 @@
 #include <boost/lexical_cast.hpp>
 
 #include <dsn/dist/replication/replication.types.h>
-#include "dist/replication/client_lib/replication_common.h"
+#include "dist/replication/common/replication_common.h"
 #include "misc.h"
 
 using namespace dsn::replication;

diff --git a/src/dist/replication/test/meta_test/misc/misc.h b/src/dist/replication/test/meta_test/misc/misc.h
@@ -6,7 +6,7 @@
 #include <dsn/service_api_cpp.h>
 #include <dsn/dist/replication/replication.types.h>
 #include "dist/replication/meta_server/meta_data.h"
-#include "dist/replication/client_lib/fs_manager.h"
+#include "dist/replication/common/fs_manager.h"
 
 typedef std::map<dsn::rpc_address, std::shared_ptr<dsn::replication::fs_manager>> nodes_fs_manager;
 

diff --git a/src/dist/replication/test/meta_test/unit_test/CMakeLists.txt b/src/dist/replication/test/meta_test/unit_test/CMakeLists.txt
@@ -14,7 +14,7 @@ ms_find_source_files("CXX" "${CMAKE_CURRENT_SOURCE_DIR}/../../../meta_server" "G
 set(MY_PROJ_INC_PATH "")
 
 set(MY_PROJ_LIBS dsn.replication.zookeeper_provider
-                 dsn.replication.clientlib
+                 dsn_replication_common
                  dsn.block_service.local
                  dsn.block_service.fds
                  dsn.failure_detector

diff --git a/src/dist/replication/test/replica_test/unit_test/CMakeLists.txt b/src/dist/replication/test/replica_test/unit_test/CMakeLists.txt
@@ -14,7 +14,7 @@ set(MY_PROJ_INC_PATH "")
 set(MY_PROJ_LIBS dsn_meta_server
                  dsn_replica_server
                  dsn.replication.zookeeper_provider
-                 dsn.replication.clientlib
+                 dsn_replication_common
                  dsn.block_service.local
                  dsn.block_service.fds
                  dsn.failure_detector

diff --git a/src/dist/replication/test/simple_kv/CMakeLists.txt b/src/dist/replication/test/simple_kv/CMakeLists.txt
@@ -15,7 +15,7 @@ set(MY_PROJ_LIBS gtest
                  dsn_runtime
                  dsn_replica_server
                  dsn_meta_server
-                 dsn.replication.clientlib
+                 dsn_replication_common
                  dsn.block_service.local
                  dsn.block_service.fds
                  dsn.failure_detector.multimaster

diff --git a/src/dist/replication/test/simple_kv/checker.cpp b/src/dist/replication/test/simple_kv/checker.cpp
@@ -33,25 +33,24 @@
  *     xxxx-xx-xx, author, fix bug about xxx
  */
 
+#include <sstream>
+#include <boost/lexical_cast.hpp>
+#include <dsn/utility/factory_store.h>
+#include <dsn/tool_api.h>
+
 #include "checker.h"
 #include "case.h"
-#include "dsn/utility/factory_store.h"
-
-#include "../../lib/replica.h"
-#include "../../lib/replica_stub.h"
-#include "../../lib/mutation_log.h"
-#include "../../meta_server/meta_service.h"
-#include "../../meta_server/meta_server_failure_detector.h"
-#include "../../meta_server/server_state.h"
-#include "../../meta_server/server_load_balancer.h"
-#include "../../client_lib/replication_ds.h"
-#include "../../../../core/core/service_engine.h"
-#include "../../../../core/core/rpc_engine.h"
 
-#include <sstream>
-#include <boost/lexical_cast.hpp>
+#include "dist/replication/lib/replica.h"
+#include "dist/replication/lib/replica_stub.h"
+#include "dist/replication/lib/mutation_log.h"
+#include "dist/replication/meta_server/meta_service.h"
+#include "dist/replication/meta_server/meta_server_failure_detector.h"
+#include "dist/replication/meta_server/server_state.h"
+#include "dist/replication/meta_server/server_load_balancer.h"
 
-#include <dsn/tool_api.h>
+#include "core/core/service_engine.h"
+#include "core/core/rpc_engine.h"
 
 namespace dsn {
 namespace replication {

diff --git a/src/dist/replication/test/simple_kv/common.h b/src/dist/replication/test/simple_kv/common.h
@@ -36,7 +36,7 @@
 #pragma once
 
 #include <dsn/dist/replication.h>
-#include "dist/replication/client_lib/replication_common.h"
+#include "dist/replication/common/replication_common.h"
 
 namespace dsn {
 namespace replication {

diff --git a/src/tests/dsn/CMakeLists.txt b/src/tests/dsn/CMakeLists.txt
@@ -18,7 +18,7 @@ endif()
 set(MY_PROJ_LIBS 
     dsn_meta_server
     dsn_replica_server
-    dsn.replication.clientlib
+    dsn_replication_common
     dsn.block_service.local
     dsn.block_service.fds
     dsn.failure_detector.multimaster

diff --git a/src/tools/repli/CMakeLists.txt b/src/tools/repli/CMakeLists.txt
@@ -15,7 +15,7 @@ set(MY_BOOST_PACKAGES system filesystem)
 
 set(MY_PROJ_LIB_PATH "")
 set(MY_PROJ_LIBS dsn_replica_server
-                 dsn.replication.clientlib
+                 dsn_replication_common
                  dsn.block_service.local
                  dsn.block_service.fds
                  dsn.failure_detector