From fe7d41506050074edfcd472ec048bb1ed0f78031 Mon Sep 17 00:00:00 2001 From: Bingyin Zhang Date: Thu, 28 Dec 2017 17:09:26 +0800 Subject: [PATCH] rgw: optimize function abort_bucket_multiparts * 1. common_prefixes is useless, so drop it; * 2. RGWMPObj object is enough, so change RGWMultipartUploadEntry to RGWMPObj; Signed-off-by: Bingyin Zhang --- src/rgw/rgw_multi.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/rgw/rgw_multi.cc b/src/rgw/rgw_multi.cc index 27d35115dcc..5c101397bbc 100644 --- a/src/rgw/rgw_multi.cc +++ b/src/rgw/rgw_multi.cc @@ -270,23 +270,21 @@ int abort_bucket_multiparts(RGWRados *store, CephContext *cct, RGWBucketInfo& bu vector objs; RGWObjectCtx obj_ctx(store); string marker; - map common_prefixes; bool is_truncated; do { ret = list_bucket_multiparts(store, bucket_info, prefix, marker, delim, - max, &objs, &common_prefixes, &is_truncated); + max, &objs, nullptr, &is_truncated); if (ret < 0) { return ret; } if (!objs.empty()) { - RGWMultipartUploadEntry entry; + RGWMPObj mp; for (const auto& obj : objs) { rgw_obj_key key(obj.key); - if (!entry.mp.from_meta(key.name)) + if (!mp.from_meta(key.name)) continue; - entry.obj = obj; - ret = abort_multipart_upload(store, cct, &obj_ctx, bucket_info, entry.mp); + ret = abort_multipart_upload(store, cct, &obj_ctx, bucket_info, mp); if (ret < 0) { return ret; } -- 2.39.5