From 10938b6521bcbc301c44b78ba2b900392ef4c47e Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 15 May 2025 15:03:42 +0800 Subject: [PATCH] tools/ceph_dedup: Replace iterator loops with range-based loops Refactor the code to use modern C++ range-based for loops instead of traditional iterator-based loops, improving code readability Signed-off-by: Kefu Chai --- src/tools/ceph_dedup/ceph_dedup_daemon.cc | 8 +++----- src/tools/ceph_dedup/ceph_dedup_tool.cc | 6 ++---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/tools/ceph_dedup/ceph_dedup_daemon.cc b/src/tools/ceph_dedup/ceph_dedup_daemon.cc index a3571ccb4a4..45b67fc201c 100644 --- a/src/tools/ceph_dedup/ceph_dedup_daemon.cc +++ b/src/tools/ceph_dedup/ceph_dedup_daemon.cc @@ -365,11 +365,9 @@ void SampleDedupWorkerThread::crawl() op.list_snaps(&snap_set, &snap_ret); io_ctx.operate(target.oid, &op, NULL); - for (std::vector::const_iterator r = snap_set.clones.begin(); - r != snap_set.clones.end(); - ++r) { - io_ctx.snap_set_read(r->cloneid); - try_dedup_and_accumulate_result(target, r->cloneid); + for (const auto& clone : snap_set.clones) { + io_ctx.snap_set_read(clone.cloneid); + try_dedup_and_accumulate_result(target, clone.cloneid); } } else { try_dedup_and_accumulate_result(target); diff --git a/src/tools/ceph_dedup/ceph_dedup_tool.cc b/src/tools/ceph_dedup/ceph_dedup_tool.cc index fc8aa44fa92..31a4eb8f8bd 100644 --- a/src/tools/ceph_dedup/ceph_dedup_tool.cc +++ b/src/tools/ceph_dedup/ceph_dedup_tool.cc @@ -1040,10 +1040,8 @@ int make_dedup_object(const po::variables_map &opts) op.list_snaps(&snap_set, &snap_ret); io_ctx.operate(object_name, &op, NULL); - for (std::vector::const_iterator r = snap_set.clones.begin(); - r != snap_set.clones.end(); - ++r) { - io_ctx.snap_set_read(r->cloneid); + for (const auto& clone : snap_set.clones) { + io_ctx.snap_set_read(clone.cloneid); ret = create_new_deduped_object(object_name); if (ret < 0) { goto out; -- 2.47.3