thinking-sphinx 3.1.4 → 3.2.0

data/lib/thinking_sphinx/active_record/sql_source/template.rb

@@ -48,6 +48,6 @@ class ThinkingSphinx::ActiveRecord::SQLSource::Template
   end
 
   def primary_key
-    source.model.primary_key.to_sym
+    source.options[:primary_key].to_sym
   end
 end

data/lib/thinking_sphinx/callbacks.rb

@@ -9,6 +9,24 @@ class ThinkingSphinx::Callbacks
     extend mod
   end
 
+  def self.resume!
+    @suspended = false
+  end
+
+  def self.suspend(&block)
+    suspend!
+    yield
+    resume!
+  end
+
+  def self.suspend!
+    @suspended = true
+  end
+
+  def self.suspended?
+    @suspended
+  end
+
   def initialize(instance)
     @instance = instance
   end

data/lib/thinking_sphinx/configuration.rb

@@ -3,14 +3,16 @@ require 'pathname'
 class ThinkingSphinx::Configuration < Riddle::Configuration
   attr_accessor :configuration_file, :indices_location, :version
   attr_reader :index_paths
-  attr_writer :controller, :index_set_class
+  attr_writer :controller, :index_set_class, :indexing_strategy
 
   delegate :environment, :to => :framework
 
+  @@mutex = Mutex.new
+
   def initialize
     super
 
-    setup
+    reset
   end
 
   def self.instance
@@ -39,7 +41,7 @@ class ThinkingSphinx::Configuration < Riddle::Configuration
 
   def framework=(framework)
     @framework = framework
-    setup
+    reset
     framework
   end
 
@@ -60,6 +62,10 @@ class ThinkingSphinx::Configuration < Riddle::Configuration
     @index_set_class ||= ThinkingSphinx::IndexSet
   end
 
+  def indexing_strategy
+    @indexing_strategy ||= ThinkingSphinx::IndexingStrategies::AllAtOnce
+  end
+
   def indices_for_references(*references)
     index_set_class.new(:references => references).to_a
   end
@@ -69,19 +75,21 @@ class ThinkingSphinx::Configuration < Riddle::Configuration
   end
 
   def preload_indices
-    return if @preloaded_indices
+    @@mutex.synchronize do
+      return if @preloaded_indices
 
-    index_paths.each do |path|
-      Dir["#{path}/**/*.rb"].sort.each do |file|
-        ActiveSupport::Dependencies.require_or_load file
+      index_paths.each do |path|
+        Dir["#{path}/**/*.rb"].sort.each do |file|
+          ActiveSupport::Dependencies.require_or_load file
+        end
       end
-    end
 
-    if settings['distributed_indices'].nil? || settings['distributed_indices']
-      ThinkingSphinx::Configuration::DistributedIndices.new(indices).reconcile
-    end
+      if settings['distributed_indices'].nil? || settings['distributed_indices']
+        ThinkingSphinx::Configuration::DistributedIndices.new(indices).reconcile
+      end
 
-    @preloaded_indices = true
+      @preloaded_indices = true
+    end
   end
 
   def render
@@ -89,6 +97,7 @@ class ThinkingSphinx::Configuration < Riddle::Configuration
 
     ThinkingSphinx::Configuration::ConsistentIds.new(indices).reconcile
     ThinkingSphinx::Configuration::MinimumFields.new(indices).reconcile
+    ThinkingSphinx::Configuration::DuplicateNames.new(indices).reconcile
 
     super
   end
@@ -103,6 +112,28 @@ class ThinkingSphinx::Configuration < Riddle::Configuration
     @settings ||= File.exists?(settings_file) ? settings_to_hash : {}
   end
 
