second_level_cache 2.1.9 → 2.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f6a4e2dad0ed044548798d38f155a9c9f153408e
-  data.tar.gz: 4ffb77cc2f17e40d53f3943686f87427c60cd626
+SHA256:
+  metadata.gz: f6149c9f3aaaa26ad9fc6a0fa5633a5602a08c68451eb04c010973e1305649f0
+  data.tar.gz: 1945c39303777ea938b7187a3cad868db17348153fe91bf3844e6d4868201171
 SHA512:
-  metadata.gz: 2b60fb3e4e71c77541c568c9b6b29c1840bfe4838b7ef50c7c754b78464ddd41ba2133a80964590d2f259019add8bca1bf5d221d14f6473f3fe69893d27ed92f
-  data.tar.gz: de72573534de9d3acd65d5716adfce3e8a26885bd9c94e9808bca70bc371efadbe3c9f46d38c2e0aea6e16d5afbcdb6e9fd9852d47b714e983cdbc491fec4361
+  metadata.gz: '09e8ac1d40c06ce9642af57ff1d98a3759490196380caf5093fd203484a2b5f8eda94157d59424227824755778ae4cbeeff75399591576b79411abeee48ba99e'
+  data.tar.gz: 549350c57237148d9b8bb305c8ad6aa7985459111c133bffa4025de02ff61b6380f762b74d619802ad00d09863af0ef596cfdeb2c67b6466c7c50712d8354774

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+2.1.15
+* Replace Fixnum class check for Integer class
+
+2.1.14
+* support has_one with scope
+
+2.1.10
+* read multi from cache for find(ids)
+
+-----
 2.0.0.rc1
 -----
 * ActiveRecord 4 ready!

data/README.md

@@ -141,6 +141,13 @@ post = Post.fetch_by_uniq_keys(user_id: 2, slug: "foo")
 user = User.fetch_by_uniq_keys!(nick_name: "hooopo") # this will raise `ActiveRecord::RecordNotFound` Exception when nick name not exists.
 ```
 
+* multi_read_from_cache
+
+```ruby
+# this will use Rails.cache.multi_read method to fetch record, if miss, then use SQL in query.
+blogs = Blog.multi_read_from_cache([1,2,3])
+```
+
 * You can use Rails's [Eager Loading](http://guides.rubyonrails.org/active_record_querying.html#eager-loading-associations) feature as normal. Even better, second_level_cache will transform the `IN` query into a Rails.cache.multi_read operation. For example:
 
 ```ruby

data/lib/second_level_cache/active_record.rb

@@ -7,6 +7,7 @@ require 'second_level_cache/active_record/persistence'
 require 'second_level_cache/active_record/belongs_to_association'
 require 'second_level_cache/active_record/has_one_association'
 require 'second_level_cache/active_record/preloader'
+require 'second_level_cache/active_record/multi_read_from_cache'
 
 if defined? Rails
   require 'second_level_cache/active_record/railtie'
@@ -14,6 +15,7 @@ else
   ActiveRecord::Base.send(:include, SecondLevelCache::Mixin)
   ActiveRecord::Base.send(:include, SecondLevelCache::ActiveRecord::Base)
   ActiveRecord::Base.send(:extend, SecondLevelCache::ActiveRecord::FetchByUniqKey)
+  ActiveRecord::Base.send(:extend, SecondLevelCache::ActiveRecord::MultiReadFromCache)
 
   ActiveRecord::Base.send(:include, SecondLevelCache::ActiveRecord::Persistence)
   ActiveRecord::Associations::BelongsToAssociation.send(:include, SecondLevelCache::ActiveRecord::Associations::BelongsToAssociation)

data/lib/second_level_cache/active_record/core.rb

@@ -13,7 +13,7 @@ module SecondLevelCache
 
       module ClassMethods
         def find_with_cache(*ids)
-          return all.find(ids.first) if ids.size == 1 && ids.first.is_a?(Fixnum)
+          return all.find(ids.first) if ids.size == 1 && ids.first.is_a?(Integer)
           find_without_cache(*ids)
         end
       end

data/lib/second_level_cache/active_record/finder_methods.rb

@@ -6,10 +6,9 @@ module SecondLevelCache
 
       included do
         alias_method_chain :find_one, :second_level_cache
+        alias_method_chain :find_some, :second_level_cache
       end
 
-      # TODO find_some
-      # https://github.com/rails/rails/blob/master/activerecord/lib/active_record/relation/finder_methods.rb#L289-L309
       #
       # Cacheable:
       #
@@ -39,6 +38,35 @@ module SecondLevelCache
         record
       end
 
