Merge pull request #311 from pareshios/remove_inmemory_cache

feat: Added support to remove only in memory cache
hyperoslo · May 14, 2023 · d048bf4 · d048bf4
2 parents eeaf771 + de764f8
commit d048bf4
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 1 deletion.
diff --git a/Source/Shared/Storage/DiskStorage.swift b/Source/Shared/Storage/DiskStorage.swift
@@ -145,6 +145,8 @@ extension DiskStorage: StorageAware {
     // Remove objects if storage size exceeds max size
     try removeResourceObjects(resourceObjects, totalSize: totalSize)
   }
+
+  public func removeInMemoryObject(forKey key: Key) throws { }
 }
 
 extension DiskStorage {

diff --git a/Source/Shared/Storage/HybridStorage.swift b/Source/Shared/Storage/HybridStorage.swift
@@ -51,6 +51,11 @@ extension HybridStorage: StorageAware {
 
     notifyStorageObservers(about: .remove(key: key))
   }
+
+  public func removeInMemoryObject(forKey key: Key) throws {
+    memoryStorage.removeObject(forKey: key)
+    notifyStorageObservers(about: .removeInMemory(key: key))
+  }
 
   public func setObject(_ object: Value, forKey key: Key, expiry: Expiry? = nil) throws {
     var keyChange: KeyChange<Value>?

diff --git a/Source/Shared/Storage/MemoryStorage.swift b/Source/Shared/Storage/MemoryStorage.swift
@@ -67,6 +67,11 @@ extension MemoryStorage {
     cache.removeObject(forKey: WrappedKey(key))
     keys.remove(key)
   }
+
+  public func removeInMemoryObject(forKey key: Key) throws {
+    cache.removeObject(forKey: WrappedKey(key))
+    keys.remove(key)
+  }
 
   public func entry(forKey key: Key) throws -> Entry<Value> {
     guard let capsule = cache.object(forKey: WrappedKey(key)) else {

diff --git a/Source/Shared/Storage/Storage.swift b/Source/Shared/Storage/Storage.swift
@@ -43,6 +43,10 @@ public final class Storage<Key: Hashable, Value> {
 }
 
 extension Storage: StorageAware {
+  public func removeInMemoryObject(forKey key: Key) throws {
+    try self.syncStorage.removeInMemoryObject(forKey: key)
+  }
+
   public var allKeys: [Key] {
     self.syncStorage.allKeys
   }

diff --git a/Source/Shared/Storage/StorageAware.swift b/Source/Shared/Storage/StorageAware.swift
@@ -71,6 +71,11 @@ public protocol StorageAware {
    - Parameter key: Unique key to identify the object.
    */
   func isExpiredObject(forKey key: Key) throws -> Bool
+  /**
+   Removes the object by the given key from cache in memory only.
+   - Parameter key: Unique key to identify the object.
+   */
+  func removeInMemoryObject(forKey key: Key) throws
 }
 
 public extension StorageAware {

diff --git a/Source/Shared/Storage/StorageObservationRegistry.swift b/Source/Shared/Storage/StorageObservationRegistry.swift
@@ -28,11 +28,12 @@ public enum StorageChange<Key: Hashable>: Equatable {
   case remove(key: Key)
   case removeAll
   case removeExpired
+  case removeInMemory(key: Key)
 }
 
 public func == <Key : Hashable>(lhs: StorageChange<Key>, rhs: StorageChange<Key>) -> Bool {
   switch (lhs, rhs) {
-  case (.add(let key1), .add(let key2)), (.remove(let key1), .remove(let key2)):
+  case (.add(let key1), .add(let key2)), (.remove(let key1), .remove(let key2)), (.removeInMemory(let key1), .removeInMemory(let key2)):
     return key1 == key2
   case (.removeAll, .removeAll), (.removeExpired, .removeExpired):
     return true

diff --git a/Source/Shared/Storage/SyncStorage.swift b/Source/Shared/Storage/SyncStorage.swift
@@ -61,6 +61,13 @@ extension SyncStorage: StorageAware {
       try innerStorage.removeExpiredObjects()
     }
   }
+
+  public func removeInMemoryObject(forKey key: Key) throws {
+    try serialQueue.sync {
+    try self.innerStorage.removeInMemoryObject(forKey: key)
+    }
+  }
+
 }
 
 public extension SyncStorage {