objclass: rename omap methods to be consistent with other interfaces

The osd ops and the librados methods all distinguish between keys
and values. It's useful to be able to read a bunch of keys without
fetching the values sometimes too.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>

diff --git a/src/cls_rgw.cc b/src/cls_rgw.cc
index 9f52e49805e47c05adfa9da38a1ca7abf9293b7f..baf8604de594663a480f3a657e0d41b5add82e9a 100644 (file)
--- a/src/cls_rgw.cc
+++ b/src/cls_rgw.cc
@@ -62,7 +62,7 @@ int rgw_bucket_list(cls_method_context_t hctx, bufferlist *in, bufferlist *out)
   bufferlist bl;
 
   map<string, bufferlist> keys;
-  rc = cls_cxx_map_read_keys(hctx, op.start_obj, op.filter_prefix, op.num_entries + 1, &keys);
+  rc = cls_cxx_map_get_vals(hctx, op.start_obj, op.filter_prefix, op.num_entries + 1, &keys);
   if (rc < 0)
     return rc;
 
@@ -139,7 +139,7 @@ int rgw_bucket_prepare_op(cls_method_context_t hctx, bufferlist *in, bufferlist
 
   // get on-disk state
   bufferlist cur_value;
-  int rc = cls_cxx_map_read_key(hctx, op.name, &cur_value);
+  int rc = cls_cxx_map_get_val(hctx, op.name, &cur_value);
   if (rc < 0 && rc != -ENOENT)
     return rc;
 
@@ -177,7 +177,7 @@ int rgw_bucket_prepare_op(cls_method_context_t hctx, bufferlist *in, bufferlist
   // write out new key to disk
   bufferlist info_bl;
   ::encode(entry, info_bl);
-  cls_cxx_map_write_key(hctx, op.name, &info_bl);
+  cls_cxx_map_set_val(hctx, op.name, &info_bl);
   return rc;
 }
 
@@ -210,7 +210,7 @@ int rgw_bucket_complete_op(cls_method_context_t hctx, bufferlist *in, bufferlist
   bufferlist current_entry;
   struct rgw_bucket_dir_entry entry;
   bool ondisk = true;
-  rc = cls_cxx_map_read_key(hctx, op.name, &current_entry);
+  rc = cls_cxx_map_get_val(hctx, op.name, &current_entry);
   if (rc < 0) {
     if (rc != -ENOENT) {
       return rc;
@@ -257,7 +257,7 @@ int rgw_bucket_complete_op(cls_method_context_t hctx, bufferlist *in, bufferlist
     if (op.tag.size()) {
       bufferlist new_key_bl;
       ::encode(entry, new_key_bl);
-      return cls_cxx_map_write_key(hctx, op.name, &new_key_bl);
+      return cls_cxx_map_set_val(hctx, op.name, &new_key_bl);
     } else {
       return 0;
     }
@@ -281,7 +281,7 @@ int rgw_bucket_complete_op(cls_method_context_t hctx, bufferlist *in, bufferlist
         entry.exists = false;
         bufferlist new_key_bl;
         ::encode(entry, new_key_bl);
-       int ret = cls_cxx_map_write_key(hctx, op.name, &new_key_bl);
+       int ret = cls_cxx_map_set_val(hctx, op.name, &new_key_bl);
        if (ret < 0)
          return ret;
       }
@@ -302,7 +302,7 @@ int rgw_bucket_complete_op(cls_method_context_t hctx, bufferlist *in, bufferlist
       stats.total_size_rounded += get_rounded_size(meta.size);
       bufferlist new_key_bl;
       ::encode(entry, new_key_bl);
-      int ret = cls_cxx_map_write_key(hctx, op.name, &new_key_bl);
+      int ret = cls_cxx_map_set_val(hctx, op.name, &new_key_bl);
       if (ret < 0)
        return ret;
     }
@@ -349,7 +349,7 @@ int rgw_dir_suggest_changes(cls_method_context_t hctx, bufferlist *in, bufferlis
     }
 
     bufferlist cur_disk_bl;
-    int ret = cls_cxx_map_read_key(hctx, cur_change.name, &cur_disk_bl);
+    int ret = cls_cxx_map_get_val(hctx, cur_change.name, &cur_disk_bl);
     if (ret < 0 && ret != -ENOENT)
       return -EINVAL;
 
@@ -394,7 +394,7 @@ int rgw_dir_suggest_changes(cls_method_context_t hctx, bufferlist *in, bufferlis
         stats.total_size_rounded += get_rounded_size(cur_change.meta.size);
         bufferlist cur_state_bl;
         ::encode(cur_change, cur_state_bl);
-        ret = cls_cxx_map_write_key(hctx, cur_change.name, &cur_state_bl);
+        ret = cls_cxx_map_set_val(hctx, cur_change.name, &cur_state_bl);
         if (ret < 0)
          return ret;
         break;

diff --git a/src/objclass/class_api.cc b/src/objclass/class_api.cc
index 225c2e2028d92aa2a22d4ff6c290ee0880d42930..6220484c890eb0fbae7c4b2a4b2d265caa2a9b65 100644 (file)
--- a/src/objclass/class_api.cc
+++ b/src/objclass/class_api.cc
@@ -251,7 +251,7 @@ int cls_cxx_snap_revert(cls_method_context_t hctx, snapid_t snapid)
   return (*pctx)->pg->do_osd_ops(*pctx, ops);
 }
 
-int cls_cxx_map_read_all_keys(cls_method_context_t hctx, map<string, bufferlist>* vals)
+int cls_cxx_map_get_all_vals(cls_method_context_t hctx, map<string, bufferlist>* vals)
 {
   ReplicatedPG::OpContext **pctx = (ReplicatedPG::OpContext **)hctx;
   vector<OSDOp> ops(1);
@@ -282,9 +282,9 @@ int cls_cxx_map_read_all_keys(cls_method_context_t hctx, map<string, bufferlist>
   return vals->size();
 }
 
-int cls_cxx_map_read_keys(cls_method_context_t hctx, const string &start_obj,
-                          const string &filter_prefix, uint64_t max,
-                          map<string, bufferlist> *vals)
+int cls_cxx_map_get_vals(cls_method_context_t hctx, const string &start_obj,
+                        const string &filter_prefix, uint64_t max_to_get,
+                        map<string, bufferlist> *vals)
 {
   ReplicatedPG::OpContext **pctx = (ReplicatedPG::OpContext **)hctx;
   vector<OSDOp> ops(1);
@@ -295,7 +295,7 @@ int cls_cxx_map_read_keys(cls_method_context_t hctx, const string &start_obj,
   bufferlist inbl;
 
   ::encode(start_obj, op.indata);
-  ::encode(max, op.indata);
+  ::encode(max_to_get, op.indata);
   ::encode(filter_prefix, op.indata);
 
   op.op.op = CEPH_OSD_OP_OMAPGETVALS;
@@ -328,7 +328,9 @@ int cls_cxx_map_read_header(cls_method_context_t hctx, bufferlist *outbl)
 
   return 0;
 }
-int cls_cxx_map_read_key(cls_method_context_t hctx, const string &key, bufferlist *outbl)
+
+int cls_cxx_map_get_val(cls_method_context_t hctx, const string &key,
+                       bufferlist *outbl)
 {
   ReplicatedPG::OpContext **pctx = (ReplicatedPG::OpContext **)hctx;
   vector<OSDOp> ops(1);
@@ -360,7 +362,8 @@ int cls_cxx_map_read_key(cls_method_context_t hctx, const string &key, bufferlis
   return 0;
 }
 
-int cls_cxx_map_write_key(cls_method_context_t hctx, const string &key, bufferlist *inbl)
+int cls_cxx_map_set_val(cls_method_context_t hctx, const string &key,
+                       bufferlist *inbl)
 {
   ReplicatedPG::OpContext **pctx = (ReplicatedPG::OpContext **)hctx;
   vector<OSDOp> ops(1);

diff --git a/src/objclass/objclass.h b/src/objclass/objclass.h
index e973b4a0d9d5355a62deea8cc6d23244e4d933e9..64293a708dc07d9334fdd07c4d1b25e5da2a395c 100644 (file)
--- a/src/objclass/objclass.h
+++ b/src/objclass/objclass.h
@@ -98,12 +98,18 @@ extern int cls_cxx_write_full(cls_method_context_t hctx, bufferlist *bl);
 extern int cls_cxx_replace(cls_method_context_t hctx, int ofs, int len, bufferlist *bl);
 extern int cls_cxx_snap_revert(cls_method_context_t hctx, snapid_t snapid);
 extern int cls_cxx_map_clear(cls_method_context_t hctx);
-extern int cls_cxx_map_read_all_keys(cls_method_context_t hctx, std::map<string, bufferlist> *keys);
-extern int cls_cxx_map_read_keys(cls_method_context_t hctx, const string &start_after, const string &filter_prefix,
-                                uint64_t max, std::map<string, bufferlist> *keys);
+extern int cls_cxx_map_get_all_vals(cls_method_context_t hctx,
+                                    std::map<string, bufferlist> *vals);
+extern int cls_cxx_map_get_vals(cls_method_context_t hctx,
+                                const string &start_after,
+                                const string &filter_prefix,
+                                uint64_t max_to_get,
+                                std::map<string, bufferlist> *vals);
 extern int cls_cxx_map_read_header(cls_method_context_t hctx, bufferlist *outbl);
-extern int cls_cxx_map_read_key(cls_method_context_t hctx, const string &key, bufferlist *outbl);
-extern int cls_cxx_map_write_key(cls_method_context_t hctx, const string &key, bufferlist *inbl);
+extern int cls_cxx_map_get_val(cls_method_context_t hctx,
+                               const string &key, bufferlist *outbl);
+extern int cls_cxx_map_set_val(cls_method_context_t hctx,
+                               const string &key, bufferlist *inbl);
 extern int cls_cxx_map_write_header(cls_method_context_t hctx, bufferlist *inbl);
 extern int cls_cxx_map_remove_key(cls_method_context_t hctx, const string &key);
 extern int cls_cxx_map_update(cls_method_context_t hctx, bufferlist *inbl);