+  def setup
+    @configuration_file = settings['configuration_file'] || framework_root.join(
+      'config', "#{environment}.sphinx.conf"
+    ).to_s
+    @index_paths = engine_index_paths + [framework_root.join('app', 'indices').to_s]
+    @indices_location = settings['indices_location'] || framework_root.join(
+      'db', 'sphinx', environment
+    ).to_s
+    @version = settings['version'] || '2.1.4'
+
+    if settings['common_sphinx_configuration']
+      common.common_sphinx_configuration  = true
+      indexer.common_sphinx_configuration = true
+    end
+
+    configure_searchd
+
+    apply_sphinx_settings!
+
+    @offsets = {}
+  end
+
   private
 
   def configure_searchd
@@ -135,7 +166,10 @@ class ThinkingSphinx::Configuration < Riddle::Configuration
   end
 
   def settings_to_hash
-    contents = YAML.load(ERB.new(File.read(settings_file)).result)
+    input    = File.read settings_file
+    input    = ERB.new(input).result if defined?(ERB)
+
+    contents = YAML.load input
     contents && contents[environment] || {}
   end
 
@@ -143,27 +177,9 @@ class ThinkingSphinx::Configuration < Riddle::Configuration
     framework_root.join 'config', 'thinking_sphinx.yml'
   end
 
-  def setup
+  def reset
     @settings = nil
-    @configuration_file = settings['configuration_file'] || framework_root.join(
-      'config', "#{environment}.sphinx.conf"
-    ).to_s
-    @index_paths = engine_index_paths + [framework_root.join('app', 'indices').to_s]
-    @indices_location = settings['indices_location'] || framework_root.join(
-      'db', 'sphinx', environment
-    ).to_s
-    @version = settings['version'] || '2.1.4'
-
-    if settings['common_sphinx_configuration']
-      common.common_sphinx_configuration  = true
-      indexer.common_sphinx_configuration = true
-    end
-
-    configure_searchd
-
-    apply_sphinx_settings!
-
-    @offsets = {}
+    setup
   end
 
   def tmp_path
@@ -190,4 +206,5 @@ end
 require 'thinking_sphinx/configuration/consistent_ids'
 require 'thinking_sphinx/configuration/defaults'
 require 'thinking_sphinx/configuration/distributed_indices'
+require 'thinking_sphinx/configuration/duplicate_names'
 require 'thinking_sphinx/configuration/minimum_fields'

data/lib/thinking_sphinx/configuration/duplicate_names.rb

@@ -0,0 +1,34 @@
+class ThinkingSphinx::Configuration::DuplicateNames
+  def initialize(indices)
+    @indices = indices
+  end
+
+  def reconcile
+    indices.each do |index|
+      return if index.distributed?
+
+      counts_for(index).each do |name, count|
+        next if count <= 1
+
+        raise ThinkingSphinx::DuplicateNameError,
+          "Duplicate field/attribute name '#{name}' in index '#{index.name}'"
+      end
+    end
+  end
+
+  private
+
+  attr_reader :indices
+
+  def counts_for(index)
+    names_for(index).inject({}) do |hash, name|
+      hash[name] ||= 0
+      hash[name] += 1
+      hash
+    end
+  end
+
+  def names_for(index)
+    index.fields.collect(&:name) + index.attributes.collect(&:name)
+  end
+end

data/lib/thinking_sphinx/connection.rb

@@ -157,13 +157,13 @@ module ThinkingSphinx::Connection
     def set_to_array(set)
       return nil if set.nil?
 
-      meta = set.meta_data
+      meta = set.getMetaData
       rows = []
 
       while set.next
-        rows << (1..meta.column_count).inject({}) do |row, index|
-          name      = meta.column_name index
-          row[name] = set.get_object(index)
+        rows << (1..meta.getColumnCount).inject({}) do |row, index|
+          name      = meta.getColumnName index
+          row[name] = set.getObject(index)
           row
         end
       end

data/lib/thinking_sphinx/controller.rb

@@ -1,10 +1,12 @@
 class ThinkingSphinx::Controller < Riddle::Controller
   def index(*indices)
