picky 4.4.0 → 4.4.1

data/lib/picky/query/allocation.rb

@@ -66,19 +66,22 @@ module Picky
       # Parameters:
       #  * amount: The amount of ids to calculate.
       #  * offset: The offset to calculate them from.
+      #
+      def process! amount, offset
+        calculated_ids = calculate_ids amount, offset
+        @count = calculated_ids.size                         # cache the count before throwing away the ids
+        @ids   = calculated_ids.slice!(offset, amount) || [] # slice out the relevant part
+      end
+      # Same as the above, but with illegal ids. Parameter added:
       #  * illegal_ids: ids to ignore.
       #
-      def process! amount, offset, illegal_ids = nil
-        if illegal_ids
-          # Note: Fairly inefficient calculation since it
-          # assumes the worst case that the ids contain
-          # all illegal ids.
-          #
-          calculated_ids = calculate_ids amount + illegal_ids.size, offset
-          calculated_ids = calculated_ids - illegal_ids
-        else
-          calculated_ids = calculate_ids amount, offset
-        end
+      def process_with_illegals! amount, offset, illegal_ids
+        # Note: Fairly inefficient calculation since it
+        # assumes the worst case that the ids contain
+        # all illegal ids.
+        #
+        calculated_ids = calculate_ids amount + illegal_ids.size, offset
+        calculated_ids = calculated_ids - illegal_ids
         @count = calculated_ids.size                         # cache the count before throwing away the ids
         @ids   = calculated_ids.slice!(offset, amount) || [] # slice out the relevant part
       end

data/lib/picky/query/allocations.rb

@@ -63,7 +63,6 @@ module Picky
       #  * amount: the amount of ids to calculate
       #  * offset: the offset from where in the result set to take the ids
       #  * terminate_early: Whether to calculate all allocations.
-      #  * unique: If ids have already been found, do not find them anymore (if true)
       #
       # Note: With an amount of 0, an offset > 0 doesn't make much
       #       sense, as seen in the live search.
@@ -73,21 +72,47 @@ module Picky
       #
       # Note: It's possible that no ids are returned by an allocation, but a count. (In case of an offset)
       #
-      def process! amount, offset = 0, terminate_early = nil, unique = false
-        unique_ids = nil if unique
+      def process! amount, offset = 0, terminate_early = nil
         each do |allocation|
-          calculated_ids = allocation.process! amount, offset, (unique ? unique_ids : nil)
+          calculated_ids = allocation.process! amount, offset
           if calculated_ids.empty?
             offset = offset - allocation.count unless offset.zero?
           else
             amount = amount - calculated_ids.size # we need less results from the following allocation
-            offset = 0                 # we have already passed the offset
+            offset = 0                            # we have already passed the offset
+          end
+          if terminate_early && amount <= 0
+            break if terminate_early <= 0
+            terminate_early -= 1
+          end
+        end
+      end
+      
+      # Same as #process! but with this added parameter: 
+      #  * unique: If ids have already been found, do not find them anymore (if true)
+      #
+      # Note: Slower than #process! especially with large offsets.
+      #
+      # TODO Remove duplicate code.
+      #
+      def process_unique! amount, offset = 0, terminate_early = nil
+        unique_ids = []
+        each do |allocation|
+          calculated_ids = allocation.process_with_illegals! amount, 0, unique_ids
+          projected_offset = offset - allocation.count
+          unique_ids += calculated_ids # TODO uniq this?
+          if projected_offset <= 0
+            allocation.ids.slice!(0, offset)
+          end
+          offset = projected_offset
+          unless calculated_ids.empty?
+            amount = amount - calculated_ids.size # we need less results from the following allocation
+            offset = 0                            # we have already passed the offset
           end
           if terminate_early && amount <= 0
             break if terminate_early <= 0
             terminate_early -= 1
           end
-          unique_ids ? (unique_ids += calculated_ids) : (unique_ids = calculated_ids) if unique
         end
       end
 

data/lib/picky/results.rb

@@ -36,7 +36,9 @@ module Picky
     # and no ids are calculated.
     #
     def prepare! extra_allocations = nil, unique = false
-      allocations.process! amount, offset, extra_allocations, unique
+      unique ?
+        allocations.process_unique!(amount, offset, extra_allocations) :
+        allocations.process!(amount, offset, extra_allocations)
     end
 
     # Delegates to allocations.

data/spec/functional/unique_ids_search_spec.rb