+      def find_some_with_second_level_cache(ids)
+        return find_some_without_second_level_cache(ids) unless second_level_cache_enabled?
+        return find_some_without_second_level_cache(ids) unless select_all_column?
+
+        if cachable?
+          result = multi_read_from_cache(ids)
+        else
+          result = where(:id => ids).all
+        end
+
+        expected_size =
+          if limit_value && ids.size > limit_value
+            limit_value
+          else
+            ids.size
+          end
+
+        # 11 ids with limit 3, offset 9 should give 2 results.
+        if offset_value && (ids.size - offset_value < expected_size)
+          expected_size = ids.size - offset_value
+        end
+
+        if result.size == expected_size
+          result
+        else
+          raise_record_not_found_exception!(ids, result.size, expected_size)
+        end
+      end
+
     private
 
       def cachable?

data/lib/second_level_cache/active_record/has_one_association.rb

@@ -12,10 +12,13 @@ module SecondLevelCache
 
         def find_target_with_second_level_cache
           return find_target_without_second_level_cache unless klass.second_level_cache_enabled?
-          return find_target_without_second_level_cache if reflection.options[:through] || reflection.scope
-          # TODO: implement cache with has_one through, scope
+
+          return find_target_without_second_level_cache if reflection.options[:through]
+          # TODO: implement cache with has_one through
           if reflection.options[:as]
             cache_record = klass.fetch_by_uniq_keys({reflection.foreign_key => owner[reflection.active_record_primary_key], reflection.type => owner.class.base_class.name})
+          elsif reflection.scope
+            cache_record = klass.fetch_by_uniq_keys(create_scope)
           else
             cache_record = klass.fetch_by_uniq_key(owner[reflection.active_record_primary_key], reflection.foreign_key)
           end

data/lib/second_level_cache/active_record/multi_read_from_cache.rb

@@ -0,0 +1,21 @@
+module SecondLevelCache
+  module ActiveRecord
+    module MultiReadFromCache
+      def multi_read_from_cache(ids)
+        map_cache_keys = ids.map{|id| second_level_cache_key(id)}
+        records_from_cache = ::SecondLevelCache.cache_store.read_multi(*map_cache_keys)
+        hitted_ids = records_from_cache.map{|key, _| key.split("/")[2].to_i}
+        missed_ids = ids.map{|x| x.to_i} - hitted_ids
+
+        ::SecondLevelCache::Config.logger.info "missed ids -> #{missed_ids.inspect} | hitted ids -> #{hitted_ids.inspect}"
+
+        if missed_ids.empty?
+          RecordMarshal.load_multi(records_from_cache.values)
+        else
+          records_from_db = where(:id => missed_ids)
+          records_from_db.map{|record| record.write_second_level_cache ; record} + RecordMarshal.load_multi(records_from_cache.values)
+        end
+      end
+    end
+  end
+end

data/lib/second_level_cache/active_record/railtie.rb

@@ -3,6 +3,7 @@ class SecondLevelCache::ActiveRecord::Railtie < Rails::Railtie
     ActiveRecord::Base.send(:include, SecondLevelCache::Mixin)
     ActiveRecord::Base.send(:include, SecondLevelCache::ActiveRecord::Base)
     ActiveRecord::Base.send(:extend, SecondLevelCache::ActiveRecord::FetchByUniqKey)
+    ActiveRecord::Base.send(:extend, SecondLevelCache::ActiveRecord::MultiReadFromCache)
 
     ActiveRecord::Base.send(:include, SecondLevelCache::ActiveRecord::Persistence)
     ActiveRecord::Associations::BelongsToAssociation.send(:include, SecondLevelCache::ActiveRecord::Associations::BelongsToAssociation)

data/lib/second_level_cache/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
-module SecondLevelCache 
-  VERSION = "2.1.9"
+module SecondLevelCache
+  VERSION = "2.1.16"
 end

data/second_level_cache.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "activesupport", ["> 4.0.0", "< 5.0"]
 
   gem.add_runtime_dependency "activerecord", ["> 4.0.0", "< 5.0"]
-  gem.add_development_dependency "sqlite3"
+  gem.add_development_dependency "sqlite3", "~> 1.3.6"
   gem.add_development_dependency "rake"
   gem.add_development_dependency 'pry'
   gem.add_development_dependency "database_cleaner", "~> 1.3.0"

data/test/finder_methods_test.rb

@@ -4,6 +4,7 @@ require 'test_helper'
 class FinderMethodsTest < ActiveSupport::TestCase
   def setup
     @user = User.create :name => 'csdn', :email => 'test@csdn.com'
+    @other_user = User.create :name => 'shopper+', :email => 'test@shopperplus.com'
   end
 
   def test_should_find_without_cache
@@ -41,4 +42,41 @@ class FinderMethodsTest < ActiveSupport::TestCase
     end
     refute_equal @user.name, @from_db.name
   end
