solid_cache 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e16bebed50154ce9a1657114a5fe1316d8137e7f5a0136fdb8858ece68f5351
-  data.tar.gz: 6a66887e0dac5e4b52fae796c482fcc54ebcd1402f145217cf3530adc47d005a
+  metadata.gz: 7ba0486907f0e4656593843d1cca1c7ec35763772ff6d5a2a4e43b9d43b023b3
+  data.tar.gz: a93991c212dcb6d0a1dedb20e2d8d85e0664092c2342db895489beafb9f17e23
 SHA512:
-  metadata.gz: 527da66c8b66d68ae31eafe5d3b6474f5801649119ed96848ec83a6990f3b59c0a35a706b20a33ba2ab99beebe3195575388b8f44e64308c4060e20b6fd9892f
-  data.tar.gz: 0d41d9ad62843d0815db7468b9475088f6f95d3122a0eaada4d16e15020eee38a5a4642dd1570f8bde0ee347f7ea54a38c5b6810429b316ad888a3fb641dadf2
+  metadata.gz: 9897aef78db43aff6bceea922aa43669f76a48852d4dc94e64ce8aa198c1ca7fd04152a15033760a6fecad11245b650369342345c6f07e366c3d3d4e0a71f1da
+  data.tar.gz: cd59a068b761fd6060005d9ef78328cd03a3420ee539c07a6afd14eed072a0e9a092d135fbadeb5a58d38aa5a146e8481286b50ef411548a15b701464c0394b0

data/app/models/solid_cache/entry.rb

@@ -31,7 +31,7 @@ module SolidCache
       end
 
       def delete_by_key(key)
-        delete_no_query_cache(:key_hash, key_hash_for(key))
+        delete_no_query_cache(:key_hash, key_hash_for(key)) > 0
       end
 
       def delete_multi(keys)
@@ -47,21 +47,17 @@ module SolidCache
         in_batches.delete_all
       end
 
-      def increment(key, amount)
+      def lock_and_write(key, &block)
         transaction do
           uncached do
             result = lock.where(key_hash: key_hash_for(key)).pick(:key, :value)
-            amount += result[1].to_i if result&.first == key
-            write(key, amount)
-            amount
+            new_value = block.call(result&.first == key ? result[1] : nil)
+            write(key, new_value)
+            new_value
           end
         end
       end
 
-      def decrement(key, amount)
-        increment(key, -amount)
-      end
-
       def id_range
         uncached do
           pick(Arel.sql("max(id) - min(id) + 1")) || 0
@@ -70,13 +66,13 @@ module SolidCache
 
       private
         def upsert_all_no_query_cache(payloads)
-          insert_all = ActiveRecord::InsertAll.new(
-            self,
-            add_key_hash_and_byte_size(payloads),
-            unique_by: upsert_unique_by,
-            on_duplicate: :update,
-            update_only: upsert_update_only
-          )
+          args = [ self,
+                   connection_for_insert_all,
+                   add_key_hash_and_byte_size(payloads) ].compact
+          options = { unique_by: upsert_unique_by,
+                      on_duplicate: :update,
+                      update_only: upsert_update_only }
+          insert_all = ActiveRecord::InsertAll.new(*args, **options)
           sql = connection.build_insert_sql(ActiveRecord::InsertAll::Builder.new(insert_all))
 
           message = +"#{self} "
@@ -86,6 +82,10 @@ module SolidCache
           connection.send exec_query_method, sql, message
         end
 
+        def connection_for_insert_all
+          Rails.version >= "7.2" ? connection : nil
+        end
+
         def add_key_hash_and_byte_size(payloads)
           payloads.map do |payload|
             payload.dup.tap do |payload|
@@ -148,9 +148,9 @@ module SolidCache
 
             # exec_delete does not clear the query cache
             if connection.prepared_statements?
-              connection.exec_delete(sql, "#{name} Delete All", Array(values)).nonzero?
+              connection.exec_delete(sql, "#{name} Delete All", Array(values))
             else
-              connection.exec_delete(sql, "#{name} Delete All").nonzero?
+              connection.exec_delete(sql, "#{name} Delete All")
             end
           end
         end

data/db/migrate/20240108155507_add_key_hash_and_byte_size_to_solid_cache_entries.rb

@@ -1,4 +1,4 @@
-class AddKeyHashAndByteSizeToSolidCacheEntries < ActiveRecord::Migration[7.1]
+class AddKeyHashAndByteSizeToSolidCacheEntries < ActiveRecord::Migration[7.0]
   def change
     change_table :solid_cache_entries do |t|
       t.column :key_hash,  :integer, null: true, limit: 8

data/db/migrate/20240110111600_add_key_hash_and_byte_size_indexes_and_null_constraints_to_solid_cache_entries.rb

@@ -1,4 +1,4 @@
-class AddKeyHashAndByteSizeIndexesAndNullConstraintsToSolidCacheEntries < ActiveRecord::Migration[7.1]
+class AddKeyHashAndByteSizeIndexesAndNullConstraintsToSolidCacheEntries < ActiveRecord::Migration[7.0]
   def change
     change_table :solid_cache_entries, bulk: true do |t|
       t.change_null :key_hash, false

