picky 4.12.11 → 4.12.12

data/lib/picky/backends/redis.rb

@@ -233,28 +233,18 @@ module Picky
           #
           begin
             if identifiers.size > 1
-              if @ids_script_hash
-                # Reuse script already installed in Redis.
-                #
-                client.evalsha @ids_script_hash,
-                               identifiers,
-                               [
-                                 generate_intermediate_result_id,
-                                 offset,
-                                 (offset + amount)
-                               ]
-              else
-                # Install script in Redis.
-                #
-                @ids_script_hash = Digest::SHA1.hexdigest @ids_script
-                client.eval @ids_script,
-                            identifiers,
-                            [
-                              generate_intermediate_result_id,
-                              offset,
-                              (offset + amount)
-                            ]
-              end
+              # Reuse script already installed in Redis.
+              #
+              # Note: This may raise an error in Redis,
+              # when the script is not installed.
+              #
+              client.evalsha @ids_script_hash,
+                             identifiers,
+                             [
+                               generate_intermediate_result_id,
+                               offset,
+                               (offset + amount)
+                             ]
             else
               # No complex calculation necessary.
               #
@@ -262,6 +252,19 @@ module Picky
                             offset,
                             (offset + amount)
             end
+          rescue RuntimeError => e # Redis::CommandError
+            # Install script in Redis.
+            #
+            # TODO Use SCRIPT LOAD, then retry?
+            #
+            @ids_script_hash = Digest::SHA1.hexdigest @ids_script
+            client.eval @ids_script,
+                        identifiers,
+                        [
+                          generate_intermediate_result_id,
+                          offset,
+                          (offset + amount)
+                        ]
           end
         end
       end

data/spec/functional/realtime_spec.rb

@@ -507,6 +507,16 @@ describe "Realtime Indexing" do
         
         books.search('author:author title:Titl').ids.should == ['one']
       end
+      
+      it 'finds the first entry the second time, even if the Redis script cache is flushed' do
+        books.search('author:author title:Titl')
+        
+        books.search('author:author title:Titl').ids.should == ['one']
+        
+        index.backend.client.script 'flush'
+        
+        books.search('author:author title:Titl').ids.should == ['one']
+      end
 
       it 'allows removing a single category and leaving the others alone' do
         index[:title].remove 'one'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 4.12.11
+  version: 4.12.12
   prerelease: 
 platform: ruby
 authors:
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.12.11
+        version: 4.12.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.12.11
+        version: 4.12.12
 - !ruby/object:Gem::Dependency
   name: text
   requirement: !ruby/object:Gem::Requirement