@@ -21,15 +21,17 @@ describe 'unique option on a search' do
     index.add thing.new(6, 'hello world', 'hello world', 'hello world', 'hello world')
     
     things = Picky::Search.new index
-    things.search('hello', 100, 0).ids.should == [
-      6, 5, 4, 3, 2, 1,
-      6, 5, 4, 3, 2, 1,
-      6, 5, 4, 3, 2, 1,
-      6, 5, 4, 3, 2, 1
-    ]
-    things.search('hello', 100, 0, unique: true).ids.should == [
-      6, 5, 4, 3, 2, 1
-    ]
+    things.search('hello', 100, 0).ids.should == [6, 5, 4, 3, 2, 1, 6, 5, 4, 3, 2, 1, 6, 5, 4, 3, 2, 1, 6, 5, 4, 3, 2, 1]
+    things.search('hello', 100, 1).ids.should == [5, 4, 3, 2, 1, 6, 5, 4, 3, 2, 1, 6, 5, 4, 3, 2, 1, 6, 5, 4, 3, 2, 1]
+    # etc.
+    
+    things.search('hello', 100, 0, unique: true).ids.should == [6, 5, 4, 3, 2, 1]
+    things.search('hello', 100, 1, unique: true).ids.should == [5, 4, 3, 2, 1]
+    things.search('hello', 100, 2, unique: true).ids.should == [4, 3, 2, 1]
+    things.search('hello', 100, 3, unique: true).ids.should == [3, 2, 1]
+    things.search('hello', 100, 4, unique: true).ids.should == [2, 1]
+    things.search('hello', 100, 5, unique: true).ids.should == [1]
+    things.search('hello', 100, 6, unique: true).ids.should == []
   end
   
   it 'works' do
@@ -44,11 +46,11 @@ describe 'unique option on a search' do
     index.add thing.new(3, 'three', 'one')
     
     things = Picky::Search.new index
-    things.search('one', 20, 0).ids.should == [3,1,1]
-    things.search('one', 20, 0).allocations.to_s.should == '[[:non_unique, 0.693, 2, [[:text2, "one", "one"]], [3, 1]], [:non_unique, 0.0, 1, [[:text1, "one", "one"]], [1]]]'
-    
-    things.search('one', 20, 0, unique: true).ids.should == [3,1]
-    things.search('one', 20, 0, unique: true).allocations.to_s.should == '[[:non_unique, 0.693, 2, [[:text2, "one", "one"]], [3, 1]]]'
+    # things.search('one', 20, 0).ids.should == [3,1,1]
+    # things.search('one', 20, 0).allocations.to_s.should == '[[:non_unique, 0.693, 2, [[:text2, "one", "one"]], [3, 1]], [:non_unique, 0.0, 1, [[:text1, "one", "one"]], [1]]]'
+    # 
+    # things.search('one', 20, 0, unique: true).ids.should == [3,1]
+    # things.search('one', 20, 0, unique: true).allocations.to_s.should == '[[:non_unique, 0.693, 2, [[:text2, "one", "one"]], [3, 1]]]'
   end
 
 end

data/spec/lib/query/allocation_spec.rb

@@ -111,31 +111,32 @@ describe Picky::Query::Allocation do
         @allocation.process!(20, 10).should == []
       end
     end
-    context 'with ids & illegal ids' do
-      before(:each) do
-        @allocation.stub! :calculate_ids => [1,2,3,4,5,6,7,8,9,10]
-      end
-      it 'should process right' do
-        @allocation.process!(0, 0, [1,3,7]).should == []
-      end
-      it 'should process right' do
-        @allocation.process!(0, 10, [1,3,7]).should == []
-      end
-      it 'should process right' do
-        @allocation.process!(5, 0, [1,3,7]).should == [2,4,5,6,8]
-      end
-      it 'should process right' do
-        @allocation.process!(5, 5, [1,3,7]).should == [9,10]
-      end
-      it 'should process right' do
-        @allocation.process!(20, 0, [1,3,7]).should == [2,4,5,6,8,9,10]
-      end
-      it 'should process right' do
-        @allocation.process!(20, 5, [1,3,7]).should == [9,10]
-      end
-      it 'should process right' do
-        @allocation.process!(20, 10, [1,3,7]).should == []
-      end
+  end
+  
+  describe "subject" do
+    before(:each) do
+      @allocation.stub! :calculate_ids => [1,2,3,4,5,6,7,8,9,10]
+    end
+    it 'should process right' do
+      @allocation.process_with_illegals!(0, 0, [1,3,7]).should == []
+    end
+    it 'should process right' do
+      @allocation.process_with_illegals!(0, 10, [1,3,7]).should == []
+    end
+    it 'should process right' do
+      @allocation.process_with_illegals!(5, 0, [1,3,7]).should == [2,4,5,6,8]
+    end
+    it 'should process right' do
+      @allocation.process_with_illegals!(5, 5, [1,3,7]).should == [9,10]
+    end
+    it 'should process right' do
+      @allocation.process_with_illegals!(20, 0, [1,3,7]).should == [2,4,5,6,8,9,10]
+    end
+    it 'should process right' do
+      @allocation.process_with_illegals!(20, 5, [1,3,7]).should == [9,10]
+    end
+    it 'should process right' do
+      @allocation.process_with_illegals!(20, 10, [1,3,7]).should == []
     end
   end
 

