From: Casey Bodley <cbodley@redhat.com>
Date: Wed, 28 Jun 2017 16:18:33 +0000 (-0400)
Subject: rgw: RGWMetadataLog::list_entries() no longer splices
X-Git-Tag: v12.1.1~242^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=112464483ecb407ef1388ba8a3f8d29cb0725594;p=ceph-ci.git

rgw: RGWMetadataLog::list_entries() no longer splices

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/cls/log/cls_log_client.cc b/src/cls/log/cls_log_client.cc
index 881be1636f4..0aa6e16d4a0 100644
--- a/src/cls/log/cls_log_client.cc
+++ b/src/cls/log/cls_log_client.cc
@@ -94,11 +94,11 @@ public:
         bufferlist::iterator iter = outbl.begin();
         ::decode(ret, iter);
         if (entries)
-	  *entries = ret.entries;
+          *entries = std::move(ret.entries);
         if (truncated)
           *truncated = ret.truncated;
         if (marker)
-          *marker = ret.marker;
+          *marker = std::move(ret.marker);
       } catch (buffer::error& err) {
         // nothing we can do about it atm
       }
diff --git a/src/rgw/rgw_metadata.cc b/src/rgw/rgw_metadata.cc
index 28a2b94c7a0..a4103175cc0 100644
--- a/src/rgw/rgw_metadata.cc
+++ b/src/rgw/rgw_metadata.cc
@@ -149,18 +149,16 @@ int RGWMetadataLog::list_entries(void *handle,
     *truncated = false;
     return 0;
   }
-  
-  list<cls_log_entry> log_entries;
-  
+
   int ret = store->time_log_list(ctx->cur_oid, ctx->from_time, ctx->end_time,
-				 max_entries, log_entries, ctx->marker,
+				 max_entries, entries, ctx->marker,
 				 last_marker, truncated);
   if ((ret < 0) && (ret != -ENOENT))
     return ret;
 
   ctx->marker = *last_marker;
-  entries.splice(entries.end(), log_entries);
   
+
   if (ret == -ENOENT)
     *truncated = false;