-    options = indices.extract_options!
-    indices << '--all' if indices.empty?
+    configuration = ThinkingSphinx::Configuration.instance
+    options       = indices.extract_options!
 
-    ThinkingSphinx::Guard::Files.call(indices) do |names|
-      super(*(names + [options]))
+    configuration.indexing_strategy.call(indices) do |index_names|
+      ThinkingSphinx::Guard::Files.call(index_names) do |names|
+        super(*(names + [options]))
+      end
     end
   end
 end

data/lib/thinking_sphinx/deletion.rb

@@ -32,8 +32,21 @@ class ThinkingSphinx::Deletion
 
   class RealtimeDeletion < ThinkingSphinx::Deletion
     def perform
+      return unless callbacks_enabled?
+
       execute Riddle::Query::Delete.new(name, document_ids_for_keys).to_sql
     end
+
+    private
+
+    def callbacks_enabled?
+      setting = configuration.settings['real_time_callbacks']
+      setting.nil? || setting
+    end
+
+    def configuration
+      ThinkingSphinx::Configuration.instance
+    end
   end
 
   class PlainDeletion < ThinkingSphinx::Deletion

data/lib/thinking_sphinx/errors.rb

@@ -13,6 +13,8 @@ class ThinkingSphinx::SphinxError < StandardError
       replacement = ThinkingSphinx::ConnectionError.new(
         "Error connecting to Sphinx via the MySQL protocol. #{error.message}"
       )
+    when /offset out of bounds/
+      replacement = ThinkingSphinx::OutOfBoundsError.new(error.message)
     else
       replacement = new(error.message)
     end
@@ -35,6 +37,9 @@ end
 class ThinkingSphinx::ParseError < ThinkingSphinx::QueryError
 end
 
+class ThinkingSphinx::OutOfBoundsError < ThinkingSphinx::QueryError
+end
+
 class ThinkingSphinx::QueryExecutionError < StandardError
   attr_accessor :statement
 end
@@ -50,3 +55,6 @@ end
 
 class ThinkingSphinx::PopulatedResultsError < StandardError
 end
+
+class ThinkingSphinx::DuplicateNameError < StandardError
+end

data/lib/thinking_sphinx/index_set.rb

@@ -1,5 +1,10 @@
 class ThinkingSphinx::IndexSet
   include Enumerable
+  
+  def self.reference_name(klass)
+    @cached_results ||= {}
+    @cached_results[klass.name] ||= klass.name.underscore.to_sym
+  end
 
   delegate :each, :empty?, :to => :indices
 
@@ -63,7 +68,7 @@ class ThinkingSphinx::IndexSet
 
   def references
     options[:references] || classes_and_ancestors.collect { |klass|
-      klass.name.underscore.to_sym
+      ThinkingSphinx::IndexSet.reference_name(klass)
     }
   end
 

data/lib/thinking_sphinx/indexing_strategies/all_at_once.rb

@@ -0,0 +1,7 @@
+class ThinkingSphinx::IndexingStrategies::AllAtOnce
+  def self.call(indices = [], &block)
+    indices << '--all' if indices.empty?
+
+    block.call indices
+  end
+end

data/lib/thinking_sphinx/indexing_strategies/one_at_a_time.rb

@@ -0,0 +1,14 @@
+class ThinkingSphinx::IndexingStrategies::OneAtATime
+  def self.call(indices = [], &block)
+    if indices.empty?
+      configuration = ThinkingSphinx::Configuration.instance
+      configuration.preload_indices
+
+      indices = configuration.indices.select { |index|
+        !(index.distributed? || index.type == 'rt')
+      }.collect &:name
+    end
+
+    indices.each { |name| block.call [name] }
+  end
+end

data/lib/thinking_sphinx/middlewares/active_record_translator.rb

