second_level_cache 2.5.2 → 2.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb263a78785d298fbaccbcb46bb71250f021e66d69f0cf5c89f9d1cd97651c50
-  data.tar.gz: f861c5fc32002720f2e83b30444ad3f2ac368427406a1c832ca4ba0f5620da89
+  metadata.gz: 1f5d055fea10f55860339d904a65bb84a51893f742d20758311e0b2c2b690727
+  data.tar.gz: eeba8b526efb808158e440e10bf752dbf3bc51e5f4d88878f859cf8f3b790647
 SHA512:
-  metadata.gz: 9cacc9218aed1c33fd4470c8fa6a5bf21a7e89c22da09f522594e6ab5fb4830a168a7c930c0e3b4470086ac0193e1a906ca27f6543d0cba44fe1b2e9c6cc02f5
-  data.tar.gz: df2b8f074ce143b141d8fb34d4f5799da505c1e72fdda03dbeaa7284cfd10d9074ca87b93481ba2cafe9df7d578ef40fb11e4afa2a172d351cfcdabc77e7efc4
+  metadata.gz: 63ad5288284a4a06735175fb6171962ecde65ad08ffe9cbc112ce060e98c236150acc0b29947536fe06891144929de2ba8e744099a1c31865dccab9c2f9492c9
+  data.tar.gz: 559d3cde7763d4bd2645a9f416f66bdb54e74e5335004529c88f56bdfc6a3c934a6f7d5ee86aa5377405c12ad09d813ba2cf4313d43704daacd4480e9d25c782

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+2.6.2
+-------
+
+- Fix activerecord association cache. (#109)
+- Fix fetch_by_uniq_key cache key with prefix. (#120)
+
+2.6.1
+-------
+
+- Improve proload debug log output, and deprecated logger method. (#106)
+
+2.6.0
+-------
+
+- Add has_one through cache support. (#98)
+- Fix string query, eager_load, includes/preload for fetch from db. ( #103, #102, #101)
+- Fix preloader if exists default scope. (#104)
+- Change cache hit log as `DEBUG` level. (#105)
+
+2.5.3
+-------
+
+- Fix `fetch_by_uniq_keys` method that cache incorrect when A record modified uniq key and B reocrd used old uniq key of A record (#96)
+
 2.5.2
 -------
 

data/README.md

@@ -134,7 +134,7 @@ config.cache_store = [:dalli_store, APP_CONFIG["memcached_host"], { namespace: "
 ## Tips:
 
 * When you want to clear only second level cache apart from other cache for example fragment cache in cache store,
-you can only change the `cache_key_prefix`:
+you can only change the `cache_key_prefix` (default: `slc`):
 
 ```ruby
 SecondLevelCache.configure.cache_key_prefix = "slc1"

data/lib/second_level_cache.rb

@@ -5,6 +5,7 @@ require "second_level_cache/config"
 require "second_level_cache/record_marshal"
 require "second_level_cache/record_relation"
 require "second_level_cache/active_record"
+require "second_level_cache/log_subscriber"
 
 module SecondLevelCache
   def self.configure

data/lib/second_level_cache/active_record.rb

@@ -12,7 +12,13 @@ require "second_level_cache/active_record/preloader"
 
 # http://api.rubyonrails.org/classes/ActiveSupport/LazyLoadHooks.html
 # ActiveSupport.run_load_hooks(:active_record, ActiveRecord::Base)
-ActiveSupport.on_load(:active_record) do
+ActiveSupport.on_load(:active_record, run_once: true) do
+  if Bundler.definition.dependencies.find { |x| x.name == "paranoia" }
+    require "second_level_cache/adapter/paranoia"
+    include SecondLevelCache::Adapter::Paranoia::ActiveRecord
+    SecondLevelCache::Mixin.send(:prepend, SecondLevelCache::Adapter::Paranoia::Mixin)
+  end
+
   include SecondLevelCache::Mixin
   prepend SecondLevelCache::ActiveRecord::Base
   extend SecondLevelCache::ActiveRecord::FetchByUniqKey
@@ -23,5 +29,5 @@ ActiveSupport.on_load(:active_record) do
   ActiveRecord::Relation.send(:prepend, SecondLevelCache::ActiveRecord::FinderMethods)
   # Rails 5.2 has removed ActiveRecord::Associations::Preloader::BelongsTo
   # https://github.com/rails/rails/pull/31079
-  ActiveRecord::Associations::Preloader::Association.send(:prepend, SecondLevelCache::ActiveRecord::Associations::Preloader::BelongsTo)
+  ActiveRecord::Associations::Preloader::Association.send(:prepend, SecondLevelCache::ActiveRecord::Associations::Preloader)
 end

data/lib/second_level_cache/active_record/base.rb

@@ -6,11 +6,7 @@ module SecondLevelCache
       def self.prepended(base)
         base.after_commit :update_second_level_cache, on: :update
         base.after_commit :write_second_level_cache, on: :create
-        if defined?(::Paranoia)
-          base.after_destroy :expire_second_level_cache
-        else
-          base.after_commit :expire_second_level_cache, on: :destroy
-        end
+        base.after_commit :expire_second_level_cache, on: :destroy
 
         class << base
           prepend ClassMethods

data/lib/second_level_cache/active_record/belongs_to_association.rb

@@ -6,6 +6,9 @@ module SecondLevelCache
       module BelongsToAssociation
         def find_target
           return super unless klass.second_level_cache_enabled?
+          return super if klass.default_scopes.present? || reflection.scope
+          return super if reflection.active_record_primary_key.to_s != klass.primary_key
+
           cache_record = klass.read_second_level_cache(second_level_cache_key)
           if cache_record
             return cache_record.tap { |record| set_inverse_instance(record) }
@@ -21,10 +24,9 @@ module SecondLevelCache
         end
 
         private
-
-        def second_level_cache_key
-          owner[reflection.foreign_key]
-        end
+          def second_level_cache_key
+            owner[reflection.foreign_key]
+          end
       end
     end
   end

data/lib/second_level_cache/active_record/fetch_by_uniq_key.rb

@@ -6,19 +6,22 @@ module SecondLevelCache
       def fetch_by_uniq_keys(where_values)
         cache_key = cache_uniq_key(where_values)
         obj_id = SecondLevelCache.cache_store.read(cache_key)
+
         if obj_id
-          begin
-            return find(obj_id)
-          rescue StandardError
-            return nil
-          end
+          record = begin
+                     find(obj_id)
+                   rescue StandardError
+                     nil
+                   end
         end
-
+        return record if record_attributes_equal_where_values?(record, where_values)
         record = where(where_values).first
-        return nil unless record
-
-        record.tap do |r|
-          SecondLevelCache.cache_store.write(cache_key, r.id)
+        if record
+          SecondLevelCache.cache_store.write(cache_key, record.id)
+          record
+        else
+          SecondLevelCache.cache_store.delete(cache_key)
+          nil
         end
       end
 
@@ -39,16 +42,20 @@ module SecondLevelCache
       end
 
       private
+        def cache_uniq_key(where_values)
+          keys = where_values.collect do |k, v|
+            v = Digest::MD5.hexdigest(v) if v.respond_to?(:size) && v.size >= 32
+            [k, v].join("_")
+          end
 
-      def cache_uniq_key(where_values)
-        keys = where_values.collect do |k, v|
-          v = Digest::MD5.hexdigest(v) if v && v.size >= 32
-          [k, v].join("_")
+          ext_key = keys.join(",")
+          "#{SecondLevelCache.configure.cache_key_prefix}/uniq_key_#{name}_#{ext_key}"
         end
 
-        ext_key = keys.join(",")
-        "uniq_key_#{name}_#{ext_key}"
-      end
+        def record_attributes_equal_where_values?(record, where_values)
+          # https://api.rubyonrails.org/classes/ActiveRecord/ModelSchema/ClassMethods.html#method-i-type_for_attribute
+          where_values.all? { |k, v| record&.read_attribute(k) == type_for_attribute(k).cast(v) }
+        end
     end
   end
 end

data/lib/second_level_cache/active_record/finder_methods.rb

@@ -17,20 +17,13 @@ module SecondLevelCache
       #     Article.where("articles.user_id = 1").find(prams[:id])
       #     Article.where("user_id = 1 AND ...").find(params[:id])
       def find_one(id)
-        return super(id) unless second_level_cache_enabled?
-        return super(id) unless select_all_column?
+        return super unless cachable?
 
         id = id.id if ActiveRecord::Base == id
-        if cachable?
-          record = @klass.read_second_level_cache(id)
-          if record
-            if where_values_hash.blank? || where_values_match_cache?(record)
-              return record
-            end
-          end
-        end
+        record = @klass.read_second_level_cache(id)
+        return record if record && where_values_match_cache?(record)
 
-        record = super(id)
+        record = super
         record.write_second_level_cache
         record
       end
@@ -48,53 +41,62 @@ module SecondLevelCache
       #     User.where(age: 18).first
       #
       def first(limit = nil)
-        return super(limit) if limit.to_i > 1
+        return super if limit.to_i > 1
+        return super unless cachable?
         # only have primary_key condition in where
         if where_values_hash.length == 1 && where_values_hash.key?(primary_key)
           record = @klass.read_second_level_cache(where_values_hash[primary_key])
           return record if record
         end
 
-        record = super(limit)
-        record&.write_second_level_cache if select_all_column?
+        record = super
+        record&.write_second_level_cache
         record
       end
 
       private
+        # readonly_value - active_record/relation/query_methods.rb Rails 5.1 true/false
+        def cachable?
+          second_level_cache_enabled? &&
+            limit_one? &&
+            # !eager_loading? &&
+            includes_values.blank? &&
+            preload_values.blank? &&
+            eager_load_values.blank? &&
+            select_values.blank? &&
+            order_values_can_cache? &&
+            readonly_value.blank? &&
+            joins_values.blank? &&
+            !@klass.locking_enabled? &&
+            where_clause_predicates_all_equality?
+        end
 
-      # readonly_value - active_record/relation/query_methods.rb Rails 5.1 true/false
-      def cachable?
-        limit_one? &&
-          order_values.blank? &&
-          includes_values.blank? &&
-          preload_values.blank? &&
-          readonly_value.blank? &&
-          joins_values.blank? &&
-          !@klass.locking_enabled? &&
-          where_clause_match_equality?
-      end
+        def order_values_can_cache?
+          return true if order_values.empty?
+          return false unless order_values.one?
+          return true if order_values.first == klass.primary_key
+          return false unless order_values.first.is_a?(::Arel::Nodes::Ordering)
+          return true if order_values.first.expr == klass.primary_key
+          order_values.first.expr.try(:name) == klass.primary_key
+        end
 
-      def where_clause_match_equality?
-        where_values_hash.all?
-      end
+        def where_clause_predicates_all_equality?
+          where_clause.send(:predicates).size == where_values_hash.size
+        end
 
-      def where_values_match_cache?(record)
-        where_values_hash.all? do |key, value|
-          if value.is_a?(Array)
-            value.include?(record.read_attribute(key))
-          else
-            record.read_attribute(key) == value
+        def where_values_match_cache?(record)
+          where_values_hash.all? do |key, value|
+            if value.is_a?(Array)
+              value.include?(record.read_attribute(key))
+            else
+              record.read_attribute(key) == value
+            end
           end
         end
-      end
 
-      def limit_one?
-        limit_value.blank? || limit_value == 1
-      end
-
-      def select_all_column?
-        select_values.blank?
-      end
+        def limit_one?
+          limit_value.blank? || limit_value == 1
+        end
     end
   end
 end

data/lib/second_level_cache/active_record/has_one_association.rb

@@ -6,31 +6,25 @@ module SecondLevelCache
       module HasOneAssociation
         def find_target
           return super unless klass.second_level_cache_enabled?
-          return super if reflection.options[:through] || reflection.scope
-          # TODO: implement cache with has_one through, scope
+          return super if klass.default_scopes.present? || reflection.scope
+          # TODO: implement cache with has_one scope
 
-          owner_primary_key = owner[reflection.active_record_primary_key]
-          if reflection.options[:as]
-            keys = {
-              reflection.foreign_key => owner_primary_key,
-              reflection.type => owner.class.base_class.name
-            }
-            cache_record = klass.fetch_by_uniq_keys(keys)
+          through = reflection.options[:through]
+          record  = if through
+            return super unless klass.reflections[through.to_s].klass.second_level_cache_enabled?
+            begin
+              reflection.klass.find(owner.send(through).read_attribute(reflection.foreign_key))
+            rescue StandardError
+              nil
+            end
           else
-            cache_record = klass.fetch_by_uniq_key(owner_primary_key, reflection.foreign_key)
+            uniq_keys = { reflection.foreign_key => owner[reflection.active_record_primary_key] }
+            uniq_keys[reflection.type] = owner.class.base_class.name if reflection.options[:as]
+            klass.fetch_by_uniq_keys(uniq_keys)
           end
 
-          if cache_record
-            return cache_record.tap { |record| set_inverse_instance(record) }
-          end
-
-          record = super
           return nil unless record
-
-          record.tap do |r|
-            set_inverse_instance(r)
-            r.write_second_level_cache
-          end
+          record.tap { |r| set_inverse_instance(r) }
         end
       end
     end

data/lib/second_level_cache/active_record/preloader.rb

@@ -3,42 +3,48 @@
 module SecondLevelCache
   module ActiveRecord
     module Associations
-      class Preloader
-        module BelongsTo
-          def records_for(ids, &block)
-            return super(ids, &block) unless reflection.is_a?(::ActiveRecord::Reflection::BelongsToReflection)
-            return super(ids, &block) unless klass.second_level_cache_enabled?
-
-            map_cache_keys = ids.map { |id| klass.second_level_cache_key(id) }
-            records_from_cache = ::SecondLevelCache.cache_store.read_multi(*map_cache_keys)
-            # NOTICE
-            # Rails.cache.read_multi return hash that has keys only hitted.
-            # eg. Rails.cache.read_multi(1,2,3) => {2 => hit_value, 3 => hit_value}
-            hitted_ids = records_from_cache.map { |key, _| key.split("/")[2] }
-            missed_ids = ids.map(&:to_s) - hitted_ids
-
-            ::SecondLevelCache.logger.info "missed ids -> #{missed_ids.join(',')} | hitted ids -> #{hitted_ids.join(',')}"
-
-            record_marshals = RecordMarshal.load_multi(records_from_cache.values)
-
-            if missed_ids.empty?
-              return SecondLevelCache::RecordRelation.new(record_marshals)
+      module Preloader
+        RAILS6 = ::ActiveRecord.version >= ::Gem::Version.new("6")
+
+        def records_for(ids, &block)
+          return super unless klass.second_level_cache_enabled?
+          return super unless reflection.is_a?(::ActiveRecord::Reflection::BelongsToReflection)
+          return super if klass.default_scopes.present? || reflection.scope
+          return super if association_key_name.to_s != klass.primary_key
+
+          map_cache_keys = ids.map { |id| klass.second_level_cache_key(id) }
+          records_from_cache = ::SecondLevelCache.cache_store.read_multi(*map_cache_keys)
+
+          record_marshals = if RAILS6
+            RecordMarshal.load_multi(records_from_cache.values) do |record|
+              # This block is copy from:
+              # https://github.com/rails/rails/blob/6-0-stable/activerecord/lib/active_record/associations/preloader/association.rb#L101
+              owner = owners_by_key[convert_key(record[association_key_name])].first
+              association = owner.association(reflection.name)
+              association.set_inverse_instance(record)
             end
+          else
+            RecordMarshal.load_multi(records_from_cache.values, &block)
+          end
 
-            records_from_db = super(missed_ids, &block)
-            records_from_db.map do |r|
-              write_cache(r)
-            end
+          # NOTICE
+          # Rails.cache.read_multi return hash that has keys only hitted.
+          # eg. Rails.cache.read_multi(1,2,3) => {2 => hit_value, 3 => hit_value}
+          hitted_ids = record_marshals.map { |record| record.read_attribute(association_key_name).to_s }
+          missed_ids = ids.map(&:to_s) - hitted_ids
+          ActiveSupport::Notifications.instrument("preload.second_level_cache", key: association_key_name, hit: hitted_ids, miss: missed_ids)
+          return SecondLevelCache::RecordRelation.new(record_marshals) if missed_ids.empty?
 
-            SecondLevelCache::RecordRelation.new(records_from_db + record_marshals)
-          end
+          records_from_db = super(missed_ids, &block)
+          records_from_db.map { |r| write_cache(r) }
 
-          private
+          SecondLevelCache::RecordRelation.new(records_from_db + record_marshals)
+        end
 
+        private
           def write_cache(record)
             record.write_second_level_cache
           end
-        end
       end
     end
   end

data/lib/second_level_cache/adapter/paranoia.rb

@@ -0,0 +1,24 @@
+module SecondLevelCache
+  module Adapter
+    module Paranoia
+      module ActiveRecord
+        extend ActiveSupport::Concern
+
+        included do
+          after_destroy :expire_second_level_cache
+        end
+      end
+
+      module Mixin
+        extend ActiveSupport::Concern
+
+        def write_second_level_cache
+          # Avoid rewrite cache again, when record has been soft deleted
+          return if respond_to?(:deleted?) && send(:deleted?)
+          super
+        end
+        alias update_second_level_cache write_second_level_cache
+      end
+    end
+  end
+end