Fix merge errors

rails · Aug 3, 2023 · f702f36 · f702f36
1 parent 405123e
commit f702f36
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/lib/solid_cache/cluster/async_execution.rb b/lib/solid_cache/cluster/async_execution.rb
@@ -2,7 +2,7 @@ module SolidCache
   class Cluster
     module AsyncExecution
       def initialize(options)
-        super(options)
+        super()
         @executor = Concurrent::SingleThreadExecutor.new(max_queue: 100, fallback_policy: :discard)
       end
 

diff --git a/lib/solid_cache/cluster/connection_handling.rb b/lib/solid_cache/cluster/connection_handling.rb
@@ -38,7 +38,7 @@ def reading_across_shards(list:)
       end
 
       def writing_shard(normalized_key:, trim: false)
-         with_shard(shard: shard_for_normalized_key(normalized_key)) do
+        with_shard(shard_for_normalized_key(normalized_key)) do
           async_if_required do
             result = yield
             trim(1) if trim
@@ -52,7 +52,7 @@ def reading_shard(normalized_key:)
       end
 
       private
-        def with_shard(shard:)
+        def with_shard(shard)
           if shard
             Record.connected_to(shard: shard) { yield }
           else

diff --git a/lib/solid_cache/store.rb b/lib/solid_cache/store.rb
@@ -90,7 +90,7 @@ def read_entry(key, **options)
       end
 
       def read_serialized_entry(key, raw: false, **options)
-        primary_cluster.with_shard_for_key(normalized_key: key) do
+        primary_cluster.reading_shard(normalized_key: key) do
           failsafe(:read_entry) do
             Entry.get(key)
           end
@@ -219,7 +219,7 @@ def failsafe(method, returning: nil)
 
       def writing_key(key, trim: false)
         writing_clusters do |cluster|
-          cluster.with_shard_for_key(normalized_key: key, trim: trim) do
+          cluster.writing_shard(normalized_key: key, trim: trim) do
             yield
           end
         end