From e4acc44814c59459784487a77ca85b2dd8a183f2 Mon Sep 17 00:00:00 2001
From: Benny Halevy <bhalevy@scylladb.com>
Date: Sun, 16 Apr 2023 13:24:07 +0300
Subject: [PATCH] sstable_directory: parallel_for_each_restricted: use
 std::ranges for template definition

We'd like the container to be a std::ranges::range.

Signed-off-by: Benny Halevy <bhalevy@scylladb.com>
---
 sstables/sstable_directory.cc | 4 ++--
 sstables/sstable_directory.hh | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/sstables/sstable_directory.cc b/sstables/sstable_directory.cc
index 34a2fd493e..8cc58d50e7 100644
--- a/sstables/sstable_directory.cc
+++ b/sstables/sstable_directory.cc
@@ -429,8 +429,8 @@ sstable_directory::filter_sstables(std::function<future<bool>(sstables::shared_s
     _unshared_local_sstables = std::move(filtered);
 }
 
-template <typename Container, typename Func>
-requires std::is_invocable_r_v<future<>, Func, typename std::decay_t<Container>::value_type&>
+template <std::ranges::range Container, typename Func>
+requires std::is_invocable_r_v<future<>, Func, typename std::ranges::range_value_t<Container>&>
 future<>
 sstable_directory::parallel_for_each_restricted(Container& c, Func&& func) {
     return do_with(std::move(func), [this, &c] (Func& func) mutable {
diff --git a/sstables/sstable_directory.hh b/sstables/sstable_directory.hh
index 37eed8e35f..4f8081ab81 100644
--- a/sstables/sstable_directory.hh
+++ b/sstables/sstable_directory.hh
@@ -159,10 +159,9 @@ private:
     future<sstables::shared_sstable> load_sstable(sstables::entry_descriptor desc, sstables::sstable_open_config cfg = {}) const;
     future<sstables::shared_sstable> load_sstable(sstables::entry_descriptor desc, process_flags flags) const;
 
-    template <typename Container, typename Func>
-    requires std::is_invocable_r_v<future<>, Func, typename std::decay_t<Container>::value_type&>
+    template <std::ranges::range Container, typename Func>
+    requires std::is_invocable_r_v<future<>, Func, typename std::ranges::range_value_t<Container>&>
     future<> parallel_for_each_restricted(Container& C, Func&& func);
-
     future<> load_foreign_sstables(sstable_entry_descriptor_vector info_vec);
 
     // Sort the sstable according to owner