thinking-sphinx 2.0.14 → 2.1.0

data/lib/thinking_sphinx/bundled_search.rb

@@ -1,19 +1,15 @@
 module ThinkingSphinx
   class BundledSearch
-    attr_reader :client
-
     def initialize
       @searches = []
     end
 
     def search(*args)
       @searches << ThinkingSphinx.search(*args)
-      @searches.last.append_to client
     end
 
     def search_for_ids(*args)
       @searches << ThinkingSphinx.search_for_ids(*args)
-      @searches.last.append_to client
     end
 
     def searches
@@ -23,10 +19,6 @@ module ThinkingSphinx
 
     private
 
-    def client
-      @client ||= ThinkingSphinx::Configuration.instance.client
-    end
-
     def populated?
       @populated
     end
@@ -36,8 +28,12 @@ module ThinkingSphinx
 
       @populated = true
 
-      client.run.each_with_index do |results, index|
-        searches[index].populate_from_queue results
+      ThinkingSphinx::Connection.take do |client|
+        @searches.each { |search| search.append_to client }
+
+        client.run.each_with_index do |results, index|
+          searches[index].populate_from_queue results
+        end
       end
     end
   end

data/lib/thinking_sphinx/configuration.rb

@@ -69,8 +69,8 @@ module ThinkingSphinx
       :hard_retry_count
 
     attr_accessor :source_options, :index_options
-
-    attr_reader :configuration, :controller
+    attr_reader :configuration
+    attr_writer :controller
 
     @@environment = nil
 
@@ -96,14 +96,12 @@ module ThinkingSphinx
         self.app_root ||= app_root
       end
 
+      @controller    = nil
       @configuration = Riddle::Configuration.new
       @configuration.searchd.pid_file   = "#{self.app_root}/log/searchd.#{environment}.pid"
       @configuration.searchd.log        = "#{self.app_root}/log/searchd.log"
       @configuration.searchd.query_log  = "#{self.app_root}/log/searchd.query.log"
 
-      @controller = Riddle::Controller.new @configuration,
-        "#{self.app_root}/config/#{environment}.sphinx.conf"
-
       self.address              = "127.0.0.1"
       self.port                 = 9312
       self.searchd_file_path    = "#{self.app_root}/db/sphinx/#{environment}"
@@ -122,7 +120,9 @@ module ThinkingSphinx
 
       self.version = nil
       parse_config
-      self.version ||= @controller.sphinx_version
+      if controller.respond_to?(:sphinx_version)
+        self.version ||= controller.sphinx_version
+      end
 
       ThinkingSphinx::Attribute::SphinxTypeMappings.merge!(
         :string => :sql_attr_string
@@ -153,6 +153,11 @@ module ThinkingSphinx
       self.class.environment
     end
 
+    def controller
+      @controller ||= Riddle::Controller.new @configuration,
+        "#{self.app_root}/config/#{environment}.sphinx.conf"
+    end
+
     def generate
       @configuration.indices.clear
 
@@ -230,47 +235,39 @@ module ThinkingSphinx
     end
 
     def config_file
-      @controller.path
+      controller.path
     end
 
     def config_file=(file)
-      @controller.path = file
+      controller.path = file
     end
 
     def bin_path
-      @controller.bin_path
+      controller.bin_path
     end
 
     def bin_path=(path)
-      @controller.bin_path = path
+      controller.bin_path = path
     end
 
     def searchd_binary_name
-      @controller.searchd_binary_name
+      controller.searchd_binary_name
     end
 
     def searchd_binary_name=(name)
-      @controller.searchd_binary_name = name
+      controller.searchd_binary_name = name
     end
 
     def indexer_binary_name
-      @controller.indexer_binary_name
+      controller.indexer_binary_name
     end
 
     def indexer_binary_name=(name)
-      @controller.indexer_binary_name = name
+      controller.indexer_binary_name = name
     end
 
     attr_accessor :timeout
 
-    def client
-      client = Riddle::Client.new shuffled_addresses, port,
-        configuration.searchd.client_key
-      client.max_matches = configuration.searchd.max_matches || 1000
-      client.timeout = timeout || 0
-      client
-    end
-
     def models_by_crc
       @models_by_crc ||= begin
         ThinkingSphinx.context.indexed_models.inject({}) do |hash, model|
@@ -347,17 +344,6 @@ module ThinkingSphinx
       }
     end
 
