ryansch-ts-resque-delta 1.1.5.1 → 1.1.5.2

data/features/step_definitions/smart_indexing_steps.rb

@@ -1,3 +1,3 @@
 When /^I run the smart indexer$/ do
-  ThinkingSphinx::Deltas::ResqueDelta::CoreIndex.new.smart_index
+  ThinkingSphinx::Deltas::ResqueDelta::CoreIndex.new.smart_index(:verbose => false)
 end

data/lib/thinking_sphinx/deltas/resque_delta/core_index.rb

@@ -42,10 +42,13 @@ class ThinkingSphinx::Deltas::ResqueDelta::CoreIndex
   # Public: Index all indices while locking each delta as we index the corresponding core index.
   #
   # Returns true on success; false on failure.
-  def smart_index
+  def smart_index(opts = {})
+    verbose = opts.fetch(:verbose, true)
+    verbose = false if ENV['SILENT'] == 'true'
+
     # Load config like ts:in.
     unless ENV['INDEX_ONLY'] == 'true'
-      puts "Generating Configuration to #{ts_config.config_file}"
+      puts "Generating Configuration to #{ts_config.config_file}" if verbose
       ts_config.build
     end
     FileUtils.mkdir_p(ts_config.searchd_file_path)
@@ -56,7 +59,7 @@ class ThinkingSphinx::Deltas::ResqueDelta::CoreIndex
 
       with_delta_index_lock(index_name) do
         ThinkingSphinx::Deltas::ResqueDelta.prepare_for_core_index(index_name)
-        ts_config.controller.index("#{index_name}_core", :verbose => true)
+        ts_config.controller.index("#{index_name}_core", :verbose => verbose)
         ret = $?
       end
 

data/lib/thinking_sphinx/deltas/resque_delta/delta_job.rb

@@ -30,15 +30,17 @@ class ThinkingSphinx::Deltas::ResqueDelta::DeltaJob
     # Get the document ids we've saved
     flag_as_deleted_ids = ThinkingSphinx::Deltas::ResqueDelta::FlagAsDeletedSet.processing_members(index)
 
-    # Filter out the ids that aren't present in sphinx
-    flag_as_deleted_ids = ThinkingSphinx::Search.bundle_searches(flag_as_deleted_ids) do |sphinx, id|
-      sphinx.search_for_ids([], :index => index, :id_range => id..id)
-    end.map(&:to_a).flatten
+    unless flag_as_deleted_ids.empty?
+      # Filter out the ids that aren't present in sphinx
+      flag_as_deleted_ids = filter_flag_as_deleted_ids(flag_as_deleted_ids, index)
 
-    # Each hash element should be of the form { id => [1] }
-    flag_hash = Hash[*flag_as_deleted_ids.collect {|id| [id, [1]] }.flatten(1)]
+      unless flag_as_deleted_ids.empty?
+        # Each hash element should be of the form { id => [1] }
+        flag_hash = Hash[*flag_as_deleted_ids.collect {|id| [id, [1]] }.flatten(1)]
 
-    config.client.update(index, ['sphinx_deleted'], flag_hash)
+        config.client.update(index, ['sphinx_deleted'], flag_hash)
+      end
+    end
   end
 
   # Try again later if lock is in use.
@@ -87,4 +89,10 @@ class ThinkingSphinx::Deltas::ResqueDelta::DeltaJob
   def self.skip?(index)
     ThinkingSphinx::Deltas::ResqueDelta.locked?(index)
   end
+
+  def self.filter_flag_as_deleted_ids(ids, index)
+    ThinkingSphinx.search_for_ids(
+      :with => {:@id => ids}, :index => index
+    ).results[:matches].collect { |match| match[:doc] }
+  end
 end

data/lib/thinking_sphinx/deltas/resque_delta/version.rb

@@ -1,7 +1,7 @@
 module ThinkingSphinx
   module Deltas
     class ResqueDeltaInfo
-      VERSION = "1.1.5.1"
+      VERSION = "1.1.5.2"
     end
   end
 end

data/spec/thinking_sphinx/deltas/resque_delta/core_index_spec.rb

