thinking-sphinx 3.1.1 → 3.1.2

data/lib/thinking_sphinx/core/interpreter.rb

@@ -13,6 +13,10 @@ class ThinkingSphinx::Core::Interpreter < BasicObject
 
   private
 
+  def search_option?(key)
+    ::ThinkingSphinx::Middlewares::SphinxQL::SELECT_OPTIONS.include? key
+  end
+
   def method_missing(method, *args)
     ::ThinkingSphinx::ActiveRecord::Column.new method, *args
   end

data/lib/thinking_sphinx/deletion.rb

@@ -38,11 +38,13 @@ class ThinkingSphinx::Deletion
 
   class PlainDeletion < ThinkingSphinx::Deletion
     def perform
-      execute <<-SQL
+      document_ids_for_keys.each_slice(1000) do |document_ids|
+        execute <<-SQL
 UPDATE #{name}
 SET sphinx_deleted = 1
-WHERE id IN (#{document_ids_for_keys.join(', ')})
-      SQL
+WHERE id IN (#{document_ids.join(', ')})
+        SQL
+      end
     end
   end
 end

data/lib/thinking_sphinx/errors.rb

@@ -47,3 +47,6 @@ end
 
 class ThinkingSphinx::MissingColumnError < StandardError
 end
+
+class ThinkingSphinx::PopulatedResultsError < StandardError
+end

data/lib/thinking_sphinx/facet.rb

@@ -11,7 +11,7 @@ class ThinkingSphinx::Facet
 
   def results_from(raw)
     raw.inject({}) { |hash, row|
-      hash[row[group_column]] = row['sphinx_internal_count']
+      hash[row[group_column]] = row[ThinkingSphinx::SphinxQL.count[:column]]
       hash
     }
   end
@@ -19,7 +19,8 @@ class ThinkingSphinx::Facet
   private
 
   def group_column
-    @properties.any?(&:multi?) ? 'sphinx_internal_group' : name
+    @properties.any?(&:multi?) ?
+      ThinkingSphinx::SphinxQL.group_by[:column] : name
   end
 
   def use_field?

data/lib/thinking_sphinx/facet_search.rb

@@ -51,6 +51,10 @@ class ThinkingSphinx::FacetSearch
     @populated = true
   end
 
+  def populated?
+    @populated
+  end
+
   def to_hash
     populate
 
@@ -102,8 +106,8 @@ class ThinkingSphinx::FacetSearch
   def options_for(facet)
     options.merge(
       :select      => [(options[:select] || '*'),
-        "#{ThinkingSphinx::SphinxQL.group_by} as sphinx_internal_group",
-        "#{ThinkingSphinx::SphinxQL.count} as sphinx_internal_count"
+        "#{ThinkingSphinx::SphinxQL.group_by[:select]}",
+        "#{ThinkingSphinx::SphinxQL.count[:select]}"
       ].join(', '),
       :group_by    => facet.name,
       :indices     => index_names_for(facet),

data/lib/thinking_sphinx/guard.rb

@@ -0,0 +1,6 @@
+module ThinkingSphinx::Guard
+  #
+end
+
+require 'thinking_sphinx/guard/file'
+require 'thinking_sphinx/guard/files'

data/lib/thinking_sphinx/guard/file.rb

@@ -0,0 +1,26 @@
+class ThinkingSphinx::Guard::File
+  attr_reader :name
+
+  def initialize(name)
+    @name = name
+  end
+
+  def lock
+    FileUtils.touch path
+  end
+
+  def locked?
+    File.exists? path
+  end
+
+  def path
+    @path ||= File.join(
+      ThinkingSphinx::Configuration.instance.indices_location,
+      "ts-#{name}.tmp"
+    )
+  end
+
+  def unlock
+    FileUtils.rm path
+  end
+end

data/lib/thinking_sphinx/guard/files.rb

@@ -0,0 +1,38 @@
+class ThinkingSphinx::Guard::Files
+  def self.call(names, &block)
+    new(names).call(&block)
+  end
+
+  def initialize(names)
+    @names = names
+  end
+
+  def call(&block)
+    return if unlocked.empty?
+
+    unlocked.each &:lock
+    block.call unlocked.collect(&:name)
+  rescue => error
+    raise error
+  ensure
+    unlocked.each &:unlock
+  end
+
+  private
+
+  attr_reader :names
+
+  def log_lock(file)
+    ThinkingSphinx::Logger.log :guard,
+      "Guard file for index #{file.name} exists, not indexing: #{file.path}."
+  end
+
+  def unlocked
+    @unlocked ||= names.collect { |name|
+      ThinkingSphinx::Guard::File.new name
+    }.reject { |file|
+      log_lock file if file.locked?
+      file.locked?
+    }
+  end
+end

data/lib/thinking_sphinx/masks/group_enumerators_mask.rb

@@ -9,20 +9,20 @@ class ThinkingSphinx::Masks::GroupEnumeratorsMask
 
   def each_with_count(&block)
     @search.raw.each_with_index do |row, index|
-      yield @search[index], row['sphinx_internal_count']
+      yield @search[index], row[ThinkingSphinx::SphinxQL.count[:column]]
     end
   end
 
   def each_with_group(&block)
     @search.raw.each_with_index do |row, index|
-      yield @search[index], row['sphinx_internal_group']
+      yield @search[index], row[ThinkingSphinx::SphinxQL.group_by[:column]]
     end
   end
 
   def each_with_group_and_count(&block)
     @search.raw.each_with_index do |row, index|
-      yield @search[index], row['sphinx_internal_group'],
-        row['sphinx_internal_count']
+      yield @search[index], row[ThinkingSphinx::SphinxQL.group_by[:column]],
+        row[ThinkingSphinx::SphinxQL.count[:column]]
     end
   end
 end

data/lib/thinking_sphinx/masks/weight_enumerator_mask.rb

@@ -9,7 +9,7 @@ class ThinkingSphinx::Masks::WeightEnumeratorMask
 
   def each_with_weight(&block)
     @search.raw.each_with_index do |row, index|
-      yield @search[index], row[ThinkingSphinx::SphinxQL.weight]
+      yield @search[index], row[ThinkingSphinx::SphinxQL.weight[:column]]
     end
   end
 end

data/lib/thinking_sphinx/middlewares/sphinxql.rb

@@ -157,8 +157,8 @@ SQL
 
     def values
       options[:select] ||= ['*',
-        "#{ThinkingSphinx::SphinxQL.group_by} as sphinx_internal_group",
-        "#{ThinkingSphinx::SphinxQL.count} as sphinx_internal_count"
+        "#{ThinkingSphinx::SphinxQL.group_by[:select]}",
+        "#{ThinkingSphinx::SphinxQL.count[:select]}"
       ].join(', ') if group_attribute.present?
       options[:select]
     end

data/lib/thinking_sphinx/panes/weight_pane.rb

@@ -4,6 +4,6 @@ class ThinkingSphinx::Panes::WeightPane
   end
 
   def weight
-    @raw[ThinkingSphinx::SphinxQL.weight]
+    @raw[ThinkingSphinx::SphinxQL.weight[:column]]
   end
 end

data/lib/thinking_sphinx/rake_interface.rb

@@ -1,5 +1,5 @@
 class ThinkingSphinx::RakeInterface
-  def clear
+  def clear_all
     [
       configuration.indices_location,
       configuration.searchd.binlog_path
@@ -8,6 +8,17 @@ class ThinkingSphinx::RakeInterface
     end
   end
 
+  def clear_real_time
+    indices = configuration.indices.select { |index| index.type == 'rt' }
+    indices.each do |index|
+      index.render
+      Dir["#{index.path}.*"].each { |path| FileUtils.rm path }
+    end
+
+    path = configuration.searchd.binlog_path
+    FileUtils.rm_r(path) if File.exists?(path)
+  end
+
   def configure
     puts "Generating configuration to #{configuration.configuration_file}"
     configuration.render_to_file
@@ -47,6 +58,14 @@ class ThinkingSphinx::RakeInterface
     end
   end
 
+  def status
+    if controller.running?
+      puts "The Sphinx daemon searchd is currently running."
+    else
+      puts "The Sphinx daemon searchd is not currently running."
+    end
+  end
+
   def stop
     unless controller.running?
       puts 'searchd is not currently running.' and return

data/lib/thinking_sphinx/real_time.rb

@@ -3,8 +3,8 @@ module ThinkingSphinx::RealTime
     #
   end
 
-  def self.callback_for(reference, path = [])
-    Callbacks::RealTimeCallbacks.new reference, path
+  def self.callback_for(reference, path = [], &block)
+    Callbacks::RealTimeCallbacks.new reference, path, &block
   end
 end
 

data/lib/thinking_sphinx/real_time/callbacks/real_time_callbacks.rb

@@ -1,6 +1,6 @@
 class ThinkingSphinx::RealTime::Callbacks::RealTimeCallbacks
-  def initialize(reference, path = [])
-    @reference, @path = reference, path
+  def initialize(reference, path = [], &block)
+    @reference, @path, @block = reference, path, block
   end
 
   def after_save(instance)
@@ -15,7 +15,7 @@ class ThinkingSphinx::RealTime::Callbacks::RealTimeCallbacks
 
   private
 
-  attr_reader :reference, :path
+  attr_reader :reference, :path, :block
 
   def callbacks_enabled?
     setting = configuration.settings['real_time_callbacks']
@@ -31,7 +31,13 @@ class ThinkingSphinx::RealTime::Callbacks::RealTimeCallbacks
   end
 
   def objects_for(instance)
-    Array(path.inject(instance) { |object, method| object.send method })
+    if block
+      results = block.call instance
+    else
+      results = path.inject(instance) { |object, method| object.send method }
+    end
+
+    Array results
   end
 
   def real_time_indices?

data/lib/thinking_sphinx/real_time/interpreter.rb

@@ -23,7 +23,8 @@ class ThinkingSphinx::RealTime::Interpreter <
 
   def set_property(properties)
     properties.each do |key, value|
-      @index.send("#{key}=", value)   if @index.class.settings.include?(key)
+      @index.send("#{key}=", value) if @index.class.settings.include?(key)
+      @index.options[key] = value   if search_option?(key)
     end
   end
 

data/lib/thinking_sphinx/real_time/transcriber.rb

@@ -4,7 +4,7 @@ class ThinkingSphinx::RealTime::Transcriber
   end
 
   def copy(instance)
-    return unless copy? instance
+    return unless instance.persisted? && copy?(instance)
 
     columns, values = ['id'], [index.document_id_for_key(instance.id)]
     (index.fields + index.attributes).each do |property|

data/lib/thinking_sphinx/search.rb

@@ -74,6 +74,10 @@ class ThinkingSphinx::Search < Array
     @populated = true
   end
 
+  def populated?
+    @populated
+  end
+
   def query_time
     meta['time'].to_f
   end

data/lib/thinking_sphinx/search/merger.rb

@@ -6,6 +6,10 @@ class ThinkingSphinx::Search::Merger
   end
 
   def merge!(query = nil, options = {})
+    if search.populated?
+      raise ThinkingSphinx::PopulatedResultsError, 'This search request has already been made - you can no longer modify it.'
+    end
+
     query, options = nil, query if query.is_a?(Hash)
     @search.query  = query unless query.nil?
 

data/lib/thinking_sphinx/sphinxql.rb

@@ -2,15 +2,21 @@ module ThinkingSphinx::SphinxQL
   mattr_accessor :weight, :group_by, :count
 
   def self.functions!
-    self.weight   = 'weight()'
-    self.group_by = 'groupby()'
-    self.count    = 'count(*)'
+    self.weight   = {:select => 'weight()', :column => 'weight()'}
+    self.group_by = {
+      :select => 'groupby() AS sphinx_internal_group',
+      :column => 'sphinx_internal_group'
+    }
+    self.count    = {
+      :select => 'id AS sphinx_document_id, count(DISTINCT sphinx_document_id) AS sphinx_internal_count',
+      :column => 'sphinx_internal_count'
+    }
   end
 
   def self.variables!
-    self.weight   = '@weight'
-    self.group_by = '@groupby'
-    self.count    = '@count'
+    self.weight   = {:select => '@weight',  :column => '@weight'}
+    self.group_by = {:select => '@groupby', :column => '@groupby'}
+    self.count    = {:select => '@count',   :column => '@count'}
   end
 
   self.functions!

data/lib/thinking_sphinx/tasks.rb

@@ -14,7 +14,12 @@ namespace :ts do
 
   desc 'Clear out Sphinx files'
   task :clear => :environment do
-    interface.clear
+    interface.clear_all
+  end
+
+  desc 'Clear out real-time index files'
+  task :clear_rt => :environment do
+    interface.clear_real_time
   end
 
   desc 'Generate fresh index files for real-time indices'
@@ -24,10 +29,10 @@ namespace :ts do
   end
 
   desc 'Stop Sphinx, index and then restart Sphinx'
-  task :rebuild => [:stop, :index, :start]
+  task :rebuild => [:stop, :clear, :index, :start]
 
   desc 'Stop Sphinx, clear files, reconfigure, start Sphinx, generate files'
-  task :regenerate => [:stop, :clear, :configure, :start, :generate]
+  task :regenerate => [:stop, :clear_rt, :configure, :start, :generate]
 
   desc 'Restart the Sphinx daemon'
   task :restart => [:stop, :start]
@@ -42,6 +47,11 @@ namespace :ts do
     interface.stop
   end
 
+  desc 'Determine whether Sphinx is running'
+  task :status => :environment do
+    interface.status
+  end
+
   def interface
     @interface ||= ThinkingSphinx::RakeInterface.new
   end

data/spec/acceptance/attribute_access_spec.rb

@@ -16,7 +16,7 @@ describe 'Accessing attributes directly via search results', :live => true do
     index
 
     search = Book.search 'gods',
-      :select => "*, #{ThinkingSphinx::SphinxQL.weight}"
+      :select => "*, #{ThinkingSphinx::SphinxQL.weight[:select]}"
     search.context[:panes] << ThinkingSphinx::Panes::WeightPane
 
     search.first.weight.should == 2500
@@ -27,7 +27,7 @@ describe 'Accessing attributes directly via search results', :live => true do
     index
 
     search = Book.search 'gods',
-      :select => "*, #{ThinkingSphinx::SphinxQL.weight}"
+      :select => "*, #{ThinkingSphinx::SphinxQL.weight[:select]}"
     search.masks << ThinkingSphinx::Masks::WeightEnumeratorMask
 
     expectations = [[gods, 2500]]

data/spec/acceptance/big_integers_spec.rb

@@ -25,3 +25,14 @@ describe '64 bit integer support' do
     }.type.should == :bigint
   end
 end
+
+describe '64 bit document ids', :live => true do
+  it 'handles large 32 bit integers with an offset multiplier' do
+    user = User.create! :name => 'Pat'
+    user.update_column :id, 980190962
+
+    index
+
+    expect(User.search('pat').to_a).to eq([user])
+  end
+end

data/spec/acceptance/facets_spec.rb

@@ -26,10 +26,13 @@ describe 'Faceted searching', :live => true do
     Tee.create!
     City.create!
     Product.create!
+    Article.create!
     index
 
+    article_count = ENV['SPHINX_VERSION'].try(:[], /2.0.\d/) ? 2 : 1
+
     ThinkingSphinx.facets.to_hash[:class].should == {
-      'Tee' => 2, 'City' => 1, 'Product' => 1
+      'Tee' => 2, 'City' => 1, 'Product' => 1, 'Article' => article_count
     }
   end