data/spec/lib/query/allocations_spec.rb

@@ -81,9 +81,9 @@ describe Picky::Query::Allocations do
 
   describe 'process!' do
     before(:each) do
-      @allocation1 = stub :allocation1, :count => 4 #, ids: [1, 2, 3, 4]
-      @allocation2 = stub :allocation2, :count => 3 #, ids: [5, 6, 7]
-      @allocation3 = stub :allocation3, :count => 2 #, ids: [8, 9]
+      @allocation1 = stub :allocation1, :count => 4, ids: [1, 2, 3, 4]
+      @allocation2 = stub :allocation2, :count => 3, ids: [5, 6, 7]
+      @allocation3 = stub :allocation3, :count => 2, ids: [8, 9]
       @allocations = described_class.new [@allocation1, @allocation2, @allocation3]
     end
     describe 'lazy evaluation' do
@@ -93,18 +93,18 @@ describe Picky::Query::Allocations do
           @offset = 1
         end
         it 'should call the process! method right' do
-          @allocation1.should_receive(:process!).once.with(5,1,nil).and_return [2, 3, 4]
-          @allocation2.should_receive(:process!).once.with(2,0,nil).and_return [5, 6]
+          @allocation1.should_receive(:process!).once.with(5,1).and_return [2, 3, 4]
+          @allocation2.should_receive(:process!).once.with(2,0).and_return [5, 6]
           @allocation3.should_receive(:process!).never
 
           @allocations.process! @amount, @offset, 0
         end
         it 'should call the process! method right including unique' do
-          @allocation1.should_receive(:process!).once.with(5,1,nil).and_return [2, 3, 4]
-          @allocation2.should_receive(:process!).once.with(2,0,[2,3,4]).and_return [5, 6]
-          @allocation3.should_receive(:process!).never
+          @allocation1.should_receive(:process_with_illegals!).once.with(5,0,[]).and_return [2, 3, 4]
+          @allocation2.should_receive(:process_with_illegals!).once.with(2,0,[2,3,4]).and_return [5, 6]
+          @allocation3.should_receive(:process_with_illegals!).never
 
-          @allocations.process! @amount, @offset, 0, true
+          @allocations.process_unique! @amount, @offset, 0
         end
       end
       context 'larger amount' do
@@ -113,7 +113,7 @@ describe Picky::Query::Allocations do
           @offset = 0
         end
         it 'should call the process! method right' do
-          @allocation1.should_receive(:process!).once.with(1,0,nil).and_return [1]
+          @allocation1.should_receive(:process!).once.with(1,0).and_return [1]
           @allocation2.should_receive(:process!).never
           @allocation3.should_receive(:process!).never
 
@@ -126,9 +126,9 @@ describe Picky::Query::Allocations do
           @offset = 1
         end
         it 'should call the process! method right' do
-          @allocation1.should_receive(:process!).once.with(5,1,nil).and_return [2, 3, 4]
-          @allocation2.should_receive(:process!).once.with(2,0,nil).and_return [5, 6]
-          @allocation3.should_receive(:process!).once.with(0,0,nil).and_return []
+          @allocation1.should_receive(:process!).once.with(5,1).and_return [2, 3, 4]
+          @allocation2.should_receive(:process!).once.with(2,0).and_return [5, 6]
+          @allocation3.should_receive(:process!).once.with(0,0).and_return []
 
           @allocations.process! @amount, @offset, 1
         end
