second_level_cache 2.1.9 → 2.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6a4e2dad0ed044548798d38f155a9c9f153408e
-  data.tar.gz: 4ffb77cc2f17e40d53f3943686f87427c60cd626
+  metadata.gz: 162eeb4c9ac6637270a5057e684b336573101aab
+  data.tar.gz: 87a40f18f2b5ff2e946fef7d9a63a7e060da7636
 SHA512:
-  metadata.gz: 2b60fb3e4e71c77541c568c9b6b29c1840bfe4838b7ef50c7c754b78464ddd41ba2133a80964590d2f259019add8bca1bf5d221d14f6473f3fe69893d27ed92f
-  data.tar.gz: de72573534de9d3acd65d5716adfce3e8a26885bd9c94e9808bca70bc371efadbe3c9f46d38c2e0aea6e16d5afbcdb6e9fd9852d47b714e983cdbc491fec4361
+  metadata.gz: 8086b2e29a478df84b0cc71313b9ae3a37afa4b0d76cb45ba8f82507867d3b24942d8ef82aeee480674010992029ac974b7114172171c2bfb994ad0d64aa9950
+  data.tar.gz: e42a65a6bd42be458c6b389a7b69b8389c667b9f174416a8da590fb7752ab376a457f218bfe60177ef18b2979249f4fe98d4acb62342ecd842b1c5eb5c1daaf9

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+2.1.10
+* read multi from cache for find(ids)
+
+-----
 2.0.0.rc1
 -----
 * ActiveRecord 4 ready!

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,52 @@ module SecondLevelCache
         record
       end
 
+      def find_some_with_second_level_cache(ids)
+        return find_some_without_second_level_cache(id) unless second_level_cache_enabled?
+        return find_some_without_second_level_cache(id) 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
+
+
+      def multi_read_from_cache(ids)
+        map_cache_keys = ids.map{|id| klass.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
+
     private
 
       def cachable?

data/lib/second_level_cache/version.rb

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

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,34 @@ 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_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

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.10
 platform: ruby
 authors:
 - Hooopo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2016-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: 'SecondLevelCache is a write-through and read-through caching library inspired