From: Samuel Just <sjust@redhat.com>
Date: Sat, 17 Sep 2022 03:00:24 +0000 (+0000)
Subject: ceph_dedup_tool: minor code simplifications
X-Git-Tag: v18.0.0~6^2~3
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6ae386d48fd881221a0891202d59e610185e8a93;p=ceph-ci.git

ceph_dedup_tool: minor code simplifications

Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/tools/ceph_dedup_tool.cc b/src/tools/ceph_dedup_tool.cc
index 78c79a82228..4737e74fa8c 100644
--- a/src/tools/ceph_dedup_tool.cc
+++ b/src/tools/ceph_dedup_tool.cc
@@ -655,8 +655,8 @@ void SampleDedupWorkerThread::crawl()
 {
   cout << "new iteration" << std::endl;
 
-  for (ObjectCursor current_object = begin;
-      current_object < end;) {
+  ObjectCursor current_object = begin;
+  while (current_object < end) {
     std::vector<ObjectItem> objects;
     // Get the list of object IDs to deduplicate
     std::tie(objects, current_object) = get_objects(current_object, end, 100);
@@ -674,8 +674,7 @@ void SampleDedupWorkerThread::crawl()
   vector<AioCompRef> evict_completions(oid_for_evict.size());
   int i = 0;
   for (auto &oid : oid_for_evict) {
-    auto completion = do_async_evict(oid);
-    evict_completions[i] = move(completion);
+    evict_completions[i] = do_async_evict(oid);
     i++;
   }
   for (auto &completion : evict_completions) {
@@ -712,7 +711,7 @@ std::tuple<std::vector<ObjectItem>, ObjectCursor> SampleDedupWorkerThread::get_o
     &next);
   if (ret < 0 ) {
     cerr << "error object_list" << std::endl;
-    objects.resize(0);
+    objects.clear();
   }
 
   return std::make_tuple(objects, next);