Update LruCache for consistency

jbaldwin · Apr 8, 2019 · 5803db4 · 5803db4
1 parent 29b4ec7
commit 5803db4
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 35 deletions.
diff --git a/inc/cappuccino/LruCache.h b/inc/cappuccino/LruCache.h
@@ -36,12 +36,8 @@ class LruCache {
         const KeyType& key,
         ValueType value) -> void;
 
-    template <template <class...> typename RangeType>
-    auto InsertRange(
-        RangeType<KeyValue> key_value_range) -> void;
-    template <template <class...> typename RangeType, template <class, class> typename PairType>
-    auto InsertRange(
-        RangeType<PairType<KeyType, ValueType>> key_value_range) -> void;
+    template <typename RangeType>
+    auto InsertRange(RangeType&& key_value_range) -> void;
 
     auto Delete(
         const KeyType& key) -> bool;
@@ -53,12 +49,12 @@ class LruCache {
     auto Find(
         const KeyType& key) -> std::optional<ValueType>;
 
-    template <template <class...> typename RangeType>
-    auto FindRange(
-        RangeType<KeyType, std::optional<ValueType>>& key_optional_value_range) -> void;
-    template <template <class...> typename RangeType, template <class, class> typename PairType>
-    auto FindRange(
-        RangeType<PairType<KeyType, std::optional<ValueType>>>& key_optional_value_range) -> void;
+    template <typename RangeType>
+    auto FindRange(const RangeType& keys) -> std::unordered_map<KeyType, std::optional<ValueType>>;
+
+    template <typename RangeType>
+    auto FindRangeFill(
+        RangeType&& key_optional_value_range) -> void;
 
     auto GetUsedSize() const -> size_t;
 

diff --git a/inc/cappuccino/LruCache.tcc b/inc/cappuccino/LruCache.tcc
@@ -21,27 +21,18 @@ LruCache<KeyType, ValueType, SyncType>::LruCache(
 }
 
 template <typename KeyType, typename ValueType, SyncImplEnum SyncType>
-auto LruCache<KeyType, ValueType, SyncType>::Insert(const KeyType& key, ValueType value) -> void
+auto LruCache<KeyType, ValueType, SyncType>::Insert(
+    const KeyType& key,
+    ValueType value) -> void
 {
     LockScopeGuard<SyncType> guard { m_lock };
     doInsertUpdate(key, std::move(value));
 };
 
 template <typename KeyType, typename ValueType, SyncImplEnum SyncType>
-template <template <class...> typename RangeType>
-auto LruCache<KeyType, ValueType, SyncType>::InsertRange(
-    RangeType<KeyValue> key_value_range) -> void
-{
-    LockScopeGuard<SyncType> guard { m_lock };
-    for (auto& [key, value] : key_value_range) {
-        doInsertUpdate(key, std::move(value));
-    }
-};
-
-template <typename KeyType, typename ValueType, SyncImplEnum SyncType>
-template <template <class...> typename RangeType, template <class, class> typename PairType>
+template <typename RangeType>
 auto LruCache<KeyType, ValueType, SyncType>::InsertRange(
-    RangeType<PairType<KeyType, ValueType>> key_value_range) -> void
+    RangeType&& key_value_range) -> void
 {
     LockScopeGuard<SyncType> guard { m_lock };
     for (auto& [key, value] : key_value_range) {
@@ -83,27 +74,34 @@ auto LruCache<KeyType, ValueType, SyncType>::DeleteRange(
 }
 
 template <typename KeyType, typename ValueType, SyncImplEnum SyncType>
-auto LruCache<KeyType, ValueType, SyncType>::Find(const KeyType& key) -> std::optional<ValueType>
+auto LruCache<KeyType, ValueType, SyncType>::Find(
+    const KeyType& key) -> std::optional<ValueType>
 {
     LockScopeGuard<SyncType> guard { m_lock };
     return doFind(key);
 }
 
 template <typename KeyType, typename ValueType, SyncImplEnum SyncType>
-template <template <class...> typename RangeType>
+template <typename RangeType>
 auto LruCache<KeyType, ValueType, SyncType>::FindRange(
-    RangeType<KeyType, std::optional<ValueType>>& key_optional_value_range) -> void
+    const RangeType& keys) -> std::unordered_map<KeyType, std::optional<ValueType>>
 {
-    LockScopeGuard<SyncType> guard { m_lock };
-    for (auto& [key, optional_value] : key_optional_value_range) {
-        optional_value = doFind(key);
+    std::unordered_map<KeyType, std::optional<ValueType>> output;
+    output.reserve(std::size(keys));
+
+    for (auto& key : keys) {
+        output.emplace(key, std::nullopt);
     }
+
+    FindRangeFill(output);
+
+    return output;
 }
 
 template <typename KeyType, typename ValueType, SyncImplEnum SyncType>
-template <template <class...> typename RangeType, template <class, class> typename PairType>
-auto LruCache<KeyType, ValueType, SyncType>::FindRange(
-    RangeType<PairType<KeyType, std::optional<ValueType>>>& key_optional_value_range) -> void
+template <typename RangeType>
+auto LruCache<KeyType, ValueType, SyncType>::FindRangeFill(
+    RangeType&& key_optional_value_range) -> void
 {
     LockScopeGuard<SyncType> guard { m_lock };
     for (auto& [key, optional_value] : key_optional_value_range) {