thinking-sphinx 3.1.2 → 3.1.3

data/lib/thinking_sphinx/middlewares/inquirer.rb

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

data/lib/thinking_sphinx/middlewares/sphinxql.rb

@@ -134,7 +134,9 @@ SQL
 
     def indices
       @indices ||= begin
-        set = ThinkingSphinx::IndexSet.new classes, options[:indices]
+        set = configuration.index_set_class.new(
+          options.slice(:classes, :indices)
+        )
         raise ThinkingSphinx::NoIndicesError if set.empty?
         set
       end

data/lib/thinking_sphinx/railtie.rb

@@ -1,6 +1,8 @@
 class ThinkingSphinx::Railtie < Rails::Railtie
-  ActiveSupport.on_load :active_record do
-    include ThinkingSphinx::ActiveRecord::Base
+  initializer 'thinking_sphinx.initialisation' do
+    if defined?(ActiveRecord::Base)
+      ActiveRecord::Base.send :include, ThinkingSphinx::ActiveRecord::Base
+    end
   end
 
   rake_tasks do

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

@@ -27,7 +27,7 @@ class ThinkingSphinx::RealTime::Callbacks::RealTimeCallbacks
   end
 
   def indices
-    @indices ||= configuration.indices_for_references reference
+    configuration.indices_for_references reference
   end
 
   def objects_for(instance)
@@ -45,8 +45,6 @@ class ThinkingSphinx::RealTime::Callbacks::RealTimeCallbacks
   end
 
   def real_time_indices
-    @real_time_indices ||= indices.select { |index|
-      index.is_a? ThinkingSphinx::RealTime::Index
-    }
+    indices.select { |index| index.is_a? ThinkingSphinx::RealTime::Index }
   end
 end

data/lib/thinking_sphinx/real_time/index.rb

@@ -67,6 +67,8 @@ class ThinkingSphinx::RealTime::Index < Riddle::Configuration::RealtimeIndex
       @rt_attr_timestamp
     when :float
       @rt_attr_float
+    when :bigint
+      attribute.multi? ? @rt_attr_multi_64 : @rt_attr_bigint
     else
       raise "Unknown attribute type '#{attribute.type}'"
     end

data/lib/thinking_sphinx/real_time/index/template.rb

@@ -8,7 +8,7 @@ class ThinkingSphinx::RealTime::Index::Template
   def apply
     add_field class_column, :sphinx_internal_class_name
 
-    add_attribute :id,          :sphinx_internal_id,    :integer
+    add_attribute :id,          :sphinx_internal_id,    :bigint
     add_attribute class_column, :sphinx_internal_class, :string, :facet => true
     add_attribute 0,            :sphinx_deleted,        :integer
   end

data/spec/acceptance/big_integers_spec.rb

@@ -12,8 +12,13 @@ describe '64 bit integer support' do
       indexes title
     }
 
+    real_time_index = ThinkingSphinx::RealTime::Index.new(:product)
+    real_time_index.definition_block = Proc.new {
+      indexes name
+    }
+
     ThinkingSphinx::Configuration::ConsistentIds.new(
-      [small_index, large_index]
+      [small_index, large_index, real_time_index]
     ).reconcile
 
     large_index.sources.first.attributes.detect { |attribute|
@@ -23,16 +28,32 @@ describe '64 bit integer support' do
     small_index.sources.first.attributes.detect { |attribute|
       attribute.name == 'sphinx_internal_id'
     }.type.should == :bigint
+
+    real_time_index.attributes.detect { |attribute|
+      attribute.name == 'sphinx_internal_id'
+    }.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
+  context 'with ActiveRecord' do
+    it 'handles large 32 bit integers with an offset multiplier' do
+      user = User.create! :name => 'Pat'
+      user.update_column :id, 980190962
+
+      index
 
-    index
+      expect(User.search('pat').to_a).to eq([user])
+    end
+  end
 
-    expect(User.search('pat').to_a).to eq([user])
+  context 'with Real-Time' do
+    it 'handles large 32 bit integers with an offset multiplier' do
+      product = Product.create! :name => "Widget"
+      product.update_attribute :id, 980190962
+      expect(
+        Product.search('widget', :indices => ['product_core']).to_a
+      ).to eq([product])
+    end
   end
 end

data/spec/acceptance/facets_spec.rb

@@ -25,14 +25,13 @@ describe 'Faceted searching', :live => true do
     Tee.create!
     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, 'Article' => article_count
+      'Tee' => 2, 'City' => 1, 'Article' => article_count
     }
   end
 

data/spec/acceptance/real_time_updates_spec.rb

@@ -6,4 +6,12 @@ describe 'Updates to records in real-time indices', :live => true do
 
     Product.search.first.should == product
   end
+
+  it "handles attributes for sortable fields accordingly" do
+    product = Product.create! :name => 'Red Fish'
+    product.update_attributes :name => 'Blue Fish'
+
+    Product.search('blue fish', :indices => ['product_core']).to_a.
+      should == [product]
+  end
 end

