refactor: remove thrift generated files of fd/simplekv (#759)

XiaoMi · Feb 20, 2021 · f7c6de4 · f7c6de4
1 parent ee1026d
commit f7c6de4
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 954 deletions.
diff --git a/compile_thrift.py b/compile_thrift.py
@@ -28,23 +28,6 @@
             "_types.cpp": "src/runtime"
         }
     },
-    {
-        "name": "fd",
-        "path": "src/failure_detector",
-        "file_move": {
-            "_types.h": "include/dsn/dist/failure_detector"
-        },
-        "include_fix": {
-            "_types.h": {
-                "add": ["<dsn/service_api_cpp.h>"],
-                "remove": ["\"dsn_types.h\""]
-            },
-            "_types.cpp": {
-                "add": ["<dsn/dist/failure_detector/fd_types.h>"],
-                "remove": ["\"fd_types.h\""]
-            },
-        }
-    },
     {
         "name": "replication",
         "path": "src/",
@@ -63,10 +46,6 @@
             },
         },
     },
-    {
-        "name": "simple_kv",
-        "path": "src/replica/storage/simple_kv"
-    },
 ]
 
 

diff --git a/include/dsn/dist/failure_detector/fd.code.definition.h b/include/dsn/dist/failure_detector/fd.code.definition.h
@@ -36,7 +36,8 @@
 #pragma once
 
 #include <dsn/tool-api/task_code.h>
-#include <dsn/dist/failure_detector/fd_types.h>
+#include <dsn/service_api_cpp.h>
+#include "fd_types.h"
 
 namespace dsn {
 namespace fd {

diff --git a/include/dsn/dist/failure_detector/fd_types.h b/include/dsn/dist/failure_detector/fd_types.h
diff --git a/src/failure_detector/CMakeLists.txt b/src/failure_detector/CMakeLists.txt
@@ -1,8 +1,13 @@
 set(MY_PROJ_NAME dsn.failure_detector)
 
-# Source files under CURRENT project directory will be automatically included.
-# You can manually set MY_PROJ_SRC to include source files under other directories.
-set(MY_PROJ_SRC "")
+thrift_generate_cpp(
+    FD_THRIFT_SRCS
+    FD_THRIFT_HDRS
+    ${CMAKE_CURRENT_SOURCE_DIR}/fd.thrift
+)
+
+seT(MY_PROJ_SRC ${FD_THRIFT_SRCS})
+
 
 # Search mode for source files under CURRENT project directory?
 # "GLOB_RECURSE" for recursive search

diff --git a/src/failure_detector/fd.thrift b/src/failure_detector/fd.thrift
@@ -24,8 +24,3 @@ struct config_master_message
     1: dsn.rpc_address master;
     2: bool is_register;
 }
-
-service failure_detector
-{
-    beacon_ack ping(1:beacon_msg beacon)
-}