acelyc111 · acelyc111 · Dec 19, 2023
diff --git a/.licenserc.yaml b/.licenserc.yaml
@@ -162,7 +162,7 @@ header:
     - 'src/aio/file_io.h'
     - 'src/runtime/task/future_types.h'
     - 'src/runtime/global_config.h'
-    - 'src/common/gpid.h'
+    - 'src/utils/gpid.h'
     - 'src/runtime/rpc/group_address.h'
     - 'src/utils/logging_provider.h'
     - 'src/runtime/rpc/message_parser.h'

diff --git a/cmake_modules/BaseFunctions.cmake b/cmake_modules/BaseFunctions.cmake
@@ -156,12 +156,6 @@ function(dsn_add_static_library)
   dsn_install_library()
 endfunction(dsn_add_static_library)
 
-function(dsn_add_shared_library)
-  set(MY_PROJ_TYPE "SHARED")
-  dsn_add_project()
-  dsn_install_library()
-endfunction(dsn_add_shared_library)
-
 function(dsn_add_executable)
   set(MY_PROJ_TYPE "EXECUTABLE")
   dsn_add_project()

diff --git a/src/aio/CMakeLists.txt b/src/aio/CMakeLists.txt
@@ -35,6 +35,9 @@ set(MY_SRC_SEARCH_MODE "GLOB")
 
 set(MY_PROJ_LIBS
         dsn_runtime
+        sasl2
+        gssapi_krb5
+        krb5
         rocksdb
         lz4
         zstd

diff --git a/src/aio/test/CMakeLists.txt b/src/aio/test/CMakeLists.txt
@@ -30,8 +30,12 @@ set(MY_PROJ_LIBS
         dsn_meta_server
         dsn_ranger
         dsn_replication_common
+        sasl2
+        gssapi_krb5
+        krb5
         dsn_aio
         test_utils
+        dsn_utils
         gtest
         rocksdb
         lz4

diff --git a/src/base/CMakeLists.txt b/src/base/CMakeLists.txt
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-set(MY_PROJ_NAME "pegasus_base")
+set(MY_PROJ_NAME pegasus_base)
 
 if(UNIX)
     add_compile_options(-fPIC)

diff --git a/src/base/test/CMakeLists.txt b/src/base/test/CMakeLists.txt
@@ -28,10 +28,13 @@ set(MY_PROJ_SRC "")
 set(MY_SRC_SEARCH_MODE "GLOB")
 
 set(MY_PROJ_LIBS
-    dsn_runtime
-    dsn_utils
-    pegasus_base
-    gtest)
+        dsn_runtime
+        sasl2
+        gssapi_krb5
+        krb5
+        dsn_utils
+        pegasus_base
+        gtest)
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)
 

diff --git a/src/block_service/block_service.h b/src/block_service/block_service.h
@@ -28,7 +28,7 @@
 #include "utils/error_code.h"
 #include "utils/threadpool_code.h"
 #include "runtime/task/task_code.h"
-#include "common/gpid.h"
+#include "utils/gpid.h"
 #include "runtime/rpc/serialization.h"
 #include "runtime/rpc/rpc_stream.h"
 #include "runtime/serverlet.h"

