Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
136 changes: 57 additions & 79 deletions BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -196,30 +196,6 @@ cc_library(
visibility = ["//visibility:public"],
)

cc_library(
name = 'kafka_message',
hdrs = [
'src/factory/KafkaTaskImpl.inl',
'src/protocol/KafkaDataTypes.h',
'src/protocol/KafkaMessage.h',
'src/protocol/KafkaResult.h',
'src/protocol/kafka_parser.h',
],
includes = [
'src/factory',
'src/protocol',
],
srcs = [
'src/factory/KafkaTaskImpl.cc',
'src/protocol/KafkaMessage.cc',
'src/protocol/KafkaResult.cc',
],
copts = ['-fno-rtti'],
deps = [
':common',
],
)

cc_library(
name = 'kafka',
hdrs = [
Expand All @@ -239,10 +215,12 @@ cc_library(
'src/client/WFKafkaClient.cc',
'src/protocol/KafkaDataTypes.cc',
'src/protocol/kafka_parser.c',
'src/factory/KafkaTaskImpl.cc',
'src/protocol/KafkaMessage.cc',
'src/protocol/KafkaResult.cc',
],
deps = [
':common',
':kafka_message',
],
visibility = ["//visibility:public"],
linkopts = [
Expand Down Expand Up @@ -276,37 +254,37 @@ cc_library(
)

cc_binary(
name = 'helloworld',
srcs = ['tutorial/tutorial-00-helloworld.cc'],
deps = [':http'],
name = 'helloworld',
srcs = ['tutorial/tutorial-00-helloworld.cc'],
deps = [':http'],
)
cc_binary(
name = 'wget',
srcs = ['tutorial/tutorial-01-wget.cc'],
deps = [':http'],
name = 'wget',
srcs = ['tutorial/tutorial-01-wget.cc'],
deps = [':http'],
)
cc_binary(
name = 'redis_cli',
srcs = ['tutorial/tutorial-02-redis_cli.cc'],
deps = [':redis'],
name = 'redis_cli',
srcs = ['tutorial/tutorial-02-redis_cli.cc'],
deps = [':redis'],
)

cc_binary(
name = 'wget_to_redis',
srcs = ['tutorial/tutorial-03-wget_to_redis.cc'],
deps = [':http', 'redis'],
name = 'wget_to_redis',
srcs = ['tutorial/tutorial-03-wget_to_redis.cc'],
deps = [':http', 'redis'],
)

cc_binary(
name = 'http_echo_server',
srcs = ['tutorial/tutorial-04-http_echo_server.cc'],
deps = [':http'],
name = 'http_echo_server',
srcs = ['tutorial/tutorial-04-http_echo_server.cc'],
deps = [':http'],
)

cc_binary(
name = 'http_proxy',
srcs = ['tutorial/tutorial-05-http_proxy.cc'],
deps = [':http'],
name = 'http_proxy',
srcs = ['tutorial/tutorial-05-http_proxy.cc'],
deps = [':http'],
)

cc_binary(
Expand All @@ -316,21 +294,21 @@ cc_binary(
)

cc_binary(
name = 'sort_task',
srcs = ['tutorial/tutorial-07-sort_task.cc'],
deps = [':common'],
name = 'sort_task',
srcs = ['tutorial/tutorial-07-sort_task.cc'],
deps = [':common'],
)

cc_binary(
name = 'matrix_multiply',
srcs = ['tutorial/tutorial-08-matrix_multiply.cc'],
deps = [':common'],
name = 'matrix_multiply',
srcs = ['tutorial/tutorial-08-matrix_multiply.cc'],
deps = [':common'],
)

cc_binary(
name = 'http_file_server',
srcs = ['tutorial/tutorial-09-http_file_server.cc'],
deps = [':http'],
name = 'http_file_server',
srcs = ['tutorial/tutorial-09-http_file_server.cc'],
deps = [':http'],
)

cc_library(
Expand All @@ -340,45 +318,45 @@ cc_library(
)

cc_binary(
name = 'server',
srcs = [
'tutorial/tutorial-10-user_defined_protocol/server.cc',
'tutorial/tutorial-10-user_defined_protocol/message.cc',
],
deps = [':common', ':user_hdrs'],
name = 'server',
srcs = [
'tutorial/tutorial-10-user_defined_protocol/server.cc',
'tutorial/tutorial-10-user_defined_protocol/message.cc',
],
deps = [':common', ':user_hdrs'],
)

cc_binary(
name = 'client',
srcs = [
'tutorial/tutorial-10-user_defined_protocol/client.cc',
'tutorial/tutorial-10-user_defined_protocol/message.cc',
],
deps = [':common', ':user_hdrs'],
name = 'client',
srcs = [
'tutorial/tutorial-10-user_defined_protocol/client.cc',
'tutorial/tutorial-10-user_defined_protocol/message.cc',
],
deps = [':common', ':user_hdrs'],
)

cc_binary(
name = 'graph_task',
srcs = ['tutorial/tutorial-11-graph_task.cc'],
deps = [':http'],
name = 'graph_task',
srcs = ['tutorial/tutorial-11-graph_task.cc'],
deps = [':http'],
)

cc_binary(
name = 'mysql_cli',
srcs = ['tutorial/tutorial-12-mysql_cli.cc'],
deps = [':mysql'],
name = 'mysql_cli',
srcs = ['tutorial/tutorial-12-mysql_cli.cc'],
deps = [':mysql'],
)

cc_binary(
name = 'kafka_cli',
srcs = ['tutorial/tutorial-13-kafka_cli.cc'],
deps = [':kafka', ':workflow_hdrs'],
name = 'kafka_cli',
srcs = ['tutorial/tutorial-13-kafka_cli.cc'],
deps = [':kafka', ':workflow_hdrs'],
)

cc_binary(
name = 'consul_cli',
srcs = ['tutorial/tutorial-14-consul_cli.cc'],
deps = [':consul'],
name = 'consul_cli',
srcs = ['tutorial/tutorial-14-consul_cli.cc'],
deps = [':consul'],
)

cc_binary(
Expand Down Expand Up @@ -409,9 +387,9 @@ cc_binary(
)

cc_binary(
name = 'redis_subscriber',
srcs = ['tutorial/tutorial-18-redis_subscriber.cc'],
deps = [':redis'],
name = 'redis_subscriber',
srcs = ['tutorial/tutorial-18-redis_subscriber.cc'],
deps = [':redis'],
)

cc_binary(
Expand Down
1 change: 0 additions & 1 deletion src/factory/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,4 @@ if (KAFKA STREQUAL "y")
KafkaTaskImpl.cc
)
add_library("factory_kafka" OBJECT ${SRC})
set_property(SOURCE KafkaTaskImpl.cc APPEND PROPERTY COMPILE_OPTIONS "-fno-rtti")
endif ()
1 change: 0 additions & 1 deletion src/factory/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ target("kafka_factory")
if has_config("kafka") then
add_files("KafkaTaskImpl.cc")
set_kind("object")
add_cxxflags("-fno-rtti")
add_deps("factory")
add_packages("zlib", "snappy", "zstd", "lz4")
else
Expand Down
1 change: 1 addition & 0 deletions src/include/workflow/dns_types.h
2 changes: 0 additions & 2 deletions src/protocol/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,4 @@ if (KAFKA STREQUAL "y")
KafkaResult.cc
)
add_library("protocol_kafka" OBJECT ${SRC})
set_property(SOURCE KafkaMessage.cc APPEND PROPERTY COMPILE_OPTIONS "-fno-rtti")
set_property(SOURCE KafkaResult.cc APPEND PROPERTY COMPILE_OPTIONS "-fno-rtti")
endif ()
8 changes: 8 additions & 0 deletions src/protocol/KafkaDataTypes.cc
Original file line number Diff line number Diff line change
Expand Up @@ -664,4 +664,12 @@ const KafkaMeta *get_meta(const char *topic, KafkaMetaList *meta_list)
return NULL;
}

KafkaSnappySink::~KafkaSnappySink()
{
}

KafkaSnappySource::~KafkaSnappySource()
{
}

} /* namespace protocol */
6 changes: 6 additions & 0 deletions src/protocol/KafkaDataTypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -1609,6 +1609,9 @@ class KafkaSnappySink : public snappy::Sink

private:
KafkaBuffer *buffer;

public:
virtual ~KafkaSnappySink();
};

class KafkaSnappySource : public snappy::Source
Expand Down Expand Up @@ -1643,6 +1646,9 @@ class KafkaSnappySource : public snappy::Source
KafkaBuffer *buffer;
size_t buf_size;
size_t pos;

public:
virtual ~KafkaSnappySource();
};

}
Expand Down
6 changes: 0 additions & 6 deletions src/protocol/KafkaResult.cc
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,6 @@ enum
KAFKA_STATUS_END,
};

