*: remove *.types.h files (#164)

XiaoMi · Sep 28, 2018 · ca2b88e · ca2b88e
1 parent 737dd9b
commit ca2b88e
Show file tree

Hide file tree

Showing 31 changed files with 33 additions and 235 deletions.
diff --git a/include/dsn/cpp/message_utils.h b/include/dsn/cpp/message_utils.h
@@ -32,6 +32,7 @@
 #include <dsn/cpp/rpc_stream.h>
 #include <dsn/cpp/serialization.h>
 #include <dsn/tool-api/rpc_message.h>
+#include <dsn/cpp/serialization_helper/dsn.layer2_types.h>
 
 namespace dsn {
 

diff --git a/include/dsn/cpp/serialization.h b/include/dsn/cpp/serialization.h
@@ -50,61 +50,36 @@ std::string no_registered_function_error_notice(const T &t, dsn_msg_serialize_fo
 
 } // namespace serialization
 
-#define THRIFT_MARSHALLER                                                                          \
-    case DSF_THRIFT_BINARY:                                                                        \
-        marshall_thrift_binary(writer, value);                                                     \
-        break;                                                                                     \
-    case DSF_THRIFT_JSON:                                                                          \
-        marshall_thrift_json(writer, value);                                                       \
-        break;
-
-#define THRIFT_UNMARSHALLER                                                                        \
-    case DSF_THRIFT_BINARY:                                                                        \
-        unmarshall_thrift_binary(reader, value);                                                   \
-        break;                                                                                     \
-    case DSF_THRIFT_JSON:                                                                          \
-        unmarshall_thrift_json(reader, value);                                                     \
-        break;
-
-// the following 2 functions is for thrift basic type serialization
-template <typename T>
-inline void marshall(binary_writer &writer, const T &value, dsn_msg_serialize_format fmt)
+template <typename ThriftType>
+inline void marshall(binary_writer &writer, const ThriftType &value, dsn_msg_serialize_format fmt)
 {
     switch (fmt) {
-        THRIFT_MARSHALLER
+    case DSF_THRIFT_BINARY:
+        marshall_thrift_binary(writer, value);
+        break;
+    case DSF_THRIFT_JSON:
+        marshall_thrift_json(writer, value);
+        break;
     default:
         dassert(false, serialization::no_registered_function_error_notice(value, fmt).c_str());
     }
 }
 
-template <typename T>
-inline void unmarshall(binary_reader &reader, T &value, dsn_msg_serialize_format fmt)
+template <typename ThriftType>
+inline void unmarshall(binary_reader &reader, ThriftType &value, dsn_msg_serialize_format fmt)
 {
     switch (fmt) {
-        THRIFT_UNMARSHALLER
+    case DSF_THRIFT_BINARY:
+        unmarshall_thrift_binary(reader, value);
+        break;
+    case DSF_THRIFT_JSON:
+        unmarshall_thrift_json(reader, value);
+        break;
     default:
         dassert(false, serialization::no_registered_function_error_notice(value, fmt).c_str());
     }
 }
 
-#define GENERATED_TYPE_SERIALIZATION(GType, SerializationType)                                     \
-    inline void marshall(binary_writer &writer, const GType &value, dsn_msg_serialize_format fmt)  \
-    {                                                                                              \
-        switch (fmt) {                                                                             \
-            SerializationType##_MARSHALLER default                                                 \
-                : dassert(false,                                                                   \
-                          serialization::no_registered_function_error_notice(value, fmt).c_str()); \
-        }                                                                                          \
-    }                                                                                              \
-    inline void unmarshall(binary_reader &reader, GType &value, dsn_msg_serialize_format fmt)      \
-    {                                                                                              \
-        switch (fmt) {                                                                             \
-            SerializationType##_UNMARSHALLER default                                               \
-                : dassert(false,                                                                   \
-                          serialization::no_registered_function_error_notice(value, fmt).c_str()); \
-        }                                                                                          \
-    }
-
 template <typename T>
 inline void marshall(dsn::message_ex *msg, const T &val)
 {

diff --git a/include/dsn/cpp/serialization_helper/dsn.layer2.types.h b/include/dsn/cpp/serialization_helper/dsn.layer2.types.h
diff --git a/include/dsn/dist/cli/cli.client.h b/include/dsn/dist/cli/cli.client.h
@@ -38,7 +38,7 @@
 #include <dsn/tool-api/task_tracker.h>
 #include <dsn/tool-api/async_calls.h>
 #include <dsn/dist/cli/cli.code.definition.h>
-#include <dsn/dist/cli/cli.types.h>
+#include <dsn/dist/cli/cli_types.h>
 #include <iostream>
 
 namespace dsn {

diff --git a/include/dsn/dist/cli/cli.server.h b/include/dsn/dist/cli/cli.server.h
@@ -28,7 +28,7 @@
 #include <iostream>
 #include <dsn/cpp/serverlet.h>
 #include <dsn/dist/cli/cli.code.definition.h>
-#include <dsn/dist/cli/cli.types.h>
+#include <dsn/dist/cli/cli_types.h>
 
 namespace dsn {
 class cli_service : public ::dsn::serverlet<cli_service>

diff --git a/include/dsn/dist/cli/cli.types.h b/include/dsn/dist/cli/cli.types.h
diff --git a/include/dsn/dist/failure_detector/fd.code.definition.h b/include/dsn/dist/failure_detector/fd.code.definition.h
@@ -34,7 +34,9 @@
  */
 
 #pragma once
-#include <dsn/dist/failure_detector/fd.types.h>
+
+#include <dsn/tool-api/task_code.h>
+#include <dsn/dist/failure_detector/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/include/dsn/dist/replication.h b/include/dsn/dist/replication.h
@@ -36,6 +36,5 @@
 #pragma once
 
 #include <dsn/service_api_cpp.h>
-#include <dsn/dist/replication/replication.types.h>
 #include <dsn/dist/replication/replication_other_types.h>
 #include <dsn/dist/replication/replication.codes.h>
diff --git a/include/dsn/dist/replication/duplication_common.h b/include/dsn/dist/replication/duplication_common.h
@@ -26,7 +26,6 @@
 
 #pragma once
 
-#include <dsn/dist/replication/replication.types.h>
 #include <dsn/dist/fmt_logging.h>
 #include <dsn/cpp/rpc_holder.h>
 #include <dsn/cpp/json_helper.h>

diff --git a/include/dsn/dist/replication/replication.types.h b/include/dsn/dist/replication/replication.types.h
diff --git a/include/dsn/dist/replication/replication_app_base.h b/include/dsn/dist/replication/replication_app_base.h
@@ -42,7 +42,7 @@
 
 #include <dsn/cpp/serverlet.h>
 #include <dsn/cpp/json_helper.h>
-#include <dsn/dist/replication/replication.types.h>
+#include <dsn/dist/replication/replication_types.h>
 #include <dsn/dist/replication/replication_other_types.h>
 #include <dsn/dist/replication/replication.codes.h>
 #include <dsn/dist/replication/replica_base.h>

diff --git a/include/dsn/dist/replication/replication_other_types.h b/include/dsn/dist/replication/replication_other_types.h
@@ -36,7 +36,7 @@
 #define replication_OTHER_TYPES_H
 
 #include <sstream>
-#include <dsn/dist/replication/replication.types.h>
+#include <dsn/dist/replication/replication_types.h>
 #include <dsn/dist/replication/replication_enums.h>
 
 namespace dsn {

diff --git a/include/dsn/service_api_cpp.h b/include/dsn/service_api_cpp.h
@@ -38,7 +38,6 @@
 #include <dsn/service_api_c.h>
 #include <dsn/tool-api/auto_codes.h>
 #include <dsn/cpp/serialization.h>
-#include <dsn/cpp/serialization_helper/dsn.layer2.types.h>
 #include <dsn/cpp/rpc_stream.h>
 #include <dsn/cpp/zlocks.h>
 #include <dsn/cpp/serverlet.h>

diff --git a/src/apps/echo/echo.code.definition.h b/src/apps/echo/echo.code.definition.h
@@ -34,7 +34,6 @@
  */
 #pragma once
 #include <dsn/service_api_cpp.h>
-#include "echo.types.h"
 
 namespace dsn {
 namespace example {

diff --git a/src/apps/echo/echo.types.h b/src/apps/echo/echo.types.h
diff --git a/src/apps/skv/simple_kv.client.2.h b/src/apps/skv/simple_kv.client.2.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "simple_kv.code.definition.h"
-#include "simple_kv.types.h"
+#include "simple_kv_types.h"
 #include <iostream>
 #include <dsn/utility/optional.h>
 #include <dsn/tool-api/async_calls.h>

diff --git a/src/apps/skv/simple_kv.server.h b/src/apps/skv/simple_kv.server.h
@@ -40,7 +40,7 @@
 #include <dsn/dist/replication/storage_serverlet.h>
 
 #include "simple_kv.code.definition.h"
-#include "simple_kv.types.h"
+#include "simple_kv_types.h"
 
 namespace dsn {
 namespace replication {
@@ -51,7 +51,7 @@ class simple_kv_service : public replication_app_base, public storage_serverlet<
     simple_kv_service(replica *r) : replication_app_base(r) {}
     virtual ~simple_kv_service() {}
 
-    virtual int on_request(dsn::message_ex* request) override { return handle_request(request); }
+    virtual int on_request(dsn::message_ex *request) override { return handle_request(request); }
 protected:
     // all service handlers to be implemented further
     // RPC_SIMPLE_KV_SIMPLE_KV_READ

diff --git a/src/apps/skv/simple_kv.types.h b/src/apps/skv/simple_kv.types.h
diff --git a/src/core/core/common_providers.cpp b/src/core/core/common_providers.cpp
@@ -35,8 +35,6 @@
 #include "partition_resolver_simple.h"
 #include <dsn/utility/factory_store.h>
 
-#include <dsn/dist/replication/replication.types.h>
-
 namespace dsn {
 namespace dist {
 static bool register_component_provider(const char *name,

diff --git a/src/core/core/partition_resolver_simple.h b/src/core/core/partition_resolver_simple.h
@@ -39,7 +39,7 @@
 #include <dsn/tool-api/task_tracker.h>
 #include <dsn/service_api_c.h>
 #include <dsn/cpp/zlocks.h>
-#include <dsn/cpp/serialization_helper/dsn.layer2.types.h>
+#include <dsn/cpp/serialization_helper/dsn.layer2_types.h>
 
 namespace dsn {
 namespace dist {

diff --git a/src/dist/nfs/nfs.types.h b/src/dist/nfs/nfs.types.h
diff --git a/src/dist/nfs/nfs_client.h b/src/dist/nfs/nfs_client.h
@@ -29,7 +29,7 @@
 #include <dsn/utility/optional.h>
 #include <dsn/tool-api/async_calls.h>
 
-#include "nfs.types.h"
+#include "nfs_types.h"
 #include "nfs_code_definition.h"
 
 namespace dsn {