data/db/migrate/20240110111702_remove_key_index_from_solid_cache_entries.rb

@@ -1,4 +1,4 @@
-class RemoveKeyIndexFromSolidCacheEntries < ActiveRecord::Migration[7.1]
+class RemoveKeyIndexFromSolidCacheEntries < ActiveRecord::Migration[7.0]
   def change
     change_table :solid_cache_entries do |t|
       t.remove_index :key, unique: true

data/lib/solid_cache/store/api.rb

@@ -15,17 +15,11 @@ module SolidCache
       end
 
       def increment(name, amount = 1, options = nil)
-        options = merged_options(options)
-        key = normalize_key(name, options)
-
-        entry_increment(key, amount)
+        adjust(name, amount, options)
       end
 
       def decrement(name, amount = 1, options = nil)
-        options = merged_options(options)
-        key = normalize_key(name, options)
-
-        entry_decrement(key, amount)
+        adjust(name, -amount, options)
       end
 
       def cleanup(options = nil)
@@ -41,7 +35,7 @@ module SolidCache
           deserialize_entry(read_serialized_entry(key, **options), **options)
         end
 
-        def read_serialized_entry(key, raw: false, **options)
+        def read_serialized_entry(key, **options)
           entry_read(key)
         end
 
@@ -109,11 +103,7 @@ module SolidCache
         end
 
         def serialize_entry(entry, raw: false, **options)
-          if raw
-            entry.value.to_s
-          else
-            super(entry, raw: raw, **options)
-          end
+          super(entry, raw: raw, **options)
         end
 
         def serialize_entries(entries, **options)
@@ -122,12 +112,8 @@ module SolidCache
           end
         end
 
-        def deserialize_entry(payload, raw: false, **)
-          if payload && raw
-            ActiveSupport::Cache::Entry.new(payload)
-          else
-            super(payload)
-          end
+        def deserialize_entry(payload, **)
+          super(payload)
         end
 
         def normalize_key(key, options)
@@ -143,6 +129,30 @@ module SolidCache
             key
           end
         end
+
+        def adjust(name, amount, options)
+          options = merged_options(options)
+          key = normalize_key(name, options)
+
+          new_value = entry_lock_and_write(key) do |value|
+            serialize_entry(adjusted_entry(value, amount, options))
+          end
+          deserialize_entry(new_value, **options).value if new_value
+        end
+
+        def adjusted_entry(value, amount, options)
+          entry = deserialize_entry(value, **options)
+
+          if entry && !entry.expired?
+            ActiveSupport::Cache::Entry.new \
+              amount + entry.value.to_i, **options.dup.merge(expires_in: nil, expires_at: entry.expires_at)
+          elsif /\A\d+\z/.match?(value)
+            # This is to match old raw values
+            ActiveSupport::Cache::Entry.new(amount + value.to_i, **options)
+          else
+            ActiveSupport::Cache::Entry.new(amount, **options)
+          end
+        end
     end
   end
 end

data/lib/solid_cache/store/clusters.rb

@@ -67,12 +67,12 @@ module SolidCache
 
         def writing_all(failsafe:, failsafe_returning: nil, &block)
           first_cluster_sync_rest_async do |cluster, async|
-            cluster.connection_names.each do |connection|
+            cluster.connection_names.map do |connection|
               failsafe(failsafe, returning: failsafe_returning) do
                 cluster.with_connection(connection, async: async, &block)
               end
             end
-          end
+          end.first
         end
 
         def first_cluster_sync_rest_async

data/lib/solid_cache/store/entries.rb

@@ -18,7 +18,7 @@ module SolidCache
 
       private
         def entry_clear
-          writing_all(failsafe: :clear) do
+          writing_all(failsafe: :clear, failsafe_returning: nil) do
             if clear_with == :truncate
               Entry.clear_truncate
             else
@@ -27,15 +27,9 @@ module SolidCache
           end
         end
 
-        def entry_increment(key, amount)
+        def entry_lock_and_write(key, &block)
           writing_key(key, failsafe: :increment) do
-            Entry.increment(key, amount)
-          end
-        end
-
-        def entry_decrement(key, amount)
-          writing_key(key, failsafe: :decrement) do
-            Entry.decrement(key, amount)
+            Entry.lock_and_write(key, &block)
           end
         end
 
@@ -52,7 +46,7 @@ module SolidCache
         end
 
         def entry_write(key, payload)
-          writing_key(key, failsafe: :write_entry, failsafe_returning: false) do |cluster|
+          writing_key(key, failsafe: :write_entry, failsafe_returning: nil) do |cluster|
             Entry.write(key, payload)
             cluster.track_writes(1)
             true
@@ -74,7 +68,7 @@ module SolidCache
         end
 
         def entry_delete_multi(entries)
-          writing_keys(entries, failsafe: :delete_multi_entries, failsafe_returning: false) do
+          writing_keys(entries, failsafe: :delete_multi_entries, failsafe_returning: 0) do
             Entry.delete_multi(entries)
           end
         end

data/lib/solid_cache/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidCache
-  VERSION = "0.5.3"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solid_cache
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Donal McBreen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-29 00:00:00.000000000 Z
+date: 2024-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: msgpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A database backed ActiveSupport::Cache::Store
 email:
 - donal@37signals.com