diff --git a/src/block_service/test/CMakeLists.txt b/src/block_service/test/CMakeLists.txt
@@ -27,6 +27,9 @@ set(MY_PROJ_LIBS
         dsn.block_service.local
         dsn.block_service.hdfs
         dsn_runtime
+        sasl2
+        gssapi_krb5
+        krb5
         dsn_utils
         gtest
         gtest_main

diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
@@ -33,7 +33,9 @@ set(MY_PROJ_SRC "")
 # "GLOB" for non-recursive search
 set(MY_SRC_SEARCH_MODE "GLOB")
 
-set(MY_PROJ_LIBS "")
+set(MY_PROJ_LIBS
+        dsn_utils
+        dsn_replication_common)
 
 # Extra files that will be installed
 set(MY_BINPLACES "")

diff --git a/src/client/partition_resolver.h b/src/client/partition_resolver.h
@@ -33,7 +33,7 @@
 #include <utility>
 #include <vector>
 
-#include "common/gpid.h"
+#include "utils/gpid.h"
 #include "runtime/rpc/rpc_address.h"
 #include "runtime/rpc/rpc_message.h"
 #include "runtime/rpc/serialization.h"

diff --git a/src/client/partition_resolver_simple.cpp b/src/client/partition_resolver_simple.cpp
@@ -31,7 +31,7 @@
 #include <utility>
 #include <vector>
 
-#include "common/gpid.h"
+#include "utils/gpid.h"
 #include "dsn.layer2_types.h"
 #include "partition_resolver_simple.h"
 #include "runtime/api_layer1.h"

diff --git a/src/client/replication_ddl_client.cpp b/src/client/replication_ddl_client.cpp
@@ -38,7 +38,7 @@
 #include "backup_types.h"
 #include "common//duplication_common.h"
 #include "common/bulk_load_common.h"
-#include "common/gpid.h"
+#include "utils/gpid.h"
 #include "common/manual_compact.h"
 #include "common/partition_split_common.h"
 #include "common/replication.codes.h"
@@ -513,8 +513,9 @@ std::string host_name_resolve(bool resolve_ip, std::string value)
 {
     if (resolve_ip) {
         std::string temp;
-        if (dsn::utils::hostname_from_ip_port(value.c_str(), &temp))
+        if (dsn::utils::hostname_from_ip_port(value.c_str(), &temp)) {
             return temp;
+        }
     }
     return value;
 }

diff --git a/src/client/test/CMakeLists.txt b/src/client/test/CMakeLists.txt
@@ -25,6 +25,9 @@ set(MY_PROJ_LIBS
         dsn_client
         dsn_replication_common
         dsn_runtime
+        sasl2
+        gssapi_krb5
+        krb5
         dsn_utils
         gtest
         rocksdb

diff --git a/src/client_lib/CMakeLists.txt b/src/client_lib/CMakeLists.txt
@@ -16,7 +16,7 @@
 # under the License.
 
 # TODO(yingchun): should export shared lib too!!!
-set(MY_PROJ_NAME "pegasus_client_static")
+set(MY_PROJ_NAME pegasus_client_static)
 
 add_definitions(-fPIC)
 

diff --git a/src/client_lib/pegasus_scanner_impl.cpp b/src/client_lib/pegasus_scanner_impl.cpp
@@ -28,7 +28,7 @@
 #include <vector>
 
 #include "base/pegasus_const.h"
-#include "common/gpid.h"
+#include "utils/gpid.h"
 #include "pegasus/client.h"
 #include "pegasus/error.h"
 #include "pegasus_client_impl.h"

diff --git a/src/common/backup_common.cpp b/src/common/backup_common.cpp
@@ -17,7 +17,7 @@
 
 #include "backup_common.h"
 
-#include "common/gpid.h"
+#include "utils/gpid.h"
 #include "runtime/api_layer1.h"
 #include "runtime/rpc/rpc_address.h"
 

diff --git a/src/common/fs_manager.cpp b/src/common/fs_manager.cpp
@@ -33,7 +33,7 @@
 #include <utility>
 
 #include "absl/strings/string_view.h"
-#include "common/gpid.h"
+#include "utils/gpid.h"
 #include "common/replication_enums.h"
 #include "fmt/core.h"
 #include "replica_admin_types.h"

diff --git a/src/common/json_helper.h b/src/common/json_helper.h
@@ -50,7 +50,7 @@
 #include "utils/error_code.h"
 #include "utils/threadpool_code.h"
 #include "runtime/task/task_code.h"
-#include "common/gpid.h"
+#include "utils/gpid.h"
 #include "meta_admin_types.h"
 #include "partition_split_types.h"
 #include "duplication_types.h"

diff --git a/src/common/replication.codes.h b/src/common/replication.codes.h
@@ -29,7 +29,7 @@
 #include "utils/error_code.h"
 #include "utils/threadpool_code.h"
 #include "runtime/task/task_code.h"
-#include "common/gpid.h"
+#include "utils/gpid.h"
 
 DEFINE_THREAD_POOL_CODE(THREAD_POOL_META_SERVER)
 DEFINE_THREAD_POOL_CODE(THREAD_POOL_META_STATE)

diff --git a/src/common/replication_common.cpp b/src/common/replication_common.cpp
@@ -33,7 +33,7 @@
 #include <memory>
 #include <set>
 
-#include "common/gpid.h"
+#include "utils/gpid.h"
 #include "common/replica_envs.h"
 #include "common/replication_other_types.h"
 #include "dsn.layer2_types.h"

diff --git a/src/common/storage_serverlet.h b/src/common/storage_serverlet.h
@@ -39,7 +39,7 @@
 #include "utils/error_code.h"
 #include "utils/threadpool_code.h"
 #include "runtime/task/task_code.h"
-#include "common/gpid.h"
+#include "utils/gpid.h"
 #include "runtime/rpc/serialization.h"
 #include "runtime/rpc/rpc_stream.h"
 #include "runtime/serverlet.h"

diff --git a/src/common/test/CMakeLists.txt b/src/common/test/CMakeLists.txt
@@ -30,6 +30,10 @@ set(MY_PROJ_LIBS
         dsn_http
         dsn_replication_common
         dsn_runtime
+        sasl2
+        gssapi_krb5
+        krb5
+        dsn_utils
         gtest
         rocksdb
         lz4

diff --git a/src/common/test/fs_manager_test.cpp b/src/common/test/fs_manager_test.cpp
@@ -26,7 +26,7 @@
 #include <vector>
 
 #include "common/fs_manager.h"
-#include "common/gpid.h"
+#include "utils/gpid.h"
 #include "common/replication_other_types.h"
 #include "gtest/gtest.h"
 #include "metadata_types.h"

diff --git a/src/failure_detector/fd.code.definition.h b/src/failure_detector/fd.code.definition.h
@@ -34,7 +34,7 @@
 #include "utils/error_code.h"
 #include "utils/threadpool_code.h"
 #include "runtime/task/task_code.h"
-#include "common/gpid.h"
+#include "utils/gpid.h"
 #include "runtime/rpc/serialization.h"
 #include "runtime/rpc/rpc_stream.h"
 #include "runtime/serverlet.h"

diff --git a/src/failure_detector/test/CMakeLists.txt b/src/failure_detector/test/CMakeLists.txt
@@ -26,14 +26,28 @@ set(MY_PROJ_NAME dsn.failure_detector.tests)
 set(MY_PROJ_SRC "")
 set(MY_SRC_SEARCH_MODE "GLOB")
 set(MY_PROJ_LIBS
-        dsn_runtime
         dsn_meta_server
         dsn_ranger
+        dsn_runtime
+        sasl2
+        gssapi_krb5
+        krb5
         dsn_replica_server
+        dsn.security
+        dsn_nfs
+        dsn_aio
+        dsn_dist_cmd
         dsn_replication_common
+        dsn.block_service
+        dsn.block_service.hdfs
+        dsn.block_service.local
         dsn.failure_detector
-        gtest
+        dsn.replication.zookeeper_provider
+        zookeeper
         hashtable
+        dsn_utils
+        gtest
+        test_utils
         rocksdb
         lz4
         zstd

diff --git a/src/geo/bench/CMakeLists.txt b/src/geo/bench/CMakeLists.txt
@@ -28,17 +28,25 @@ set(MY_PROJ_SRC "")
 set(MY_SRC_SEARCH_MODE "GLOB")
 
 set(MY_PROJ_LIBS
+        dsn_runtime
+        sasl2
+        gssapi_krb5
+        krb5
+        pegasus_geo_lib
+        pegasus_client_static
+        dsn_client
+        dsn_utils
+        dsn_http
+        dsn_replication_common
         absl::flat_hash_set
         absl::strings
-        pegasus_geo_lib
         s2testing
         s2
-        pegasus_client_static
+        thrift
         rocksdb
         lz4
         zstd
-        snappy
-        dsn_utils)
+        snappy)
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)
 

diff --git a/src/geo/lib/CMakeLists.txt b/src/geo/lib/CMakeLists.txt
@@ -27,10 +27,9 @@ set(MY_PROJ_SRC "")
 # "GLOB" for non-recursive search
 set(MY_SRC_SEARCH_MODE "GLOB")
 
-set(MY_PROJ_LIBS ""
-        # s2
-        # pegasus_client_static
-        )
+set(MY_PROJ_LIBS
+        s2
+        pegasus_client_static)
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)
 

diff --git a/src/geo/test/CMakeLists.txt b/src/geo/test/CMakeLists.txt
@@ -28,12 +28,17 @@ set(MY_PROJ_SRC "")
 set(MY_SRC_SEARCH_MODE "GLOB")
 
 set(MY_PROJ_LIBS
+        dsn_runtime
+        sasl2
+        gssapi_krb5
+        krb5
         absl::flat_hash_set
         absl::strings
         pegasus_geo_lib
         s2testing
         s2
         pegasus_client_static
+        dsn_client
         dsn_utils
         gtest)
 

diff --git a/src/http/CMakeLists.txt b/src/http/CMakeLists.txt
@@ -21,7 +21,8 @@ set(MY_PROJ_SRC ${THIRDPARTY_ROOT}/build/Source/http-parser/http_parser.c)
 
 set(MY_SRC_SEARCH_MODE "GLOB")
 
-set(MY_PROJ_LIBS "")
+set(MY_PROJ_LIBS
+        dsn_replication_common)
 
 dsn_add_static_library()
 

diff --git a/src/http/http_server.h b/src/http/http_server.h
@@ -113,12 +113,13 @@ class http_server_base : public http_service
     {
         static std::once_flag flag;
         std::call_once(flag, [&]() {
-            register_handler("updateConfig",
-                             std::bind(&http_server_base::update_config_handler,
-                                       this,
-                                       std::placeholders::_1,
-                                       std::placeholders::_2),
-                             "ip:port/updateConfig?<key>=<value>");
+            // undefined reference to `dsn::http_server_base::update_config_handler
+            //            register_handler("updateConfig",
+            //                             std::bind(&http_server_base::update_config_handler,
+            //                                       this,
+            //                                       std::placeholders::_1,
+            //                                       std::placeholders::_2),
+            //                             "ip:port/updateConfig?<key>=<value>");
         });
     }
 

diff --git a/src/http/test/CMakeLists.txt b/src/http/test/CMakeLists.txt
@@ -24,12 +24,16 @@ set(MY_SRC_SEARCH_MODE "GLOB")
 set(MY_PROJ_LIBS
         dsn_http
         dsn_runtime
+        sasl2
+        gssapi_krb5
+        krb5
+        dsn_utils
         curl
         gtest
         rocksdb
         lz4
-        zstd
-        snappy)
+        snappy
+        zstd)
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,6 +35,9 @@ set(MY_SRC_SEARCH_MODE "GLOB") @@
     set(MY_PROJ_LIBS
             dsn_runtime
+            sasl2
+            gssapi_krb5
+            krb5
             rocksdb
             lz4
             zstd
@@ Expand Down @@