cls/rgw: remove unused cls_rgw_bi_get_vals()

Signed-off-by: Casey Bodley <cbodley@redhat.com>

diff --git a/src/cls/rgw/cls_rgw.cc b/src/cls/rgw/cls_rgw.cc
index 3c6189c37438340c4c5757b9cdcbe41231d86098..ce2002f2a5bb8d235501753ebdc64c2ec3d7b9f1 100644 (file)
--- a/src/cls/rgw/cls_rgw.cc
+++ b/src/cls/rgw/cls_rgw.cc
@@ -2785,72 +2785,6 @@ static int rgw_bi_get_op(cls_method_context_t hctx, bufferlist *in, bufferlist *
   return 0;
 }
 
-/* gain bi_entry based on reshard log */
-static int rgw_bi_get_vals_op(cls_method_context_t hctx, bufferlist *in, bufferlist *out)
-{
-  // decode request
-  rgw_cls_bi_get_vals_op op;
-  auto bl_iter = in->cbegin();
-  try {
-    decode(op, bl_iter);
-  } catch (ceph::buffer::error& err) {
-    CLS_LOG(0, "ERROR: %s: failed to decode request", __func__);
-    return -EINVAL;
-  }
-
-  map<string, bufferlist> keys;
-  int ret = cls_cxx_map_get_vals_by_keys(hctx, op.log_entries_wanted, &keys);
-  if (ret < 0) {
-    return ret;
-  }
-
-  rgw_cls_bi_list_ret op_ret;
-  std::map<string, bufferlist>::iterator iter;
-  for (iter = keys.begin(); iter != keys.end(); ++iter) {
-
-    rgw_cls_bi_entry entry;
-    entry.idx = iter->first;
-    entry.type = bi_type(iter->first);
-    entry.data = iter->second;
-
-    auto biter = entry.data.cbegin();
-
-    switch (entry.type) {
-      case BIIndexType::Plain:
-      case BIIndexType::Instance: {
-        rgw_bucket_dir_entry e;
-        try {
-          decode(e, biter);
-        } catch (ceph::buffer::error& err) {
-          CLS_LOG(0, "ERROR: %s: failed to decode buffer", __func__);
-          return -EIO;
-        }
-        break;
-      }
-      case BIIndexType::OLH: {
-        rgw_bucket_olh_entry e;
-        try {
-          decode(e, biter);
-        } catch (ceph::buffer::error& err) {
-          CLS_LOG(0, "ERROR: %s: failed to decode buffer (size=%d)", __func__, entry.data.length());
-          return -EIO;
-        }
-        break;
-      }
-      default:
-        CLS_LOG(0, "%s: invalid entry type: %d", __func__, int(entry.type));
-        return -EINVAL;
-    }
-    CLS_LOG(20, "%s: entry.idx=%s", __func__, escape_str(entry.idx).c_str());
-
-    op_ret.entries.push_back(entry);
-  }
-
-  encode(op_ret, *out);
-
-  return 0;
-}
-
 static int rgw_bi_put_op(cls_method_context_t hctx, bufferlist *in, bufferlist *out)
 {
   CLS_LOG(10, "entered %s", __func__);
@@ -5080,7 +5014,6 @@ CLS_INIT(rgw)
   cls_method_handle_t h_rgw_obj_check_attrs_prefix;
   cls_method_handle_t h_rgw_obj_check_mtime;
   cls_method_handle_t h_rgw_bi_get_op;
-  cls_method_handle_t h_rgw_bi_get_vals_op;
   cls_method_handle_t h_rgw_bi_put_op;
   cls_method_handle_t h_rgw_bi_put_entries_op;
   cls_method_handle_t h_rgw_bi_list_op;
@@ -5139,7 +5072,6 @@ CLS_INIT(rgw)
   cls_register_cxx_method(h_class, RGW_OBJ_CHECK_MTIME, CLS_METHOD_RD, rgw_obj_check_mtime, &h_rgw_obj_check_mtime);
 
   cls_register_cxx_method(h_class, RGW_BI_GET, CLS_METHOD_RD, rgw_bi_get_op, &h_rgw_bi_get_op);
-  cls_register_cxx_method(h_class, RGW_BI_GET_VALS, CLS_METHOD_RD, rgw_bi_get_vals_op, &h_rgw_bi_get_vals_op);
   cls_register_cxx_method(h_class, RGW_BI_PUT, CLS_METHOD_RD | CLS_METHOD_WR, rgw_bi_put_op, &h_rgw_bi_put_op);
   cls_register_cxx_method(h_class, RGW_BI_PUT_ENTRIES, CLS_METHOD_RD | CLS_METHOD_WR, rgw_bi_put_entries, &h_rgw_bi_put_entries_op);
   cls_register_cxx_method(h_class, RGW_BI_LIST, CLS_METHOD_RD, rgw_bi_list_op, &h_rgw_bi_list_op);

diff --git a/src/cls/rgw/cls_rgw_client.cc b/src/cls/rgw/cls_rgw_client.cc
index be13a51d33047a44106d2448f2c69c4132510abf..bb6eb4d13e7ccd4ff095f4a64a2eebf799adb903 100644 (file)
--- a/src/cls/rgw/cls_rgw_client.cc
+++ b/src/cls/rgw/cls_rgw_client.cc
@@ -475,32 +475,6 @@ int cls_rgw_bi_get(librados::IoCtx& io_ctx, const string oid,
   return 0;
 }
 
-int cls_rgw_bi_get_vals(librados::IoCtx& io_ctx, const std::string oid,
-                        std::set<std::string>& log_entries_wanted,
-                        std::list<rgw_cls_bi_entry> *entries)
-{
-  bufferlist in, out;
-  struct rgw_cls_bi_get_vals_op call;
-  call.log_entries_wanted = std::move(log_entries_wanted);
-  encode(call, in);
-  int r = io_ctx.exec(oid, RGW_CLASS, RGW_BI_GET_VALS, in, out);
-  if (r < 0)
-    return r;
-
-  struct rgw_cls_bi_list_ret op_ret;
-  auto iter = out.cbegin();
-  try {
-    decode(op_ret, iter);
-  } catch (ceph::buffer::error& err) {
-    return -EIO;
-  }
-
-  if (entries)
-    entries->swap(op_ret.entries);
-
-  return 0;
-}
-
 int cls_rgw_bi_put(librados::IoCtx& io_ctx, const string oid, const rgw_cls_bi_entry& entry)
 {
   bufferlist in, out;

diff --git a/src/cls/rgw/cls_rgw_client.h b/src/cls/rgw/cls_rgw_client.h
index 66aa12f5bd04aae33d737294881359f5bc54c3e4..d7d6e2754ac4702852edcbc5e716e680c2b5ade0 100644 (file)
--- a/src/cls/rgw/cls_rgw_client.h
+++ b/src/cls/rgw/cls_rgw_client.h
@@ -384,9 +384,6 @@ void cls_rgw_obj_check_mtime(librados::ObjectOperation& o, const ceph::real_time
 int cls_rgw_bi_get(librados::IoCtx& io_ctx, const std::string oid,
                    BIIndexType index_type, const cls_rgw_obj_key& key,
                    rgw_cls_bi_entry *entry);
-int cls_rgw_bi_get_vals(librados::IoCtx& io_ctx, const std::string oid,
-                        std::set<std::string>& log_entries_wanted,
-                        std::list<rgw_cls_bi_entry> *entries);
 int cls_rgw_bi_put(librados::IoCtx& io_ctx, const std::string oid, const rgw_cls_bi_entry& entry);
 void cls_rgw_bi_put(librados::ObjectWriteOperation& op, const std::string oid, const rgw_cls_bi_entry& entry);
 // Write the given array of index entries and update bucket stats accordingly.

diff --git a/src/cls/rgw/cls_rgw_const.h b/src/cls/rgw/cls_rgw_const.h
index d67274291d67f4429d40cd161c90b0c37bae0803..da5778cd544c5f1519e048230f17161c732e85ad 100644 (file)
--- a/src/cls/rgw/cls_rgw_const.h
+++ b/src/cls/rgw/cls_rgw_const.h
@@ -33,7 +33,6 @@ constexpr int RGWBIAdvanceAndRetryError = -EFBIG;
 #define RGW_OBJ_CHECK_MTIME "obj_check_mtime"
 
 #define RGW_BI_GET "bi_get"
-#define RGW_BI_GET_VALS "bi_get_vals"
 #define RGW_BI_PUT "bi_put"
 #define RGW_BI_PUT_ENTRIES "bi_put_entries"
 #define RGW_BI_LIST "bi_list"

diff --git a/src/cls/rgw/cls_rgw_ops.h b/src/cls/rgw/cls_rgw_ops.h
index 9dc7343f68db9d60a273056693d3af43b739caf3..025faebe7d484eaf678615be952789490ed88957 100644 (file)
--- a/src/cls/rgw/cls_rgw_ops.h
+++ b/src/cls/rgw/cls_rgw_ops.h
@@ -731,23 +731,6 @@ struct rgw_cls_bi_get_ret {
 };
 WRITE_CLASS_ENCODER(rgw_cls_bi_get_ret)
 
-struct rgw_cls_bi_get_vals_op {
-  std::set<std::string> log_entries_wanted;
-
-  void encode(ceph::buffer::list& bl) const {
-    ENCODE_START(1, 1, bl);
-    encode(log_entries_wanted, bl);
-    ENCODE_FINISH(bl);
-  }
-
-  void decode(ceph::buffer::list::const_iterator& bl) {
-    DECODE_START(1, bl);
-    decode(log_entries_wanted, bl);
-    DECODE_FINISH(bl);
-  }
-};
-WRITE_CLASS_ENCODER(rgw_cls_bi_get_vals_op)
-
 struct rgw_cls_bi_put_op {
   rgw_cls_bi_entry entry;