@@ -57,7 +57,7 @@ class ThinkingSphinx::Middlewares::ActiveRecordTranslator <
       @results_for_models ||= model_names.inject({}) do |hash, name|
         model = name.constantize
         hash[name] = model_relation_with_sql_options(model.unscoped).where(
-          model.primary_key => ids_for_model(name)
+          (context.configuration.settings[:primary_key] || model.primary_key || :id) => ids_for_model(name)
         )
 
         hash

data/lib/thinking_sphinx/middlewares/inquirer.rb

@@ -45,7 +45,7 @@ class ThinkingSphinx::Middlewares::Inquirer <
 
     def call(raw_results, meta_results)
       context[:results] = raw_results.to_a
-      context[:raw]     = raw_results
+      context[:raw]     = context[:results].dup
       context[:meta]    = meta_results.inject({}) { |hash, row|
         hash[row['Variable_name']] = row['Value']
         hash

data/lib/thinking_sphinx/middlewares/sphinxql.rb

@@ -4,7 +4,7 @@ class ThinkingSphinx::Middlewares::SphinxQL <
   SELECT_OPTIONS = [:agent_query_timeout, :boolean_simplify, :comment, :cutoff,
     :field_weights, :global_idf, :idf, :index_weights, :max_matches,
     :max_query_time, :max_predicted_time, :ranker, :retry_count, :retry_delay,
-    :reverse_scan, :sort_method]
+    :reverse_scan, :sort_method, :rand_seed]
 
   def call(contexts)
     contexts.each do |context|
@@ -82,7 +82,7 @@ class ThinkingSphinx::Middlewares::SphinxQL <
 
     def indices_match_classes?
       indices.collect(&:reference).uniq.sort == classes.collect { |klass|
-        klass.name.underscore.to_sym
+        ThinkingSphinx::IndexSet.reference_name(klass)
       }.sort
     end
 

data/lib/thinking_sphinx/middlewares/stale_id_checker.rb

@@ -33,7 +33,7 @@ class ThinkingSphinx::Middlewares::StaleIdChecker <
     end
 
     def raise_exception
-      raise ThinkingSphinx::Search::StaleIdsException, stale_ids
+      raise ThinkingSphinx::Search::StaleIdsException.new(stale_ids, context)
     end
 
     def stale_ids

data/lib/thinking_sphinx/middlewares/stale_id_filter.rb

@@ -11,7 +11,7 @@ class ThinkingSphinx::Middlewares::StaleIdFilter <
     rescue ThinkingSphinx::Search::StaleIdsException => error
       raise error if @retries <= 0
 
-      append_stale_ids error.ids
+      append_stale_ids error.ids, error.context
       ThinkingSphinx::Logger.log :message, log_message
 
       @retries -= 1 and retry
@@ -20,7 +20,7 @@ class ThinkingSphinx::Middlewares::StaleIdFilter <
 
   private
 
-  def append_stale_ids(ids)
+  def append_stale_ids(ids, context)
     @stale_ids |= ids
 
     context.search.options[:without_ids] ||= []

data/lib/thinking_sphinx/rake_interface.rb

@@ -45,16 +45,25 @@ class ThinkingSphinx::RakeInterface
     FileUtils.mkdir_p configuration.indices_location
   end
 
-  def start
+  def start(options={})
     raise RuntimeError, 'searchd is already running' if controller.running?
 
     FileUtils.mkdir_p configuration.indices_location
-    controller.start
 
-    if controller.running?
-      puts "Started searchd successfully (pid: #{controller.pid})."
+    if options[:nodetach]
+      unless pid = fork
+        controller.start(options)
+      end
+      Signal.trap('TERM') { Process.kill(:TERM, pid); }
+      Signal.trap('INT')  { Process.kill(:TERM, pid); }
+      Process.wait(pid)
     else
-      puts "Failed to start searchd. Check the log files for more information."
+      controller.start(options)
+      if controller.running?
+        puts "Started searchd successfully (pid: #{controller.pid})."
+      else
+        puts "Failed to start searchd. Check the log files for more information."
+      end
     end
   end