-    def shuffled_addresses
-      return address unless shuffle
-
-      addresses = Array(address)
-      if addresses.respond_to?(:shuffle)
-        addresses.shuffle
-      else
-        address.sort_by { rand }
-      end
-    end
-
     def initial_model_directories
       directories = ["#{app_root}/app/models/"] +
         Dir.glob("#{app_root}/vendor/plugins/*/app/models/")

data/lib/thinking_sphinx/connection.rb

@@ -0,0 +1,71 @@
+class ThinkingSphinx::Connection
+  def self.pool
+    @pool ||= Innertube::Pool.new(
+      Proc.new { ThinkingSphinx::Connection.new },
+      Proc.new { |connection| connection.close }
+    )
+  end
+
+  def self.take
+    retries  = 0
+    original = nil
+    begin
+      pool.take do |connection|
+        connection.reset
+        begin
+          yield connection
+        rescue Riddle::ConnectionError, Riddle::ResponseError, SystemCallError => error
+          original = error
+          raise Innertube::Pool::BadResource
+        end
+      end
+    rescue Innertube::Pool::BadResource
+      retries += 1
+      retry if retries < 3
+      raise original
+    end
+  end
+
+  def initialize
+    client.open
+  end
+
+  def client
+    @client ||= begin
+      client = Riddle::Client.new shuffled_addresses, configuration.port,
+        client_key
+      client.max_matches = _max_matches
+      client.timeout     = configuration.timeout || 0
+      client
+    end
+  end
+
+  private
+
+  def client_key
+    configuration.configuration.searchd.client_key
+  end
+
+  def configuration
+    ThinkingSphinx::Configuration.instance
+  end
+
+  def _max_matches
+    configuration.configuration.searchd.max_matches || 1000
+  end
+
+  def method_missing(method, *arguments, &block)
+    client.send method, *arguments, &block
+  end
+
+  def shuffled_addresses
+    return configuration.address unless configuration.shuffle
+
+    addresses = Array(configuration.address)
+    if addresses.respond_to?(:shuffle)
+      addresses.shuffle
+    else
+      address.sort_by { rand }
+    end
+  end
+end

data/lib/thinking_sphinx/deltas.rb

@@ -1,4 +1,6 @@
 require 'thinking_sphinx/deltas/default_delta'
+require 'thinking_sphinx/deltas/delete_job'
+require 'thinking_sphinx/deltas/index_job'
 
 module ThinkingSphinx
   module Deltas

data/lib/thinking_sphinx/deltas/default_delta.rb

@@ -2,23 +2,23 @@ module ThinkingSphinx
   module Deltas
     class DefaultDelta
       attr_accessor :column
-      
+
       def initialize(index, options)
         @index  = index
         @column = options.delete(:delta_column) || :delta
       end
-      
+
       def index(model, instance = nil)
         return true unless ThinkingSphinx.updates_enabled? &&
           ThinkingSphinx.deltas_enabled?
         return true if instance && !toggled(instance)
-        
+
         update_delta_indexes model
         delete_from_core     model, instance if instance
-        
+
         true
       end
-      
+
       def toggle(instance)
         instance.send "#{@column}=", true
       end
@@ -32,28 +32,24 @@ module ThinkingSphinx
         "#{model.connection.quote_column_name(@column.to_s)} = #{adapter.boolean(false)} " +
         "WHERE #{model.connection.quote_column_name(@column.to_s)} = #{adapter.boolean(true)}"
       end
-      
+
       def clause(model, toggled)
         "#{model.quoted_table_name}.#{model.connection.quote_column_name(@column.to_s)}" +
         " = #{adapter.boolean(toggled)}"
       end
-      
+
       private
-      
+
       def update_delta_indexes(model)
-        config = ThinkingSphinx::Configuration.instance
-        rotate = ThinkingSphinx.sphinx_running? ? "--rotate" : ""
-        
-        output = `#{config.bin_path}#{config.indexer_binary_name} --config "#{config.config_file}" #{rotate} #{model.delta_index_names.join(' ')}`
-        puts(output) unless ThinkingSphinx.suppress_delta_output?
+        ThinkingSphinx::Deltas::IndexJob.new(model.delta_index_names).perform
       end
-      
+
       def delete_from_core(model, instance)
-        model.core_index_names.each do |index_name|
-          model.delete_in_index index_name, instance.sphinx_document_id
-        end
+        ThinkingSphinx::Deltas::DeleteJob.new(
+          model.core_index_names, instance.sphinx_document_id
+        ).perform
       end