data/spec/acceptance/remove_deleted_records_spec.rb

@@ -24,11 +24,13 @@ describe 'Hiding deleted records from search results', :live => true do
   it "removes records from real-time index results" do
     product = Product.create! :name => 'Shiny'
 
-    Product.search('Shiny').to_a.should == [product]
+    Product.search('Shiny', :indices => ['product_core']).to_a.
+      should == [product]
 
     product.destroy
 
-    Product.search_for_ids('Shiny').should be_empty
+    Product.search_for_ids('Shiny', :indices => ['product_core']).
+      should be_empty
   end
 
   it "deletes STI child classes from parent indices" do

data/spec/acceptance/searching_across_schemas_spec.rb

@@ -0,0 +1,38 @@
+require 'acceptance/spec_helper'
+
+multi_schema = MultiSchema.new
+
+describe 'Searching across PostgreSQL schemas', :live => true do
+  before :each do
+    ThinkingSphinx::Configuration.instance.index_set_class =
+      MultiSchema::IndexSet
+  end
+
+  after :each do
+    ThinkingSphinx::Configuration.instance.index_set_class = nil
+    multi_schema.switch :public
+  end
+
+  it 'can distinguish between objects with the same primary key' do
+    multi_schema.switch :public
+    jekyll = Product.create name: 'Doctor Jekyll'
+    Product.search('Jekyll', :retry_stale => false).to_a.should == [jekyll]
+    Product.search(:retry_stale => false).to_a.should == [jekyll]
+
+    multi_schema.switch :thinking_sphinx
+    hyde = Product.create name: 'Mister Hyde'
+    Product.search('Jekyll', :retry_stale => false).to_a.should == []
+    Product.search('Hyde', :retry_stale => false).to_a.should == [hyde]
+    Product.search(:retry_stale => false).to_a.should == [hyde]
+
+    multi_schema.switch :public
+    Product.search('Jekyll', :retry_stale => false).to_a.should == [jekyll]
+    Product.search(:retry_stale => false).to_a.should == [jekyll]
+    Product.search('Hyde', :retry_stale => false).to_a.should == []
+
+    Product.search(
+      :middleware => ThinkingSphinx::Middlewares::RAW_ONLY,
+      :indices    => ['product_core', 'product_two_core']
+    ).to_a.length.should == 2
+  end
+end if multi_schema.active?

data/spec/acceptance/searching_with_sti_spec.rb

@@ -6,7 +6,7 @@ describe 'Searching across STI models', :live => true do
     duck     = Bird.create :name => 'Duck'
     index
 
-    Animal.search.to_a.should == [platypus, duck]
+    Animal.search(:indices  => ['animal_core']).to_a.should == [platypus, duck]
   end
 
   it "limits results based on subclasses" do
@@ -14,7 +14,7 @@ describe 'Searching across STI models', :live => true do
     duck     = Bird.create :name => 'Duck'
     index
 
-    Bird.search.to_a.should == [duck]
+    Bird.search(:indices  => ['animal_core']).to_a.should == [duck]
   end
 
   it "returns results for deeper subclasses when searching on their parents" do
@@ -23,7 +23,7 @@ describe 'Searching across STI models', :live => true do
     emu      = FlightlessBird.create :name => 'Emu'
     index
 
-    Bird.search.to_a.should == [duck, emu]
+    Bird.search(:indices  => ['animal_core']).to_a.should == [duck, emu]
   end
 
   it "returns results for deeper subclasses" do
@@ -32,7 +32,7 @@ describe 'Searching across STI models', :live => true do
     emu      = FlightlessBird.create :name => 'Emu'
     index
 
-    FlightlessBird.search.to_a.should == [emu]
+    FlightlessBird.search(:indices  => ['animal_core']).to_a.should == [emu]
   end
 
   it "filters out sibling subclasses" do
@@ -41,7 +41,7 @@ describe 'Searching across STI models', :live => true do
     otter    = Mammal.create :name => 'Otter'
     index
 
-    Bird.search.to_a.should == [duck]
+    Bird.search(:indices  => ['animal_core']).to_a.should == [duck]
   end
 
   it "obeys :classes if supplied" do
@@ -50,13 +50,25 @@ describe 'Searching across STI models', :live => true do
     emu      = FlightlessBird.create :name => 'Emu'
     index
 
-    Bird.search(nil, :skip_sti => true, :classes=>[Bird, FlightlessBird]).to_a.should == [duck, emu]
+    Bird.search(
+      :indices  => ['animal_core'],
+      :skip_sti => true,
+      :classes  => [Bird, FlightlessBird]
+    ).to_a.should == [duck, emu]
   end
 
   it 'finds root objects when type is blank' do
     animal = Animal.create :name => 'Animal', type: ''
     index
 