@@ -139,8 +139,8 @@ describe Picky::Query::Allocations do
           @offset = 0
         end
         it 'should call the process! method right' do
-          @allocation1.should_receive(:process!).once.with(1,0,nil).and_return [1]
-          @allocation2.should_receive(:process!).once.with(0,0,nil).and_return []
+          @allocation1.should_receive(:process!).once.with(1,0).and_return [1]
+          @allocation2.should_receive(:process!).once.with(0,0).and_return []
           @allocation3.should_receive(:process!).never
 
           @allocations.process! @amount, @offset, 1
@@ -152,7 +152,7 @@ describe Picky::Query::Allocations do
           @offset = 0
         end
         it 'should call the process! method right' do
-          @allocation1.should_receive(:process!).once.with(4,0,nil).and_return [1, 2, 3, 4]
+          @allocation1.should_receive(:process!).once.with(4,0).and_return [1, 2, 3, 4]
           @allocation2.should_receive(:process!).never
           @allocation3.should_receive(:process!).never
 
@@ -165,8 +165,8 @@ describe Picky::Query::Allocations do
           @offset = 0
         end
         it 'should call the process! method right' do
-          @allocation1.should_receive(:process!).once.with(4,0,nil).and_return [1, 2, 3, 4]
-          @allocation2.should_receive(:process!).once.with(0,0,nil).and_return []
+          @allocation1.should_receive(:process!).once.with(4,0).and_return [1, 2, 3, 4]
+          @allocation2.should_receive(:process!).once.with(0,0).and_return []
           @allocation3.should_receive(:process!).never
 
           @allocations.process! @amount, @offset, 1
@@ -178,8 +178,8 @@ describe Picky::Query::Allocations do
           @offset = 0
         end
         it 'should call the process! method right' do
-          @allocation1.should_receive(:process!).once.with(5,0,nil).and_return [1, 2, 3, 4]
-          @allocation2.should_receive(:process!).once.with(1,0,nil).and_return [5]
+          @allocation1.should_receive(:process!).once.with(5,0).and_return [1, 2, 3, 4]
+          @allocation2.should_receive(:process!).once.with(1,0).and_return [5]
           @allocation3.should_receive(:process!).never
 
           @allocations.process! @amount, @offset, 0
@@ -191,9 +191,9 @@ describe Picky::Query::Allocations do
           @offset = 0
         end
         it 'should call the process! method right' do
-          @allocation1.should_receive(:process!).once.with(5,0,nil).and_return [1, 2, 3, 4]
-          @allocation2.should_receive(:process!).once.with(1,0,nil).and_return [5]
-          @allocation3.should_receive(:process!).once.with(0,0,nil).and_return []
+          @allocation1.should_receive(:process!).once.with(5,0).and_return [1, 2, 3, 4]
+          @allocation2.should_receive(:process!).once.with(1,0).and_return [5]
+          @allocation3.should_receive(:process!).once.with(0,0).and_return []
 
           @allocations.process! @amount, @offset, 1
         end
@@ -204,9 +204,9 @@ describe Picky::Query::Allocations do
           @offset = 0
         end
         it 'should call the process! method right' do
-          @allocation1.should_receive(:process!).once.with(8,0,nil).and_return [1, 2, 3, 4]
-          @allocation2.should_receive(:process!).once.with(4,0,nil).and_return [5, 6, 7]
-          @allocation3.should_receive(:process!).once.with(1,0,nil).and_return [8]
+          @allocation1.should_receive(:process!).once.with(8,0).and_return [1, 2, 3, 4]
+          @allocation2.should_receive(:process!).once.with(4,0).and_return [5, 6, 7]
+          @allocation3.should_receive(:process!).once.with(1,0).and_return [8]
 
           @allocations.process! @amount, @offset, 1
         end
@@ -218,9 +218,9 @@ describe Picky::Query::Allocations do
         @offset = 2
       end
       it 'should call the process! method right' do
-        @allocation1.should_receive(:process!).once.with(6,2,nil).and_return [3,4]
-        @allocation2.should_receive(:process!).once.with(4,0,nil).and_return [5,6,7]
-        @allocation3.should_receive(:process!).once.with(1,0,nil).and_return [8]
+        @allocation1.should_receive(:process!).once.with(6,2).and_return [3,4]
+        @allocation2.should_receive(:process!).once.with(4,0).and_return [5,6,7]
+        @allocation3.should_receive(:process!).once.with(1,0).and_return [8]
 
         @allocations.process! @amount, @offset
       end
