rgw: s/RGWRadosCtx/ObjectCtx

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc
index 818704a0ef988fcd7dc4bfbcdd1f83ac068985f4..7d649ad751494a2b178c6c7d5da89819f8a8de4d 100644 (file)
--- a/src/rgw/rgw_bucket.cc
+++ b/src/rgw/rgw_bucket.cc
@@ -339,7 +339,7 @@ static bool bucket_object_check_filter(const string& name)
 
 int rgw_remove_object(RGWRados *store, const string& bucket_owner, rgw_bucket& bucket, rgw_obj_key& key, bool use_versioning)
 {
-  RGWRados::RGWRadosCtx rctx(store);
+  RGWRados::ObjectCtx rctx(store);
 
   rgw_obj obj(bucket, key);
 

diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index 443a72b12d97e79adde48874f463a72d6f361760..0ff4f5bb8ae8dfb49dbfbd0a728ff001c435a600 100644 (file)
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -524,7 +524,7 @@ static int process_request(RGWRados *store, RGWREST *rest, RGWRequest *req, RGWC
 
   struct req_state *s = &rstate;
 
-  RGWRados::RGWRadosCtx rados_ctx(store, s);
+  RGWRados::ObjectCtx rados_ctx(store, s);
   s->obj_ctx = &rados_ctx;
   store->set_intent_cb(s->obj_ctx, call_log_intent);
 

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 605d71049f02e871997309b62ca1987ee6f77dd6..94d1fde0c77e15d3e0c3045952bdb5ad28e5ae02 100644 (file)
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -1219,7 +1219,7 @@ int RGWPutObjProcessor_Atomic::do_complete(string& etag, time_t *mtime, time_t s
   extra_params.set_mtime = set_mtime;
   extra_params.owner = bucket_owner;
 
-  RGWRados::RGWRadosCtx *rctx = static_cast<RGWRados::RGWRadosCtx *>(obj_ctx);
+  RGWRados::ObjectCtx *rctx = static_cast<RGWRados::ObjectCtx *>(obj_ctx);
 
   bool is_olh = false;
   if (head_obj.get_instance().empty()) {
@@ -1257,7 +1257,7 @@ public:
   }
 };
 
-RGWObjState *RGWRados::RGWRadosCtx::get_state(rgw_obj& obj) {
+RGWObjState *RGWRados::ObjectCtx::get_state(rgw_obj& obj) {
   if (!obj.get_object().empty()) {
     return &objs_state[obj];
   } else {
@@ -1266,12 +1266,12 @@ RGWObjState *RGWRados::RGWRadosCtx::get_state(rgw_obj& obj) {
   }
 }
 
-void RGWRados::RGWRadosCtx::invalidate(rgw_obj& obj)
+void RGWRados::ObjectCtx::invalidate(rgw_obj& obj)
 {
   objs_state.erase(obj);
 }
 
-void RGWRados::RGWRadosCtx::set_atomic(rgw_obj& obj) {
+void RGWRados::ObjectCtx::set_atomic(rgw_obj& obj) {
   if (!obj.get_object().empty()) {
     objs_state[obj].is_atomic = true;
   } else {
@@ -1280,7 +1280,7 @@ void RGWRados::RGWRadosCtx::set_atomic(rgw_obj& obj) {
   }
 }
 
-void RGWRados::RGWRadosCtx::set_prefetch_data(rgw_obj& obj) {
+void RGWRados::ObjectCtx::set_prefetch_data(rgw_obj& obj) {
   if (!obj.get_object().empty()) {
     objs_state[obj].prefetch_data = true;
   } else {
@@ -2878,7 +2878,7 @@ int RGWRados::put_obj_meta_impl(void *ctx, rgw_obj& obj,  uint64_t size,
   if (r < 0)
     return r;
 
-  RGWRadosCtx *rctx = static_cast<RGWRadosCtx *>(ctx);
+  ObjectCtx *rctx = static_cast<ObjectCtx *>(ctx);
 
   ObjectWriteOperation op;
 
@@ -3222,7 +3222,7 @@ int RGWRados::rewrite_obj(RGWBucketInfo& dest_bucket_info, rgw_obj& obj)
   time_t mtime;
   uint64_t total_len;
   uint64_t obj_size;
-  RGWRadosCtx rctx(this);
+  ObjectCtx rctx(this);
   int ret = prepare_get_obj((void *)&rctx, obj, &ofs, &end, &attrset,
                             NULL, NULL, &mtime, NULL, NULL, &total_len,
                             &obj_size, NULL, &handle, NULL);
@@ -3409,7 +3409,7 @@ set_err_state:
 
   RGWObjManifest manifest;
   RGWObjState *astate = NULL;
-  RGWRadosCtx *rctx = static_cast<RGWRadosCtx *>(ctx);
+  ObjectCtx *rctx = static_cast<ObjectCtx *>(ctx);
   ret = get_obj_state(rctx, src_obj, &astate, NULL);
   if (ret < 0)
     return ret;
@@ -3763,7 +3763,7 @@ int RGWRados::bucket_suspended(rgw_bucket& bucket, bool *suspended)
   return 0;
 }
 
-int RGWRados::complete_atomic_overwrite(RGWRadosCtx *rctx, RGWObjState *state, rgw_obj& obj)
+int RGWRados::complete_atomic_overwrite(ObjectCtx *rctx, RGWObjState *state, rgw_obj& obj)
 {
   if (!state || !state->has_manifest || state->keep_tail)
     return 0;
@@ -3860,7 +3860,7 @@ int RGWRados::bucket_rebuild_index(rgw_bucket& bucket)
 
 int RGWRados::defer_gc(void *ctx, rgw_obj& obj)
 {
-  RGWRadosCtx *rctx = static_cast<RGWRadosCtx *>(ctx);
+  ObjectCtx *rctx = static_cast<ObjectCtx *>(ctx);
   rgw_bucket bucket;
   std::string oid, key;
   get_obj_bucket_and_oid_loc(obj, bucket, oid, key);
@@ -3912,7 +3912,7 @@ int RGWRados::delete_obj_impl(void *ctx, const string& bucket_owner, rgw_obj& ob
   if (r < 0) {
     return r;
   }
-  RGWRadosCtx *rctx = static_cast<RGWRadosCtx *>(ctx);
+  ObjectCtx *rctx = static_cast<ObjectCtx *>(ctx);
 
   ObjectWriteOperation op;
 
@@ -4054,7 +4054,7 @@ static bool is_olh(map<string, bufferlist>& attrs)
   return (iter != attrs.end());
 }
 
-int RGWRados::get_olh_target_state(RGWRadosCtx *rctx, rgw_obj& obj, RGWObjState *olh_state,
+int RGWRados::get_olh_target_state(ObjectCtx *rctx, rgw_obj& obj, RGWObjState *olh_state,
                                    RGWObjState **target_state, RGWObjVersionTracker *objv_tracker)
 {
   assert(olh_state->is_olh);
@@ -4072,7 +4072,7 @@ int RGWRados::get_olh_target_state(RGWRadosCtx *rctx, rgw_obj& obj, RGWObjState
   return 0;
 }
 
-int RGWRados::get_obj_state_impl(RGWRadosCtx *rctx, rgw_obj& obj, RGWObjState **state, RGWObjVersionTracker *objv_tracker, bool follow_olh)
+int RGWRados::get_obj_state_impl(ObjectCtx *rctx, rgw_obj& obj, RGWObjState **state, RGWObjVersionTracker *objv_tracker, bool follow_olh)
 {
   RGWObjState *s = rctx->get_state(obj);
   ldout(cct, 20) << "get_obj_state: rctx=" << (void *)rctx << " obj=" << obj << " state=" << (void *)s << " s->prefetch_data=" << s->prefetch_data << dendl;
@@ -4150,7 +4150,7 @@ int RGWRados::get_obj_state_impl(RGWRadosCtx *rctx, rgw_obj& obj, RGWObjState **
   return 0;
 }
 
-int RGWRados::get_obj_state(RGWRadosCtx *rctx, rgw_obj& obj, RGWObjState **state, RGWObjVersionTracker *objv_tracker, bool follow_olh)
+int RGWRados::get_obj_state(ObjectCtx *rctx, rgw_obj& obj, RGWObjState **state, RGWObjVersionTracker *objv_tracker, bool follow_olh)
 {
   int ret;
 
@@ -4177,7 +4177,7 @@ int RGWRados::get_attr(void *ctx, rgw_obj& obj, const char *name, bufferlist& de
   if (r < 0) {
     return r;
   }
-  RGWRadosCtx *rctx = static_cast<RGWRadosCtx *>(ctx);
+  ObjectCtx *rctx = static_cast<ObjectCtx *>(ctx);
 
   if (rctx) {
     RGWObjState *state;
@@ -4203,7 +4203,7 @@ int RGWRados::get_attr(void *ctx, rgw_obj& obj, const char *name, bufferlist& de
   return 0;
 }
 
-int RGWRados::append_atomic_test(RGWRadosCtx *rctx, rgw_obj& obj,
+int RGWRados::append_atomic_test(ObjectCtx *rctx, rgw_obj& obj,
                             ObjectOperation& op, RGWObjState **pstate)
 {
   if (!rctx)
@@ -4228,7 +4228,7 @@ int RGWRados::append_atomic_test(RGWRadosCtx *rctx, rgw_obj& obj,
   return 0;
 }
 
-int RGWRados::prepare_atomic_for_write_impl(RGWRadosCtx *rctx, rgw_obj& obj,
+int RGWRados::prepare_atomic_for_write_impl(ObjectCtx *rctx, rgw_obj& obj,
                             ObjectWriteOperation& op, RGWObjState **pstate,
                            bool reset_obj, const string *ptag,
                             const char *if_match, const char *if_nomatch)
@@ -4320,7 +4320,7 @@ int RGWRados::prepare_atomic_for_write_impl(RGWRadosCtx *rctx, rgw_obj& obj,
   return 0;
 }
 
-int RGWRados::prepare_atomic_for_write(RGWRadosCtx *rctx, rgw_obj& obj,
+int RGWRados::prepare_atomic_for_write(ObjectCtx *rctx, rgw_obj& obj,
                             ObjectWriteOperation& op, RGWObjState **pstate,
                            bool reset_obj, const string *ptag,
                             const char *if_match, const char *if_nomatch)
@@ -4363,7 +4363,7 @@ int RGWRados::set_attrs(void *ctx, rgw_obj& obj,
   if (r < 0) {
     return r;
   }
-  RGWRadosCtx *rctx = static_cast<RGWRadosCtx *>(ctx);
+  ObjectCtx *rctx = static_cast<ObjectCtx *>(ctx);
 
   ObjectWriteOperation op;
   RGWObjState *state = NULL;
@@ -4480,8 +4480,8 @@ int RGWRados::prepare_get_obj(void *ctx, rgw_obj& obj,
 {
   bufferlist etag;
   time_t ctime;
-  RGWRadosCtx *rctx = static_cast<RGWRadosCtx *>(ctx);
-  RGWRadosCtx *new_ctx = NULL;
+  ObjectCtx *rctx = static_cast<ObjectCtx *>(ctx);
+  ObjectCtx *new_ctx = NULL;
   RGWObjState *astate = NULL;
   off_t ofs = 0;
   off_t end = -1;
@@ -4503,7 +4503,7 @@ int RGWRados::prepare_get_obj(void *ctx, rgw_obj& obj,
   }
 
   if (!rctx) {
-    new_ctx = new RGWRadosCtx(this);
+    new_ctx = new ObjectCtx(this);
     rctx = new_ctx;
   }
 
@@ -4678,8 +4678,8 @@ int RGWRados::get_obj(void *ctx, RGWObjVersionTracker *objv_tracker, void **hand
   rgw_obj read_obj = obj;
   uint64_t read_ofs = ofs;
   uint64_t len, read_len;
-  RGWRadosCtx *rctx = static_cast<RGWRadosCtx *>(ctx);
-  RGWRadosCtx *new_ctx = NULL;
+  ObjectCtx *rctx = static_cast<ObjectCtx *>(ctx);
+  ObjectCtx *new_ctx = NULL;
   bool reading_from_head = true;
   ObjectReadOperation op;
 
@@ -4695,7 +4695,7 @@ int RGWRados::get_obj(void *ctx, RGWObjVersionTracker *objv_tracker, void **hand
   get_obj_bucket_and_oid_loc(obj, bucket, oid, key);
 
   if (!rctx) {
-    new_ctx = new RGWRadosCtx(this);
+    new_ctx = new ObjectCtx(this);
     rctx = new_ctx;
   }
 
@@ -5064,7 +5064,7 @@ int RGWRados::get_obj_iterate_cb(void *ctx, RGWObjState *astate,
                          off_t read_ofs, off_t len,
                          bool is_head_obj, void *arg)
 {
-  RGWRadosCtx *rctx = static_cast<RGWRadosCtx *>(ctx);
+  ObjectCtx *rctx = static_cast<ObjectCtx *>(ctx);
   ObjectReadOperation op;
   struct get_obj_data *d = (struct get_obj_data *)arg;
   string oid, key;
@@ -5198,13 +5198,13 @@ int RGWRados::iterate_obj(void *ctx, rgw_obj& obj,
   rgw_obj read_obj = obj;
   uint64_t read_ofs = ofs;
   uint64_t len;
-  RGWRadosCtx *rctx = static_cast<RGWRadosCtx *>(ctx);
-  RGWRadosCtx *new_ctx = NULL;
+  ObjectCtx *rctx = static_cast<ObjectCtx *>(ctx);
+  ObjectCtx *new_ctx = NULL;
   bool reading_from_head = true;
   RGWObjState *astate = NULL;
 
   if (!rctx) {
-    new_ctx = new RGWRadosCtx(this);
+    new_ctx = new ObjectCtx(this);
     rctx = new_ctx;
   }
 
@@ -5274,7 +5274,7 @@ int RGWRados::read(void *ctx, rgw_obj& obj, off_t ofs, size_t size, bufferlist&
   if (r < 0) {
     return r;
   }
-  RGWRadosCtx *rctx = static_cast<RGWRadosCtx *>(ctx);
+  ObjectCtx *rctx = static_cast<ObjectCtx *>(ctx);
   RGWObjState *astate = NULL;
 
   ObjectReadOperation op;
@@ -5601,7 +5601,7 @@ int RGWRados::set_olh(void *ctx, const string& bucket_owner, rgw_obj& target_obj
   olh_obj.clear_instance();
 
   RGWObjState *state = NULL;
-  RGWRadosCtx *rctx = static_cast<RGWRadosCtx *>(ctx);
+  ObjectCtx *rctx = static_cast<ObjectCtx *>(ctx);
 
   int ret;
 
@@ -6740,7 +6740,7 @@ int RGWRados::check_disk_state(librados::IoCtx io_ctx,
   io_ctx.locator_set_key(loc);
 
   RGWObjState *astate = NULL;
-  RGWRadosCtx rctx(this);
+  ObjectCtx rctx(this);
   int r = get_obj_state(&rctx, obj, &astate, NULL);
   if (r < 0)
     return r;

diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h
index e47af402a9150ad7bed281df878ed69b1a8279a7..cb985aae1deaed45f81eaac7b8c08c0b598c4605 100644 (file)
--- a/src/rgw/rgw_rados.h
+++ b/src/rgw/rgw_rados.h
@@ -1265,14 +1265,14 @@ class RGWRados
   friend class RGWReplicaLogger;
 
 public:
-  struct RGWRadosCtx {
+  struct ObjectCtx {
     RGWRados *store;
     map<rgw_obj, RGWObjState> objs_state;
     int (*intent_cb)(RGWRados *store, void *user_ctx, rgw_obj& obj, RGWIntentEvent intent);
     void *user_ctx;
 
-    RGWRadosCtx(RGWRados *_store) : store(_store), intent_cb(NULL), user_ctx(NULL) { }
-    RGWRadosCtx(RGWRados *_store, void *_user_ctx) : store(_store), intent_cb(NULL), user_ctx(_user_ctx) { }
+    ObjectCtx(RGWRados *_store) : store(_store), intent_cb(NULL), user_ctx(NULL) { }
+    ObjectCtx(RGWRados *_store, void *_user_ctx) : store(_store), intent_cb(NULL), user_ctx(_user_ctx) { }
 
     RGWObjState *get_state(rgw_obj& obj);
     void set_atomic(rgw_obj& obj);
@@ -1339,17 +1339,17 @@ private:
   int get_obj_ref(const rgw_obj& obj, rgw_rados_ref *ref, rgw_bucket *bucket, bool ref_system_obj = false);
   uint64_t max_bucket_id;
 
-  int get_olh_target_state(RGWRadosCtx *rctx, rgw_obj& obj, RGWObjState *olh_state,
+  int get_olh_target_state(ObjectCtx *rctx, rgw_obj& obj, RGWObjState *olh_state,
                            RGWObjState **target_state, RGWObjVersionTracker *objv_tracker);
-  int get_obj_state_impl(RGWRadosCtx *rctx, rgw_obj& obj, RGWObjState **state, RGWObjVersionTracker *objv_tracker, bool follow_olh);
-  int append_atomic_test(RGWRadosCtx *rctx, rgw_obj& obj,
+  int get_obj_state_impl(ObjectCtx *rctx, rgw_obj& obj, RGWObjState **state, RGWObjVersionTracker *objv_tracker, bool follow_olh);
+  int append_atomic_test(ObjectCtx *rctx, rgw_obj& obj,
                          librados::ObjectOperation& op, RGWObjState **state);
-  int prepare_atomic_for_write_impl(RGWRadosCtx *rctx, rgw_obj& obj,
+  int prepare_atomic_for_write_impl(ObjectCtx *rctx, rgw_obj& obj,
                          librados::ObjectWriteOperation& op, RGWObjState **pstate,
                         bool reset_obj, const string *ptag,
                          const char *if_match = NULL,
                          const char *if_nomatch = NULL);
-  int prepare_atomic_for_write(RGWRadosCtx *rctx, rgw_obj& obj,
+  int prepare_atomic_for_write(ObjectCtx *rctx, rgw_obj& obj,
                          librados::ObjectWriteOperation& op, RGWObjState **pstate,
                         bool reset_obj, const string *ptag,
                          const char *if_match = NULL,
@@ -1361,7 +1361,7 @@ private:
     }
   }
 
-  int complete_atomic_overwrite(RGWRadosCtx *rctx, RGWObjState *state, rgw_obj& obj);
+  int complete_atomic_overwrite(ObjectCtx *rctx, RGWObjState *state, rgw_obj& obj);
 
   int update_placement_map();
   int store_bucket_info(RGWBucketInfo& info, map<string, bufferlist> *pattrs, RGWObjVersionTracker *objv_tracker, bool exclusive);
@@ -1688,8 +1688,8 @@ public:
                         map<string, bufferlist>* rmattrs,
                         RGWObjVersionTracker *objv_tracker);
 
-  int get_obj_state(RGWRadosCtx *rctx, rgw_obj& obj, RGWObjState **state, RGWObjVersionTracker *objv_tracker, bool follow_olh);
-  int get_obj_state(RGWRadosCtx *rctx, rgw_obj& obj, RGWObjState **state, RGWObjVersionTracker *objv_tracker) {
+  int get_obj_state(ObjectCtx *rctx, rgw_obj& obj, RGWObjState **state, RGWObjVersionTracker *objv_tracker, bool follow_olh);
+  int get_obj_state(ObjectCtx *rctx, rgw_obj& obj, RGWObjState **state, RGWObjVersionTracker *objv_tracker) {
     return get_obj_state(rctx, obj, state, objv_tracker, true);
   }
 /**
@@ -1800,25 +1800,25 @@ public:
   void pick_control_oid(const string& key, string& notify_oid);
 
   void *create_context(void *user_ctx) {
-    RGWRadosCtx *rctx = new RGWRadosCtx(this);
+    ObjectCtx *rctx = new ObjectCtx(this);
     rctx->user_ctx = user_ctx;
     return rctx;
   }
   void destroy_context(void *ctx) {
-    delete static_cast<RGWRadosCtx *>(ctx);
+    delete static_cast<ObjectCtx *>(ctx);
   }
   void set_atomic(void *ctx, rgw_obj& obj) {
-    RGWRadosCtx *rctx = static_cast<RGWRadosCtx *>(ctx);
+    ObjectCtx *rctx = static_cast<ObjectCtx *>(ctx);
     rctx->set_atomic(obj);
   }
   void set_prefetch_data(void *ctx, rgw_obj& obj) {
-    RGWRadosCtx *rctx = static_cast<RGWRadosCtx *>(ctx);
+    ObjectCtx *rctx = static_cast<ObjectCtx *>(ctx);
     rctx->set_prefetch_data(obj);
   }
   // to notify upper layer that we need to do some operation on an object, and it's up to
   // the upper layer to schedule this operation.. e.g., log intent in intent log
   void set_intent_cb(void *ctx, int (*cb)(RGWRados *store, void *user_ctx, rgw_obj& obj, RGWIntentEvent intent)) {
-    RGWRadosCtx *rctx = static_cast<RGWRadosCtx *>(ctx);
+    ObjectCtx *rctx = static_cast<ObjectCtx *>(ctx);
     rctx->set_intent_cb(cb);
   }