@@ -111,6 +111,7 @@ describe ThinkingSphinx::Deltas::ResqueDelta::CoreIndex do
 
     it 'should not generate sphinx configuration if INDEX_ONLY is true' do
       ENV.stub(:[]).with('INDEX_ONLY').and_return('true')
+      ENV.stub(:[]).with('SILENT').and_return(nil)
       config.should_not_receive(:build)
 
       subject.smart_index
@@ -118,6 +119,7 @@ describe ThinkingSphinx::Deltas::ResqueDelta::CoreIndex do
 
     it 'should generate sphinx configuration if INDEX_ONLY is not true' do
       ENV.stub(:[]).with('INDEX_ONLY').and_return(nil)
+      ENV.stub(:[]).with('SILENT').and_return(nil)
       config.should_receive(:build).once
 
       subject.smart_index

data/spec/thinking_sphinx/deltas/resque_delta/delta_job_spec.rb

@@ -12,6 +12,7 @@ describe ThinkingSphinx::Deltas::ResqueDelta::DeltaJob do
     before :each do
       ThinkingSphinx.suppress_delta_output = false
       ThinkingSphinx::Deltas::ResqueDelta.stub(:locked?).and_return(false)
+      ThinkingSphinx.stub(:sphinx_running? => false)
     end
 
     it "should output the delta indexing by default" do
@@ -54,7 +55,6 @@ describe ThinkingSphinx::Deltas::ResqueDelta::DeltaJob do
     context 'with flag as deleted document ids' do
       let(:client) { stub('client', :update => true) }
       let(:document_ids) { [1, 2, 3] }
-      let(:bundled_search) { double('bundled_search', :search_for_ids => []) }
 
       before :each do
         ThinkingSphinx.updates_enabled = true
@@ -63,7 +63,7 @@ describe ThinkingSphinx::Deltas::ResqueDelta::DeltaJob do
         ThinkingSphinx.stub(:sphinx_running? => true)
 
         ThinkingSphinx::Deltas::ResqueDelta::FlagAsDeletedSet.stub(:processing_members => document_ids)
-        ThinkingSphinx::Search.stub_chain(:bundle_searches, :map => document_ids)
+        subject.stub(:filter_flag_as_deleted_ids => document_ids)
       end
 
       it 'should get the processing set of flag as deleted document ids' do
@@ -78,22 +78,14 @@ describe ThinkingSphinx::Deltas::ResqueDelta::DeltaJob do
       end
 
       it "should validate the document ids with sphinx" do
-        ThinkingSphinx::Search.stub(:bundle_searches).tap do |s|
-          document_ids.inject(s) do |s, id|
-            s.and_yield(bundled_search, id)
-          end
-        end
-
-        document_ids.each do |id|
-          bundled_search.should_receive(:search_for_ids).with([], :index => 'foo_core', :id_range => id..id)
-        end
+        subject.should_receive(:filter_flag_as_deleted_ids).with(document_ids, 'foo_core')
 
         subject.perform('foo_delta')
       end
 
       context "with invalid ids" do
         before :each do
-          ThinkingSphinx::Search.stub_chain(:bundle_searches, :map => document_ids.reject {|x| x == 2} )
+          subject.stub(:filter_flag_as_deleted_ids => document_ids.reject {|x| x == 2} )
         end
 
         it "should not update documents that aren't in the index" do
@@ -131,6 +123,15 @@ describe ThinkingSphinx::Deltas::ResqueDelta::DeltaJob do
         end
         subject.perform('foo_delta')
       end
+
+      context "without any ids" do
+        let(:document_ids) { [] }
+
+        it "should not validate the ids with sphinx" do
+          subject.should_not_receive(:filter_flag_as_deleted_ids)
+          subject.perform('foo_delta')
+        end
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: ryansch-ts-resque-delta
 version: !ruby/object:Gem::Version 
-  hash: 65
+  hash: 71
   prerelease: 
   segments: 
   - 1
   - 1
   - 5
-  - 1
-  version: 1.1.5.1
+  - 2
+  version: 1.1.5.2
 platform: ruby
 authors: 
 - Aaron Gibralter
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-14 00:00:00 -08:00
+date: 2011-12-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency