You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by li...@apache.org on 2022/07/27 12:05:32 UTC
[rocketmq-clients] 01/02: WIP
This is an automated email from the ASF dual-hosted git repository.
lizhanhui pushed a commit to branch cpp_cmake
in repository https://gitbox.apache.org/repos/asf/rocketmq-clients.git
commit 130b0ca32c9f406e3c70036ad100a5ffe873ae80
Author: Li Zhanhui <li...@gmail.com>
AuthorDate: Wed Jul 27 19:55:35 2022 +0800
WIP
---
cpp/source/CMakeLists.txt | 3 ++-
cpp/source/rocketmq/AsyncReceiveMessageCallback.cpp | 3 ++-
cpp/source/rocketmq/CMakeLists.txt | 4 ++++
cpp/source/rocketmq/ClientImpl.cpp | 3 ++-
cpp/source/rocketmq/ConsumeMessageServiceImpl.cpp | 3 ++-
cpp/source/rocketmq/ConsumeTask.cpp | 3 ++-
cpp/source/rocketmq/TopicPublishInfo.cpp | 3 ++-
cpp/source/rocketmq/include/ProcessQueueImpl.h | 3 ---
cpp/source/stats/CMakeLists.txt | 3 +--
cpp/source/trace/CMakeLists.txt | 13 +++++++++++++
10 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/cpp/source/CMakeLists.txt b/cpp/source/CMakeLists.txt
index 6c1b432..e1547e4 100644
--- a/cpp/source/CMakeLists.txt
+++ b/cpp/source/CMakeLists.txt
@@ -5,7 +5,8 @@ add_subdirectory(concurrent)
add_subdirectory(log)
add_subdirectory(scheduler)
add_subdirectory(stats)
-#add_subdirectory(rocketmq)
+add_subdirectory(trace)
+add_subdirectory(rocketmq)
add_library(rocketmq
$<TARGET_OBJECTS:admin>
diff --git a/cpp/source/rocketmq/AsyncReceiveMessageCallback.cpp b/cpp/source/rocketmq/AsyncReceiveMessageCallback.cpp
index 30cdb7a..1e03802 100644
--- a/cpp/source/rocketmq/AsyncReceiveMessageCallback.cpp
+++ b/cpp/source/rocketmq/AsyncReceiveMessageCallback.cpp
@@ -20,7 +20,8 @@
#include "ClientManagerImpl.h"
#include "ConsumeMessageType.h"
-#include "LoggerImpl.h"
+#include "rocketmq/Logger.h"
+#include "spdlog/spdlog.h"
#include "ProcessQueue.h"
#include "PushConsumerImpl.h"
diff --git a/cpp/source/rocketmq/CMakeLists.txt b/cpp/source/rocketmq/CMakeLists.txt
index 52411de..843c6c8 100644
--- a/cpp/source/rocketmq/CMakeLists.txt
+++ b/cpp/source/rocketmq/CMakeLists.txt
@@ -8,11 +8,15 @@ target_link_libraries(impl
PRIVATE
api
absl::strings
+ asio
base
fmt
proto
client
opencensus_api
+ opencensus_proto
+ rocketmq_stats
+ rocketmq_trace
scheduler
spdlog
)
\ No newline at end of file
diff --git a/cpp/source/rocketmq/ClientImpl.cpp b/cpp/source/rocketmq/ClientImpl.cpp
index d47133a..0532d73 100644
--- a/cpp/source/rocketmq/ClientImpl.cpp
+++ b/cpp/source/rocketmq/ClientImpl.cpp
@@ -31,7 +31,8 @@
#include "ClientManagerImpl.h"
#include "InvocationContext.h"
-#include "LoggerImpl.h"
+#include "rocketmq/Logger.h"
+#include "spdlog/spdlog.h"
#include "MessageExt.h"
#include "NamingScheme.h"
#include "SessionImpl.h"
diff --git a/cpp/source/rocketmq/ConsumeMessageServiceImpl.cpp b/cpp/source/rocketmq/ConsumeMessageServiceImpl.cpp
index 722347e..11e14ce 100644
--- a/cpp/source/rocketmq/ConsumeMessageServiceImpl.cpp
+++ b/cpp/source/rocketmq/ConsumeMessageServiceImpl.cpp
@@ -18,7 +18,8 @@
#include "ConsumeStats.h"
#include "ConsumeTask.h"
-#include "LoggerImpl.h"
+#include "rocketmq/Logger.h"
+#include "spdlog/spdlog.h"
#include "PushConsumerImpl.h"
#include "Tag.h"
#include "ThreadPoolImpl.h"
diff --git a/cpp/source/rocketmq/ConsumeTask.cpp b/cpp/source/rocketmq/ConsumeTask.cpp
index 0c9802d..9e87828 100644
--- a/cpp/source/rocketmq/ConsumeTask.cpp
+++ b/cpp/source/rocketmq/ConsumeTask.cpp
@@ -18,7 +18,8 @@
#include "ConsumeTask.h"
#include "ConsumeStats.h"
-#include "LoggerImpl.h"
+#include "rocketmq/Logger.h"
+#include "spdlog/spdlog.h"
#include "PushConsumerImpl.h"
#include "Tag.h"
#include "rocketmq/ConsumeResult.h"
diff --git a/cpp/source/rocketmq/TopicPublishInfo.cpp b/cpp/source/rocketmq/TopicPublishInfo.cpp
index 9eac1a2..6eeece4 100644
--- a/cpp/source/rocketmq/TopicPublishInfo.cpp
+++ b/cpp/source/rocketmq/TopicPublishInfo.cpp
@@ -19,7 +19,8 @@
#include <memory>
#include <utility>
-#include "LoggerImpl.h"
+#include "rocketmq/Logger.h"
+#include "spdlog/spdlog.h"
#include "MixAll.h"
#include "ProducerImpl.h"
#include "TopicRouteData.h"
diff --git a/cpp/source/rocketmq/include/ProcessQueueImpl.h b/cpp/source/rocketmq/include/ProcessQueueImpl.h
index 36464fc..822f7c0 100644
--- a/cpp/source/rocketmq/include/ProcessQueueImpl.h
+++ b/cpp/source/rocketmq/include/ProcessQueueImpl.h
@@ -30,7 +30,6 @@
#include "TopicAssignmentInfo.h"
#include "absl/container/flat_hash_map.h"
#include "absl/container/flat_hash_set.h"
-#include "gtest/gtest_prod.h"
#include "rocketmq/FilterExpression.h"
ROCKETMQ_NAMESPACE_BEGIN
@@ -133,8 +132,6 @@ private:
rmq::ReceiveMessageRequest& request);
void wrapFilterExpression(rmq::FilterExpression* filter_expression);
-
- FRIEND_TEST(ProcessQueueTest, testExpired);
};
ROCKETMQ_NAMESPACE_END
\ No newline at end of file
diff --git a/cpp/source/stats/CMakeLists.txt b/cpp/source/stats/CMakeLists.txt
index 47f113e..15622ea 100644
--- a/cpp/source/stats/CMakeLists.txt
+++ b/cpp/source/stats/CMakeLists.txt
@@ -14,5 +14,4 @@ target_link_libraries(rocketmq_stats
opencensus_proto
proto
spdlog
- scheduler
- )
\ No newline at end of file
+ scheduler)
\ No newline at end of file
diff --git a/cpp/source/trace/CMakeLists.txt b/cpp/source/trace/CMakeLists.txt
new file mode 100644
index 0000000..caf1a1a
--- /dev/null
+++ b/cpp/source/trace/CMakeLists.txt
@@ -0,0 +1,13 @@
+add_library(rocketmq_trace OBJECT TracingUtility.cpp)
+target_include_directories(rocketmq_trace
+ PUBLIC
+ ${CMAKE_CURRENT_SOURCE_DIR}/include)
+target_link_libraries(rocketmq_trace
+ PRIVATE
+ api
+ base
+ client
+ fmt
+ opencensus::stats
+ proto
+ spdlog)
\ No newline at end of file