From: Yuan Zhou <yuan.zhou@intel.com>
Date: Wed, 23 Jan 2019 16:19:14 +0000 (+0800)
Subject: tools: clean up dead code in immutable obj cache
X-Git-Tag: v15.0.0~136^2~30
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4edfcf7c6b195861f36dbcf83421d00e664fda93;p=ceph.git

tools: clean up dead code in immutable obj cache

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
---

diff --git a/src/test/immutable_object_cache/test_message.cc b/src/test/immutable_object_cache/test_message.cc
index c8360ec0f5c1..bcaed1d5fc4c 100644
--- a/src/test/immutable_object_cache/test_message.cc
+++ b/src/test/immutable_object_cache/test_message.cc
@@ -5,8 +5,6 @@ using namespace ceph::immutable_obj_cache;
 
 TEST(test_for_message, test_1) 
 {
-  std::string pool_name("this is a pool name");
-  std::string image_name("this is an image name");
   std::string oid_name("this is a oid name");
 
   ObjectCacheMsgHeader header;
@@ -23,11 +21,8 @@ TEST(test_for_message, test_1)
 
   req.m_head = header;
 
-  req.m_data.m_image_size = 111111;
   req.m_data.m_read_offset = 222222;
   req.m_data.m_read_len = 333333;
-  req.m_data.m_pool_name = pool_name;
-  req.m_data.m_image_name = image_name;
   req.m_data.m_oid = oid_name;
 
   req.encode();
@@ -49,10 +44,7 @@ TEST(test_for_message, test_1)
   ASSERT_EQ(req_decode->m_head.reserved, header.reserved);
 
 
-  ASSERT_EQ(req_decode->m_data.m_image_size, 111111);
   ASSERT_EQ(req_decode->m_data.m_read_offset, 222222);
   ASSERT_EQ(req_decode->m_data.m_read_len, 333333);
-  ASSERT_EQ(req_decode->m_data.m_pool_name, pool_name);
-  ASSERT_EQ(req_decode->m_data.m_image_name, image_name);
   ASSERT_EQ(req_decode->m_data.m_oid, oid_name);
 }
diff --git a/src/tools/immutable_object_cache/CacheClient.cc b/src/tools/immutable_object_cache/CacheClient.cc
index 71bc6d11abc4..317faefb329d 100644
--- a/src/tools/immutable_object_cache/CacheClient.cc
+++ b/src/tools/immutable_object_cache/CacheClient.cc
@@ -111,7 +111,6 @@ namespace immutable_obj_cache {
 
     req->m_data.m_pool_id = pool_id;
     req->m_data.m_snap_id = snap_id;
-    req->m_data.m_pool_name = "";
     req->m_data.m_pool_namespace = pool_nspace;
     req->m_data.m_oid = oid;
     req->m_process_msg = on_finish;
diff --git a/src/tools/immutable_object_cache/SocketCommon.h b/src/tools/immutable_object_cache/SocketCommon.h
index 7c914213d16f..1831e2715a5a 100644
--- a/src/tools/immutable_object_cache/SocketCommon.h
+++ b/src/tools/immutable_object_cache/SocketCommon.h
@@ -12,8 +12,7 @@ static const int RBDSC_READ            =  0X12;
 static const int RBDSC_LOOKUP          =  0X13;
 static const int RBDSC_REGISTER_REPLY  =  0X14;
 static const int RBDSC_READ_REPLY      =  0X15;
-static const int RBDSC_LOOKUP_REPLY    =  0X16;
-static const int RBDSC_READ_RADOS      =  0X17;
+static const int RBDSC_READ_RADOS      =  0X16;
 
 static const int ASIO_ERROR_READ = 0X01;
 static const int ASIO_ERROR_WRITE = 0X02;
diff --git a/src/tools/immutable_object_cache/Types.cc b/src/tools/immutable_object_cache/Types.cc
index a6748a586276..4d341dd45b2c 100644
--- a/src/tools/immutable_object_cache/Types.cc
+++ b/src/tools/immutable_object_cache/Types.cc
@@ -29,13 +29,10 @@ void ObjectCacheMsgHeader::decode(bufferlist::const_iterator& it) {
 }
 
 void ObjectCacheMsgData::encode(bufferlist& bl) {
-  ceph::encode(m_image_size, bl);
   ceph::encode(m_read_offset, bl);
   ceph::encode(m_read_len, bl);
   ceph::encode(m_pool_id, bl);
   ceph::encode(m_snap_id, bl);
-  ceph::encode(m_pool_name, bl);
-  ceph::encode(m_image_name, bl);
   ceph::encode(m_oid, bl);
   ceph::encode(m_pool_namespace, bl);
   ceph::encode(m_cache_path, bl);
@@ -43,13 +40,10 @@ void ObjectCacheMsgData::encode(bufferlist& bl) {
 
 void ObjectCacheMsgData::decode(bufferlist& bl) {
   auto i = bl.cbegin();
-  ceph::decode(m_image_size, i);
   ceph::decode(m_read_offset, i);
   ceph::decode(m_read_len, i);
   ceph::decode(m_pool_id, i);
   ceph::decode(m_snap_id, i);
-  ceph::decode(m_pool_name, i);
-  ceph::decode(m_image_name, i);
   ceph::decode(m_oid, i);
   ceph::decode(m_pool_namespace, i);
   ceph::decode(m_cache_path, i);
diff --git a/src/tools/immutable_object_cache/Types.h b/src/tools/immutable_object_cache/Types.h
index 675dc84ed29f..cbe5f4da97a3 100644
--- a/src/tools/immutable_object_cache/Types.h
+++ b/src/tools/immutable_object_cache/Types.h
@@ -25,13 +25,10 @@ struct ObjectCacheMsgHeader {
 // TODO : cleanup useless data
 class ObjectCacheMsgData {
 public:
-  uint64_t m_image_size;
   uint64_t m_read_offset;
   uint64_t m_read_len;
   uint64_t m_pool_id;
   uint64_t m_snap_id;
-  std::string m_pool_name;
-  std::string m_image_name;
   std::string m_oid;
   std::string m_pool_namespace; // TODO : Jason suggestion
   std::string m_cache_path;