rgw: remove extra unused params from omap_get()

and also rename it to omap_get_all()

Signed-off-by: Yehuda Sadeh <yehuda@hq.newdream.net>

diff --git a/src/rgw/rgw_access.h b/src/rgw/rgw_access.h
index 3e16630e02bb186a44868d95456d43c084965906..94a58b1556a36b9c33e7d2c0a1e5578328b71cee 100644 (file)
--- a/src/rgw/rgw_access.h
+++ b/src/rgw/rgw_access.h
@@ -238,7 +238,7 @@ public:
 
   virtual bool supports_omap() { return false; }
 
-  virtual int omap_get(rgw_obj& obj, string& start_after, int max, bufferlist& header, std::map<string, bufferlist>& m) { return -ENOTSUP; }
+  virtual int omap_get_all(rgw_obj& obj, bufferlist& header, std::map<string, bufferlist>& m) { return -ENOTSUP; }
   virtual int omap_set(rgw_obj& obj, std::string& key, bufferlist& bl) { return -ENOTSUP; }
   virtual int omap_set(rgw_obj& obj, map<std::string, bufferlist>& m) { return -ENOTSUP; }
   virtual int omap_del(rgw_obj& obj, std::string& key) { return -ENOTSUP; }

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 3979b10d54e25f319d146d62be8d00b1403a5c08..8434a4580fc13570dd46159596afdbf7e8f1fc01 100644 (file)
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -1379,8 +1379,7 @@ static int get_multiparts_info(struct req_state *s, string& meta_oid, map<uint32
   if (ret < 0)
     return ret;
 
-  string start_after;
-  ret = rgwstore->omap_get(obj, start_after, -1, header, parts_map);
+  ret = rgwstore->omap_get_all(obj, header, parts_map);
   if (ret < 0)
     return ret;
 

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index c83892072fddd3a69b4987b8e106add41197f53a..d02ed8d592d2b070131586de22f7d050048c1bbe 100644 (file)
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -520,8 +520,7 @@ int RGWRados::select_bucket_placement(string& bucket_name, rgw_bucket& bucket)
   string pool_name;
 
   rgw_obj obj(pi_buckets_rados, avail_pools);
-  string start_after;
-  int ret = omap_get(obj, start_after, -1, header, m);
+  int ret = omap_get_all(obj, header, m);
   if (ret < 0 || !m.size()) {
     vector<string> names;
     names.push_back(default_storage_pool);
@@ -582,8 +581,7 @@ int RGWRados::list_placement_set(set<string>& names)
   string pool_name;
 
   rgw_obj obj(pi_buckets_rados, avail_pools);
-  string start_after;
-  int ret = omap_get(obj, start_after, -1, header, m);
+  int ret = omap_get_all(obj, header, m);
   if (ret < 0)
     return ret;
 
@@ -1950,7 +1948,7 @@ int RGWRados::put_bucket_info(string& bucket_name, RGWBucketInfo& info, bool exc
   return ret;
 }
 
-int RGWRados::omap_get(rgw_obj& obj, string& start_after, int max, bufferlist& header, std::map<string, bufferlist>& m)
+int RGWRados::omap_get_all(rgw_obj& obj, bufferlist& header, std::map<string, bufferlist>& m)
 {
   bufferlist bl;
   librados::IoCtx io_ctx;
@@ -1963,7 +1961,8 @@ int RGWRados::omap_get(rgw_obj& obj, string& start_after, int max, bufferlist& h
 
   io_ctx.locator_set_key(key);
 
-  r = io_ctx.omap_get_vals(oid, start_after, max, &m);
+  string start_after;
+  r = io_ctx.omap_get_vals(oid, start_after, -1, &m);
   if (r < 0)
     return r;
 

diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h
index 33071fe788273249d5a819c9b4bf0656520ace80..be29c99406d9febb6dd1b16b9f04ada0de528f46 100644 (file)
--- a/src/rgw/rgw_rados.h
+++ b/src/rgw/rgw_rados.h
@@ -292,7 +292,7 @@ public:
   virtual int obj_stat(void *ctx, rgw_obj& obj, uint64_t *psize, time_t *pmtime, map<string, bufferlist> *attrs, bufferlist *first_chunk);
 
   virtual bool supports_omap() { return true; }
-  virtual int omap_get(rgw_obj& obj, string& start_after, int max, bufferlist& header, std::map<string, bufferlist>& m);
+  virtual int omap_get_all(rgw_obj& obj, bufferlist& header, std::map<string, bufferlist>& m);
   virtual int omap_set(rgw_obj& obj, std::string& key, bufferlist& bl);
   virtual int omap_set(rgw_obj& obj, map<std::string, bufferlist>& m);
   virtual int omap_del(rgw_obj& obj, std::string& key);

diff --git a/src/rgw/rgw_user.cc b/src/rgw/rgw_user.cc
index a76c179a022f812efff18d5ed1ca7be98c322ea8..dbfc053cffb7a76f94c211df66018dff6cd434b4 100644 (file)
--- a/src/rgw/rgw_user.cc
+++ b/src/rgw/rgw_user.cc
@@ -209,8 +209,7 @@ int rgw_read_user_buckets(string user_id, RGWUserBuckets& buckets, bool need_sta
     bufferlist header;
     map<string,bufferlist> m;
 
-    string start_after;
-    ret = rgwstore->omap_get(obj, start_after, -1, header, m);
+    ret = rgwstore->omap_get_all(obj, header, m);
     if (ret == -ENOENT)
       ret = 0;