+
+  def test_find_some_record
+    @users = User.find(@user.id, @other_user.id)
+    assert_equal 2, @users.size
+  end
+
+  def test_find_some_record_without_second_level_cache
+    User.without_second_level_cache do
+      @users = User.find(@user.id, @other_user.id)
+    end
+    assert_equal 2, @users.size
+  end
+
+  def test_missing_id_will_raise_for_find_some
+    assert_raises(ActiveRecord::RecordNotFound) do
+      @users = User.find(@user.id, User.last.id + 10000)
+    end
+  end
+
+  def test_filter_works_fine_for_find_some
+    assert_raises(ActiveRecord::RecordNotFound) do
+      @users = User.where("name is null").find(@user.id, @other_user.id)
+    end
+  end
+
+  def test_half_in_cache_for_find_some
+    @user.expire_second_level_cache
+    @users = User.find(@user.id, @other_user.id)
+    assert_equal 2, @users.size
+  end
+
+  def test_no_record_in_cache_for_find_some
+    @user.expire_second_level_cache
+    @other_user.expire_second_level_cache
+    @users = User.find(@user.id, @other_user.id)
+    assert_equal 2, @users.size
+  end
 end

data/test/has_one_association_test.rb

@@ -31,7 +31,11 @@ class HasOneAssociationTest < ActiveSupport::TestCase
     user.create_namespace(name: 'hooopo')
     group_namespace2 = Namespace.create(user_id: user.id, name: 'rails', kind: 'group')
     assert_not_equal user.namespace, nil
-    clear_user = User.find(user.id)
+    assert_equal user.reload.namespace.name, 'hooopo'
+    clear_user = user.reload
+    assert_no_queries do
+      clear_user.namespace
+    end
     assert_equal clear_user.namespace.name, 'hooopo'
   end
 end

data/test/model/multi_read_from_cache_test.rb

@@ -0,0 +1,19 @@
+# -*- encoding : utf-8 -*-
+require 'test_helper'
+
+class MultiReadFromCacheTest < ActiveSupport::TestCase
+  def setup
+    @user = User.create :name => 'hooopo', :email => 'hoooopo@gmail.com'
+    @other_user = User.create :name => 'hoooopo', :email => "hooooopo@gmail.com"
+  end
+
+  def test_multi_read_from_cache
+    result = User.multi_read_from_cache([@user.id, @other_user.id])
+    assert_equal 2, result.size
+  end
+
+  def test_multi_read_not_exist_id_from_cache
+    result = User.multi_read_from_cache([@user.id, @other_user.id + 100])
+    assert_equal 1, result.size
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: second_level_cache
 version: !ruby/object:Gem::Version
-  version: 2.1.9
+  version: 2.1.16
 platform: ruby
 authors:
 - Hooopo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2020-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -54,16 +54,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -126,6 +126,7 @@ files:
 - lib/second_level_cache/active_record/fetch_by_uniq_key.rb
 - lib/second_level_cache/active_record/finder_methods.rb
 - lib/second_level_cache/active_record/has_one_association.rb
+- lib/second_level_cache/active_record/multi_read_from_cache.rb
 - lib/second_level_cache/active_record/persistence.rb
 - lib/second_level_cache/active_record/preloader.rb
 - lib/second_level_cache/active_record/railtie.rb
@@ -143,6 +144,7 @@ files:
 - test/model/animal.rb
 - test/model/book.rb
 - test/model/image.rb
+- test/model/multi_read_from_cache_test.rb
 - test/model/post.rb
 - test/model/topic.rb
 - test/model/user.rb
@@ -172,8 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: 'SecondLevelCache is a write-through and read-through caching library inspired
@@ -183,24 +184,25 @@ summary: 'SecondLevelCache is a write-through and read-through caching library i
   is a cache miss, it will populate the cache.  Write-Through: As objects are created,
   updated, and deleted, all of the caches are automatically kept up-to-date and coherent.'
 test_files:
-- test/active_record_test_case_helper.rb
-- test/base_test.rb
-- test/belongs_to_association_test.rb
-- test/fetch_by_uniq_key_test.rb
+- test/polymorphic_association_test.rb
+- test/require_test.rb
+- test/preloader_test.rb
 - test/finder_methods_test.rb
-- test/has_one_association_test.rb
+- test/belongs_to_association_test.rb
+- test/second_level_cache_test.rb
+- test/record_marshal_test.rb
+- test/persistence_test.rb
+- test/single_table_inheritance_test.rb
+- test/model/image.rb
 - test/model/account.rb
-- test/model/animal.rb
 - test/model/book.rb
-- test/model/image.rb
-- test/model/post.rb
 - test/model/topic.rb
+- test/model/animal.rb
+- test/model/multi_read_from_cache_test.rb
+- test/model/post.rb
 - test/model/user.rb
-- test/persistence_test.rb
-- test/polymorphic_association_test.rb
-- test/preloader_test.rb
-- test/record_marshal_test.rb
-- test/require_test.rb
-- test/second_level_cache_test.rb
-- test/single_table_inheritance_test.rb
+- test/fetch_by_uniq_key_test.rb
 - test/test_helper.rb
+- test/has_one_association_test.rb
+- test/base_test.rb
+- test/active_record_test_case_helper.rb