-    Animal.search.to_a.should == [animal]
+    Animal.search(:indices => ['animal_core']).to_a.should == [animal]
+  end
+
+  it 'allows for indices on mid-hierarchy classes' do
+    duck     = Bird.create :name => 'Duck'
+    emu      = FlightlessBird.create :name => 'Emu'
+    index
+
+    Bird.search(:indices => ['bird_core']).to_a.should == [duck, emu]
   end
 end

data/spec/internal/app/indices/bird_index.rb

@@ -0,0 +1,4 @@
+FlightlessBird
+ThinkingSphinx::Index.define :bird, :with => :active_record do
+  indexes name
+end

data/spec/internal/app/indices/product_index.rb

@@ -1,5 +1,26 @@
+multi_schema = MultiSchema.new
+
 ThinkingSphinx::Index.define :product, :with => :real_time do
   indexes name, :sortable => true
 
   has category_ids, :type => :integer, :multi => true
 end
+
+if multi_schema.active?
+  multi_schema.create 'thinking_sphinx'
+
+  ThinkingSphinx::Index.define(:product,
+    :name => :product_two, :offset_as => :product_two, :with => :real_time
+  ) do
+    indexes name, prefixes: true
+
+    set_property min_prefix_len: 1, dict: :keywords
+
+    scope do
+      multi_schema.switch :thinking_sphinx
+      User
+    end
+  end
+
+  multi_schema.switch :public
+end

data/spec/internal/db/schema.rb

@@ -1,7 +1,7 @@
 ActiveRecord::Schema.define do
   create_table(:admin_people, :force => true) do |t|
     t.string :name
-    t.timestamps
+    t.timestamps null: false
   end
 
   create_table(:animals, :force => true) do |t|
@@ -14,7 +14,7 @@ ActiveRecord::Schema.define do
     t.text    :content
     t.boolean :published
     t.integer :user_id
-    t.timestamps
+    t.timestamps null: false
   end
 
   create_table(:manufacturers, :force => true) do |t|
@@ -33,7 +33,7 @@ ActiveRecord::Schema.define do
     t.string  :blurb_file
     t.boolean :delta, :default => true,   :null => false
     t.string  :type,  :default => 'Book', :null => false
-    t.timestamps
+    t.timestamps null: false
   end
 
   create_table(:books_genres, :force => true, :id => false) do |t|
@@ -58,7 +58,7 @@ ActiveRecord::Schema.define do
 
   create_table(:colours, :force => true) do |t|
     t.string :name
-    t.timestamps
+    t.timestamps null: false
   end
 
   create_table(:events, :force => true) do |t|
@@ -77,27 +77,27 @@ ActiveRecord::Schema.define do
   create_table(:taggings, :force => true) do |t|
     t.integer :tag_id
     t.integer :article_id
-    t.timestamps
+    t.timestamps null: false
   end
 
   create_table(:tags, :force => true) do |t|
     t.string :name
-    t.timestamps
+    t.timestamps null: false
   end
 
   create_table(:tees, :force => true) do |t|
     t.integer :colour_id
-    t.timestamps
+    t.timestamps null: false
   end
 
   create_table(:tweets, :force => true, :id => false) do |t|
     t.column :id, :bigint, :null => false
     t.string :text
-    t.timestamps
+    t.timestamps null: false
   end
 
   create_table(:users, :force => true) do |t|
     t.string :name
-    t.timestamps
+    t.timestamps null: false
   end
 end

data/spec/spec_helper.rb

@@ -3,11 +3,12 @@ require 'bundler'
 
 Bundler.require :default, :development
 
+root = File.expand_path File.dirname(__FILE__)
+require "#{root}/support/multi_schema"
 require 'thinking_sphinx/railtie'
 
 Combustion.initialize! :active_record
 
-root = File.expand_path File.dirname(__FILE__)
 Dir["#{root}/support/**/*.rb"].each { |file| require file }
 
 RSpec.configure do |config|

data/spec/support/multi_schema.rb

@@ -0,0 +1,46 @@
+class MultiSchema
+  def active?
+    ENV['DATABASE'] == 'postgresql'
+  end
+
+  def create(schema_name)
+    unless connection.schema_exists? schema_name
+      connection.execute %Q{CREATE SCHEMA "#{schema_name}"}
+    end
+
+    switch schema_name
+    silence_stream(STDOUT) { load Rails.root.join('db', 'schema.rb') }
+  end
+
+  def current
+    connection.schema_search_path
+  end
+
+  def switch(schema_name)
+    connection.schema_search_path = %Q{"#{schema_name}"}
+    connection.clear_query_cache
+  end
+
+  private
+
+  def connection
+    ActiveRecord::Base.connection
+  end
+
+  class IndexSet < ThinkingSphinx::IndexSet
+    private
+
+    def indices
+      return super if index_names.any?
+
+      prefixed = !multi_schema.current.include?('public')
+      super.select { |index|
+        prefixed ? index.name[/_two_core$/] : index.name[/_two_core$/].nil?
+      }
+    end
+
+    def multi_schema
+      @multi_schema ||= MultiSchema.new
+    end
+  end
+end