From 081a4dee7cc39bd51093849407cec3884ed048c4 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Wed, 26 Jun 2019 13:13:50 -0700 Subject: [PATCH] rgw: remove unused field from struct rgw_bucket Signed-off-by: Yehuda Sadeh --- src/rgw/rgw_admin.cc | 1 - src/rgw/rgw_bucket.cc | 1 - src/rgw/rgw_common.h | 5 ----- src/rgw/rgw_reshard.cc | 1 - src/rgw/services/svc_bucket_sobj.cc | 5 ----- 5 files changed, 13 deletions(-) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index a7ae143dfdf..084dd78c1bc 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -2627,7 +2627,6 @@ int create_new_bucket_instance(RGWRados *store, { store->create_bucket_id(&new_bucket_info.bucket.bucket_id); - new_bucket_info.bucket.oid.clear(); new_bucket_info.num_shards = new_num_shards; new_bucket_info.objv_tracker.clear(); diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc index d986ea3971d..d4983423a64 100644 --- a/src/rgw/rgw_bucket.cc +++ b/src/rgw/rgw_bucket.cc @@ -3218,7 +3218,6 @@ int RGWBucketCtl::convert_old_bucket_info(RGWSI_Bucket_X_Ctx& ctx, } info = entry_point.old_bucket_info; - info.bucket.oid = bucket.name; info.ep_objv = ot.read_version; ot.generate_new_write_ver(cct); diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h index 9617f772c2a..2ec54bb237f 100644 --- a/src/rgw/rgw_common.h +++ b/src/rgw/rgw_common.h @@ -1149,10 +1149,6 @@ struct rgw_bucket { std::string bucket_id; rgw_data_placement_target explicit_placement; - std::string oid; /* - * runtime in-memory only info. If not empty, points to the bucket instance object - */ - rgw_bucket() { } // cppcheck-suppress noExplicitConstructor explicit rgw_bucket(const rgw_user& u, const cls_user_bucket& b) : @@ -1235,7 +1231,6 @@ struct rgw_bucket { void update_bucket_id(const string& new_bucket_id) { bucket_id = new_bucket_id; - oid.clear(); } // format a key for the bucket/instance. pass delim=0 to skip a field diff --git a/src/rgw/rgw_reshard.cc b/src/rgw/rgw_reshard.cc index e16278dcbbd..cf7ce7ee52d 100644 --- a/src/rgw/rgw_reshard.cc +++ b/src/rgw/rgw_reshard.cc @@ -299,7 +299,6 @@ static int create_new_bucket_instance(RGWRados *store, new_bucket_info = bucket_info; store->create_bucket_id(&new_bucket_info.bucket.bucket_id); - new_bucket_info.bucket.oid.clear(); new_bucket_info.num_shards = new_num_shards; new_bucket_info.objv_tracker.clear(); diff --git a/src/rgw/services/svc_bucket_sobj.cc b/src/rgw/services/svc_bucket_sobj.cc index 2537582369a..e6cd7d6ee13 100644 --- a/src/rgw/services/svc_bucket_sobj.cc +++ b/src/rgw/services/svc_bucket_sobj.cc @@ -334,10 +334,6 @@ int RGWSI_Bucket_SObj::do_read_bucket_instance_info(RGWSI_Bucket_BI_Ctx& ctx, return -EIO; } info->objv_tracker = ot; -#warning need to remove field? -#if 0 - info->bucket.oid = obj.oid; -#endif return 0; } @@ -399,7 +395,6 @@ int RGWSI_Bucket_SObj::read_bucket_info(RGWSI_Bucket_X_Ctx& ctx, if (entry_point.has_bucket_info) { *info = entry_point.old_bucket_info; - info->bucket.oid = bucket.name; info->bucket.tenant = bucket.tenant; info->ep_objv = ot.read_version; ldout(cct, 20) << "rgw_get_bucket_info: old bucket info, bucket=" << info->bucket << " owner " << info->owner << dendl; -- 2.39.5