-      
+
       def adapter
         @adapter = @index.model.sphinx_database_adapter
       end

data/lib/thinking_sphinx/deltas/delete_job.rb

@@ -0,0 +1,16 @@
+class ThinkingSphinx::Deltas::DeleteJob
+  def initialize(indices, document_id)
+    @indices, @document_id = indices, document_id
+  end
+
+  def perform
+    ThinkingSphinx::Connection.take do |client|
+      @indices.each do |index|
+        client.update(index, ['sphinx_deleted'], {@document_id => [1]})
+      end
+    end
+  rescue Riddle::ConnectionError, Riddle::ResponseError,
+    ThinkingSphinx::SphinxError, Errno::ETIMEDOUT, Timeout::Error
+    # Not the end of the world if Sphinx isn't running.
+  end
+end

data/lib/thinking_sphinx/deltas/index_job.rb

@@ -0,0 +1,17 @@
+class ThinkingSphinx::Deltas::IndexJob
+  def initialize(indices)
+    @indices = indices
+    @indices << {:verbose => !ThinkingSphinx.suppress_delta_output?}
+  end
+
+  def perform
+    ThinkingSphinx::Configuration.instance.controller.index *@indices
+    ThinkingSphinx::Connection.pool.clear
+
+    true
+  end
+
+  def configuration
+    ThinkingSphinx::Configuration.instance
+  end
+end

data/lib/thinking_sphinx/search.rb

@@ -359,13 +359,15 @@ module ThinkingSphinx
       populate
 
       index = options[:index] || "#{model.core_index_names.first}"
-      client.excerpts(
-        {
-          :docs   => [string.to_s],
-          :words  => query,
-          :index  => index.split(',').first.strip
-        }.merge(options[:excerpt_options] || {})
-      ).first
+      take_client do |client|
+        client.excerpts(
+          {
+            :docs   => [string.to_s],
+            :words  => query,
+            :index  => index.split(',').first.strip
+          }.merge(options[:excerpt_options] || {})
+        ).first
+      end
     end
 
     def search(*args)
@@ -391,10 +393,16 @@ module ThinkingSphinx
       ThinkingSphinx::FacetSearch.new(*args)
     end
 
-    def client
-      client = options[:client] || config.client
-
-      prepare client
+    def take_client
+      if options[:client]
+        prepare options[:client]
+        yield options[:client]
+      else
+        ThinkingSphinx::Connection.take do |client|
+          prepare client
+          yield client
+        end
+      end
     end
 
     def append_to(client)
@@ -425,12 +433,14 @@ module ThinkingSphinx
       begin
         retry_on_stale_index do
           begin
+            @results = nil
             log query do
-              @results = client.query query, indexes, comment
+              take_client do |client|
+                @results = client.query query, indexes, comment
+              end
             end
             total = @results[:total_found].to_i
             log "Found #{total} result#{'s' unless total == 1}"
-
             log "Sphinx Daemon returned warning: #{warning}" if warning?
 
             if error?
@@ -468,7 +478,7 @@ module ThinkingSphinx
         replace instances_from_matches
         add_excerpter
         add_sphinx_attributes
-        add_matching_fields if client.rank_mode == :fieldmask
+        add_matching_fields if options[:rank_mode] == :fieldmask
       end
     end
 
@@ -643,7 +653,8 @@ module ThinkingSphinx
       return '' if @options[:conditions].blank?
 
       ' ' + @options[:conditions].keys.collect { |key|
-        "@#{key} #{options[:conditions][key]}"
+        search_key = key.is_a?(::Array) ? "(#{key.join(',')})" : key
+        "@#{search_key} #{options[:conditions][key]}"
       }.join(' ')
     end
 

data/lib/thinking_sphinx/tasks.rb

@@ -13,11 +13,6 @@ namespace :thinking_sphinx do
     end
   end
 
-  desc "Output the current Thinking Sphinx version"
-  task :version => :app_env do
-    puts "Thinking Sphinx v" + ThinkingSphinx::Version
-  end
-
   desc "Stop if running, then start a Sphinx searchd daemon using Thinking Sphinx's settings"
   task :running_start => :app_env do
     Rake::Task["thinking_sphinx:stop"].invoke if sphinx_running?
@@ -89,6 +84,7 @@ namespace :thinking_sphinx do
     end
 
     FileUtils.mkdir_p config.searchd_file_path
+    ThinkingSphinx.before_index_hooks.each { |hook| hook.call }
     config.controller.index :verbose => true
   end