From 65c66f2fda523374d8999ada020bcbbc41d6c57e Mon Sep 17 00:00:00 2001
From: haoyixing <haoyixing@kuaishou.com>
Date: Sun, 18 Oct 2020 09:23:48 +0800
Subject: [PATCH] msg: move DispatchStrategy into test/

Since commit cc9a914, xio related code were all removed, which made
direct_messenger become the only user of DispatchStraegy. So move
these code there.

Signed-off-by: haoyixing <haoyixing@kuaishou.com>
---
 src/msg/CMakeLists.txt                                | 1 -
 src/test/direct_messenger/CMakeLists.txt              | 3 ++-
 src/test/direct_messenger/DirectMessenger.cc          | 2 +-
 src/{msg => test/direct_messenger}/DispatchStrategy.h | 0
 src/{msg => test/direct_messenger}/FastStrategy.h     | 0
 src/{msg => test/direct_messenger}/QueueStrategy.cc   | 0
 src/{msg => test/direct_messenger}/QueueStrategy.h    | 0
 src/test/direct_messenger/test_direct_messenger.cc    | 4 ++--
 8 files changed, 5 insertions(+), 5 deletions(-)
 rename src/{msg => test/direct_messenger}/DispatchStrategy.h (100%)
 rename src/{msg => test/direct_messenger}/FastStrategy.h (100%)
 rename src/{msg => test/direct_messenger}/QueueStrategy.cc (100%)
 rename src/{msg => test/direct_messenger}/QueueStrategy.h (100%)

diff --git a/src/msg/CMakeLists.txt b/src/msg/CMakeLists.txt
index fada39b457f..e6d0b589b42 100644
--- a/src/msg/CMakeLists.txt
+++ b/src/msg/CMakeLists.txt
@@ -2,7 +2,6 @@ set(msg_srcs
   DispatchQueue.cc
   Message.cc
   Messenger.cc
-  QueueStrategy.cc
   Connection.cc
   msg_types.cc)
 
diff --git a/src/test/direct_messenger/CMakeLists.txt b/src/test/direct_messenger/CMakeLists.txt
index 2e7f2780002..6ca56946eb4 100644
--- a/src/test/direct_messenger/CMakeLists.txt
+++ b/src/test/direct_messenger/CMakeLists.txt
@@ -1,4 +1,5 @@
 # unittest_direct_messenger
-#add_executable(unittest_direct_messenger test_direct_messenger.cc DirectMessenger.cc)
+#add_library(QueueStrategy OBJECT QueueStrategy.cc)
+#add_executable(unittest_direct_messenger $<TARGET_OBJECTS:QueueStrategy> test_direct_messenger.cc DirectMessenger.cc)
 #add_ceph_unittest(unittest_direct_messenger)
 #target_link_libraries(unittest_direct_messenger global)
diff --git a/src/test/direct_messenger/DirectMessenger.cc b/src/test/direct_messenger/DirectMessenger.cc
index c554a379402..3aeff4feee6 100644
--- a/src/test/direct_messenger/DirectMessenger.cc
+++ b/src/test/direct_messenger/DirectMessenger.cc
@@ -13,7 +13,7 @@
  */
 
 #include "DirectMessenger.h"
-#include "msg/DispatchStrategy.h"
+#include "DispatchStrategy.h"
 
 
 class DirectConnection : public Connection {
diff --git a/src/msg/DispatchStrategy.h b/src/test/direct_messenger/DispatchStrategy.h
similarity index 100%
rename from src/msg/DispatchStrategy.h
rename to src/test/direct_messenger/DispatchStrategy.h
diff --git a/src/msg/FastStrategy.h b/src/test/direct_messenger/FastStrategy.h
similarity index 100%
rename from src/msg/FastStrategy.h
rename to src/test/direct_messenger/FastStrategy.h
diff --git a/src/msg/QueueStrategy.cc b/src/test/direct_messenger/QueueStrategy.cc
similarity index 100%
rename from src/msg/QueueStrategy.cc
rename to src/test/direct_messenger/QueueStrategy.cc
diff --git a/src/msg/QueueStrategy.h b/src/test/direct_messenger/QueueStrategy.h
similarity index 100%
rename from src/msg/QueueStrategy.h
rename to src/test/direct_messenger/QueueStrategy.h
diff --git a/src/test/direct_messenger/test_direct_messenger.cc b/src/test/direct_messenger/test_direct_messenger.cc
index 2789e422778..77093f13e47 100644
--- a/src/test/direct_messenger/test_direct_messenger.cc
+++ b/src/test/direct_messenger/test_direct_messenger.cc
@@ -11,8 +11,8 @@
 #include "common/ceph_argparse.h"
 
 #include "DirectMessenger.h"
-#include "msg/FastStrategy.h"
-#include "msg/QueueStrategy.h"
+#include "FastStrategy.h"
+#include "QueueStrategy.h"
 #include "messages/MPing.h"
 
 
-- 
2.47.3