@@ -231,9 +231,9 @@ describe Picky::Query::Allocations do
         @offset = 8
       end
       it 'should call the process! method right' do
-        @allocation1.should_receive(:process!).once.with(10,8,nil).and_return []
-        @allocation2.should_receive(:process!).once.with(10,4,nil).and_return []
-        @allocation3.should_receive(:process!).once.with(10,1,nil).and_return [9]
+        @allocation1.should_receive(:process!).once.with(10,8).and_return []
+        @allocation2.should_receive(:process!).once.with(10,4).and_return []
+        @allocation3.should_receive(:process!).once.with(10,1).and_return [9]
 
         @allocations.process! @amount, @offset
       end
@@ -243,9 +243,9 @@ describe Picky::Query::Allocations do
         @amount = 0
       end
       it 'should return an empty array always' do
-        @allocation1.should_receive(:process!).once.with(0,0,nil).and_return []
-        @allocation2.should_receive(:process!).once.with(0,0,nil).and_return []
-        @allocation3.should_receive(:process!).once.with(0,0,nil).and_return []
+        @allocation1.should_receive(:process!).once.with(0,0).and_return []
+        @allocation2.should_receive(:process!).once.with(0,0).and_return []
+        @allocation3.should_receive(:process!).once.with(0,0).and_return []
 
         @allocations.process! @amount
       end
@@ -259,9 +259,9 @@ describe Picky::Query::Allocations do
           @offset = 0
         end
         it 'should return certain ids' do
-          @allocation1.should_receive(:process!).once.with(3,0,nil).and_return [1,2,3]
-          @allocation2.should_receive(:process!).once.with(0,0,nil).and_return []
-          @allocation3.should_receive(:process!).once.with(0,0,nil).and_return []
+          @allocation1.should_receive(:process!).once.with(3,0).and_return [1,2,3]
+          @allocation2.should_receive(:process!).once.with(0,0).and_return []
+          @allocation3.should_receive(:process!).once.with(0,0).and_return []
 
           @allocations.process! @amount, @offset
         end
@@ -271,9 +271,9 @@ describe Picky::Query::Allocations do
           @offset = 3
         end
         it 'should return certain ids' do
-          @allocation1.should_receive(:process!).once.with(3,3,nil).and_return [4]
-          @allocation2.should_receive(:process!).once.with(2,0,nil).and_return [5,6]
-          @allocation3.should_receive(:process!).once.with(0,0,nil).and_return []
+          @allocation1.should_receive(:process!).once.with(3,3).and_return [4]
+          @allocation2.should_receive(:process!).once.with(2,0).and_return [5,6]
+          @allocation3.should_receive(:process!).once.with(0,0).and_return []
 
           @allocations.process! @amount, @offset
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 4.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70172962714740 !ruby/object:Gem::Requirement
+  requirement: &70307499892700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70172962714740
+  version_requirements: *70307499892700
 - !ruby/object:Gem::Dependency
   name: picky-client
-  requirement: &70172962714020 !ruby/object:Gem::Requirement
+  requirement: &70307499891000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: 4.4.1
   type: :development
   prerelease: false
-  version_requirements: *70172962714020
+  version_requirements: *70307499891000
 - !ruby/object:Gem::Dependency
   name: text
-  requirement: &70172962713380 !ruby/object:Gem::Requirement
+  requirement: &70307499888240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70172962713380
+  version_requirements: *70307499888240
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70172962712340 !ruby/object:Gem::Requirement
+  requirement: &70307499901520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70172962712340
+  version_requirements: *70307499901520
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70172962711160 !ruby/object:Gem::Requirement
+  requirement: &70307499899220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70172962711160
+  version_requirements: *70307499899220
 - !ruby/object:Gem::Dependency
   name: procrastinate
-  requirement: &70172962709300 !ruby/object:Gem::Requirement
+  requirement: &70307499897140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70172962709300
+  version_requirements: *70307499897140
 - !ruby/object:Gem::Dependency
   name: rack_fast_escape
-  requirement: &70172962723720 !ruby/object:Gem::Requirement
+  requirement: &70307499895940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70172962723720
+  version_requirements: *70307499895940
 description: Fast Ruby semantic text search engine with comfortable single field interface.
 email: florian.hanke+picky@gmail.com
 executables: