From: Kefu Chai <kchai@redhat.com>
Date: Thu, 17 Dec 2020 12:01:29 +0000 (+0800)
Subject: crimson/osd: use move() to avoid memcpy()
X-Git-Tag: v16.1.0~202^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c06d3c63f42d337c2e61bc565dd38bacc9429e90;p=ceph.git

crimson/osd: use move() to avoid memcpy()

try to move away from the returned map of xattrs.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/crimson/osd/replicated_recovery_backend.cc b/src/crimson/osd/replicated_recovery_backend.cc
index 53bce25f090c..657cd77ea0a9 100644
--- a/src/crimson/osd/replicated_recovery_backend.cc
+++ b/src/crimson/osd/replicated_recovery_backend.cc
@@ -374,9 +374,8 @@ seastar::future<PushOp> ReplicatedRecoveryBackend::build_push_op(
 	  pop->omap_header.claim_append(bl);
 	  return store->get_attrs(coll, ghobject_t(recovery_info.soid));
 	}).safe_then([&oi, pop, &new_progress, &v](auto attrs) mutable {
-	  //pop->attrset = attrs;
-	  for (auto p : attrs) {
-	    pop->attrset[p.first].push_back(p.second);
+	  for (auto& [key, val] : attrs) {
+	    pop->attrset[std::move(key)].push_back(std::move(val));
 	  }
 	  logger().debug("build_push_op: {}", pop->attrset[OI_ATTR]);
 	  oi.decode(pop->attrset[OI_ATTR]);