KafkaResult::KafkaResult()
{
this->resp_vec = NULL;
this->resp_num = 0;
}

KafkaResult::~KafkaResult()
{
delete []this->resp_vec;
Expand Down
6 changes: 5 additions & 1 deletion src/protocol/KafkaResult.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,11 @@ class KafkaResult
void set_resp(KafkaResponse&& resp, size_t i);

public:
KafkaResult();
KafkaResult()
{
this->resp_vec = NULL;
this->resp_num = 0;
}

virtual ~KafkaResult();

Expand Down
17 changes: 4 additions & 13 deletions src/protocol/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,14 @@ target("protocol")
set_kind("object")
add_deps("basic_protocol", "mysql_protocol", "redis_protocol")

target("kafka_message")
if has_config("kafka") then
add_files("KafkaMessage.cc",
"KafkaResult.cc")
set_kind("object")
add_cxxflags("-fno-rtti")
add_packages("lz4", "zstd", "zlib", "snappy")
else
set_kind("phony")
end

target("kafka_protocol")
if has_config("kafka") then
set_kind("object")
add_files("kafka_parser.c",
"KafkaDataTypes.cc")
add_deps("kafka_message", "protocol")
"KafkaDataTypes.cc",
"KafkaMessage.cc",
"KafkaResult.cc")
add_deps("basic_protocol")
add_packages("zlib", "snappy", "zstd", "lz4")
else
set_kind("phony")
Expand Down