thinking-sphinx 1.5.0 → 2.0.0.rc1

data/lib/thinking_sphinx/source.rb

@@ -5,11 +5,11 @@ module ThinkingSphinx
   class Source
     include ThinkingSphinx::Source::InternalProperties
     include ThinkingSphinx::Source::SQL
-
+    
     attr_accessor :model, :fields, :attributes, :joins, :conditions, :groupings,
       :options
     attr_reader :base, :index, :database_configuration
-
+    
     def initialize(index, options = {})
       @index        = index
       @model        = index.model
@@ -22,123 +22,104 @@ module ThinkingSphinx
       @associations = {}
       @database_configuration = @model.connection.
         instance_variable_get(:@config).clone
-
+      
       @base = ::ActiveRecord::Associations::ClassMethods::JoinDependency.new(
         @model, [], nil
       )
-
+      
       unless @model.descends_from_active_record?
         stored_class = @model.store_full_sti_class ? @model.name : @model.name.demodulize
         @conditions << "#{@model.quoted_table_name}.#{quote_column(@model.inheritance_column)} = '#{stored_class}'"
       end
-
+      
       add_internal_attributes_and_facets
     end
-
+    
     def name
       index.name
     end
-
+    
     def to_riddle_for_core(offset, position)
       source = Riddle::Configuration::SQLSource.new(
         "#{index.core_name}_#{position}", adapter.sphinx_identifier
       )
-
+      
       set_source_database_settings  source
-      set_source_fields             source
       set_source_attributes         source, offset
       set_source_settings           source
       set_source_sql                source, offset
-
+      
       source
     end
-
+    
     def to_riddle_for_delta(offset, position)
       source = Riddle::Configuration::SQLSource.new(
         "#{index.delta_name}_#{position}", adapter.sphinx_identifier
       )
       source.parent = "#{index.core_name}_#{position}"
-
+      
       set_source_database_settings  source
-      set_source_fields             source
       set_source_attributes         source, offset, true
       set_source_settings           source
       set_source_sql                source, offset, true
-
+      
       source
     end
-
+    
     def delta?
       !@index.delta_object.nil?
     end
-
+    
     # Gets the association stack for a specific key.
-    #
+    # 
     def association(key)
       @associations[key] ||= Association.children(@model, key)
     end
-
+    
     private
-
+    
     def adapter
       @adapter ||= @model.sphinx_database_adapter
     end
-
-    def available_attributes
-      attributes.select { |attrib| attrib.available? }
-    end
-
+    
     def set_source_database_settings(source)
       config = @database_configuration
-
+      
       source.sql_host = config[:host]           || "localhost"
-      source.sql_user = config[:username]       || config[:user] || ENV['USER']
+      source.sql_user = config[:username]       || config[:user] || 'root'
       source.sql_pass = (config[:password].to_s || "").gsub('#', '\#')
       source.sql_db   = config[:database]
       source.sql_port = config[:port]
       source.sql_sock = config[:socket]
-
-      # MySQL SSL support
-      source.mysql_ssl_ca   = config[:sslca]   if config[:sslca]
-      source.mysql_ssl_cert = config[:sslcert] if config[:sslcert]
-      source.mysql_ssl_key  = config[:sslkey]  if config[:sslkey]
     end
-
-    def set_source_fields(source)
-      fields.each do |field|
-        source.sql_file_field   << field.unique_name if field.file?
-        source.sql_field_string << field.unique_name if field.with_attribute?
-        source.sql_field_str2wordcount << field.unique_name if field.with_wordcount?
-      end
-    end
-
+    
     def set_source_attributes(source, offset, delta = false)
-      available_attributes.each do |attrib|
+      attributes.each do |attrib|
         source.send(attrib.type_to_config) << attrib.config_value(offset, delta)
       end
     end
-
+    
     def set_source_sql(source, offset, delta = false)
       source.sql_query        = to_sql(:offset => offset, :delta => delta).gsub(/\n/, ' ')
       source.sql_query_range  = to_sql_query_range(:delta => delta)
       source.sql_query_info   = to_sql_query_info(offset)
-
+      
       source.sql_query_pre += send(!delta ? :sql_query_pre_for_core : :sql_query_pre_for_delta)
-
+      
       if @index.local_options[:group_concat_max_len]
         source.sql_query_pre << "SET SESSION group_concat_max_len = #{@index.local_options[:group_concat_max_len]}"
       end
-
+      
       source.sql_query_pre += [adapter.utf8_query_pre].compact if utf8?
       source.sql_query_pre << adapter.utc_query_pre
     end
-
+    
     def set_source_settings(source)
       config = ThinkingSphinx::Configuration.instance
       config.source_options.each do |key, value|
         source.send("#{key}=".to_sym, value)
       end
-
+      
       source_options = ThinkingSphinx::Configuration::SourceOptions
       @options.each do |key, value|
         if source_options.include?(key.to_s) && !value.nil?
@@ -146,11 +127,11 @@ module ThinkingSphinx
         end
       end
     end
-
+    
     # Returns all associations used amongst all the fields and attributes.
     # This includes all associations between the model and what the actual
     # columns are from.
-    #
+    # 
     def all_associations
       @all_associations ||= (
         # field associations
@@ -170,7 +151,7 @@ module ThinkingSphinx
         assoc.ancestors
       }.flatten.uniq
     end
-
+    
     def utf8?
       @index.options[:charset_type] =~ /utf-8|zh_cn.utf-8/
     end

data/lib/thinking_sphinx/source/internal_properties.rb

@@ -4,15 +4,10 @@ module ThinkingSphinx
       def add_internal_attributes_and_facets
         add_internal_attribute :sphinx_internal_id, nil,
           @model.primary_key_for_sphinx.to_sym
-        add_internal_attribute :sphinx_deleted,     :integer, "0"
         add_internal_attribute :class_crc,          :integer, crc_column, true
-        
-        unless Riddle.loaded_version.to_i < 2
-          add_internal_attribute :sphinx_internal_class, :string, internal_class_column, true
-          add_internal_facet :sphinx_internal_class
-        else
-          add_internal_facet :class_crc
-        end
+        add_internal_attribute :sphinx_deleted,     :integer, "0"
+
+        add_internal_facet :class_crc
       end
 
       def add_internal_attribute(name, type, contents, facet = false)

data/lib/thinking_sphinx/source/sql.rb

@@ -3,37 +3,39 @@ module ThinkingSphinx
     module SQL
       # Generates the big SQL statement to get the data back for all the fields
       # and attributes, using all the relevant association joins. If you want
-      # the version filtered for delta values, send through :delta => true in the
-      # options. Won't do much though if the index isn't set up to support a
+      # the version filtered for delta values, send through :delta => true in
+      # the options. Won't do much though if the index isn't set up to support a
       # delta sibling.
-      #
+      # 
       # Examples:
-      #
+      # 
       #   source.to_sql
       #   source.to_sql(:delta => true)
       #
       def to_sql(options={})
-        sql = "SELECT "
-        sql += "SQL_NO_CACHE " if adapter.sphinx_identifier == "mysql"
-        sql += <<-SQL
-#{ sql_select_clause options[:offset] }
-FROM #{ @model.quoted_table_name }
-  #{ all_associations.collect { |assoc| assoc.to_sql }.join(' ') }
-#{ sql_where_clause(options) }
-GROUP BY #{ sql_group_clause }
-        SQL
-
-        sql += " ORDER BY NULL" if adapter.sphinx_identifier == "mysql"
-        sql
+        relation    = @model.unscoped
+        pre_select  = 'SQL_NO_CACHE ' if adapter.sphinx_identifier == "mysql"
+        relation    = relation.select(
+          pre_select.to_s + sql_select_clause(options[:offset])
+        )
+
+        all_associations.each do |assoc|
+          relation = relation.joins(assoc.join.with_join_class(Arel::OuterJoin))
+        end
+
+        relation = relation.where(sql_where_clause(options))
+        relation = relation.group(sql_group_clause)
+        relation = relation.order('NULL') if adapter.sphinx_identifier == "mysql"
+        relation.to_sql
       end
 
       # Simple helper method for the query range SQL - which is a statement that
       # returns minimum and maximum id values. These can be filtered by delta -
       # so pass in :delta => true to get the delta version of the SQL.
-      #
+      # 
       def to_sql_query_range(options={})
         return nil if @index.options[:disable_range]
-
+        
         min_statement = adapter.convert_nulls(
           "MIN(#{quote_column(@model.primary_key_for_sphinx)})", 1
         )
@@ -52,17 +54,17 @@ GROUP BY #{ sql_group_clause }
 
       # Simple helper method for the query info SQL - which is a statement that
       # returns the single row for a corresponding id.
-      #
+      # 
       def to_sql_query_info(offset)
         "SELECT * FROM #{@model.quoted_table_name} WHERE " +
         "#{quote_column(@model.primary_key_for_sphinx)} = (($id - #{offset}) / #{ThinkingSphinx.context.indexed_models.size})"
       end
 
       def sql_select_clause(offset)
-        unique_id_expr = ThinkingSphinx.unique_id_expression(adapter, offset)
+        unique_id_expr = ThinkingSphinx.unique_id_expression(offset)
 
         (
-          ["#{@model.quoted_table_name}.#{quote_column(@model.primary_key_for_sphinx)} #{unique_id_expr} AS #{quote_column(@model.primary_key_for_sphinx)} "] +
+          ["#{@model.quoted_table_name}.#{quote_column(@model.primary_key_for_sphinx)} #{unique_id_expr} AS #{quote_column(@model.primary_key_for_sphinx)} "] + 
           @fields.collect     { |field|     field.to_select_sql     } +
           @attributes.collect { |attribute| attribute.to_select_sql }
         ).compact.join(", ")
@@ -80,7 +82,7 @@ GROUP BY #{ sql_group_clause }
         end
 
         logic += (@conditions || [])
-        logic.empty? ? "" : "WHERE #{logic.join(' AND ')}"
+        logic.join(' AND ')
       end
 
       def sql_group_clause
@@ -90,7 +92,7 @@ GROUP BY #{ sql_group_clause }
         end
 
         (
-          ["#{@model.quoted_table_name}.#{quote_column(@model.primary_key_for_sphinx)}"] +
+          ["#{@model.quoted_table_name}.#{quote_column(@model.primary_key_for_sphinx)}"] + 
           @fields.collect     { |field|     field.to_group_sql     }.compact +
           @attributes.collect { |attribute| attribute.to_group_sql }.compact +
           @groupings + internal_groupings
@@ -116,57 +118,15 @@ GROUP BY #{ sql_group_clause }
       def crc_column
         if @model.table_exists? &&
           @model.column_names.include?(@model.inheritance_column)
-
-          types = types_to_crcs
-          return @model.to_crc32.to_s if types.empty?
-
-          adapter.case(adapter.convert_nulls(
-            adapter.quote_with_table(@model.inheritance_column), @model.name),
-            types, @model.to_crc32)
+          
+          adapter.cast_to_unsigned(adapter.convert_nulls(
+            adapter.crc(adapter.quote_with_table(@model.inheritance_column), true),
+            @model.to_crc32
+          ))
         else
           @model.to_crc32.to_s
         end
       end
-
-      def internal_class_column
-        quoted_name = "'#{@model.name}'"
-
-        if @model.table_exists? &&
-          @model.column_names.include?(@model.inheritance_column)
-
-          types = types_to_hash
-          return quoted_name if types.empty?
-
-          adapter.case(adapter.convert_nulls(
-            adapter.quote_with_table(@model.inheritance_column), @model.name),
-            types, quoted_name)
-        else
-          quoted_name
-        end
-      end
-
-      def type_values
-        return @model.sphinx_types unless @model.sphinx_types.nil?
-
-        @model.connection.select_values <<-SQL
-SELECT DISTINCT #{@model.inheritance_column}
-FROM #{@model.table_name}
-        SQL
-      end
-
-      def types_to_crcs
-        type_values.compact.inject({}) { |hash, type|
-          hash[type] = type.to_crc32
-          hash
-        }
-      end
-
-      def types_to_hash
-        type_values.compact.inject({}) { |hash, type|
-          hash[type] = "'#{type}'"
-          hash
-        }
-      end
     end
   end
-end
+end

data/lib/thinking_sphinx/tasks.rb

@@ -1,56 +1,44 @@
 require 'fileutils'
-require 'timeout'
 
 namespace :thinking_sphinx do
   task :app_env do
-    if defined?(RAILS_ROOT)
+    if defined?(Rails)
       Rake::Task[:environment].invoke
-      if defined?(Rails.configuration)
-        Rails.configuration.cache_classes = false
-      else
-        Rails::Initializer.run { |config| config.cache_classes = false }
-      end
-    elsif defined?(Merb)
-      Rake::Task[:merb_env].invoke
-    elsif defined?(Sinatra)
-      Sinatra::Application.environment = ENV['RACK_ENV']
+      Rails.configuration.cache_classes = false
     end
+    
+    Rake::Task[:merb_env].invoke    if defined?(Merb)
   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?
     Rake::Task["thinking_sphinx:start"].invoke
   end
-
+  
   desc "Start a Sphinx searchd daemon using Thinking Sphinx's settings"
   task :start => :app_env do
     config = ThinkingSphinx::Configuration.instance
-
+    
     FileUtils.mkdir_p config.searchd_file_path
     raise RuntimeError, "searchd is already running." if sphinx_running?
-
+    
     Dir["#{config.searchd_file_path}/*.spl"].each { |file| File.delete(file) }
-
-    if ENV["NODETACH"] == "true"
-      unless pid = fork
-        config.controller.start(:nodetach => true)
-      end
-      Signal.trap('TERM') { Process.kill(:QUIT, pid) }
-      Signal.trap('INT')  { Process.kill(:QUIT, pid) }
-      Process.wait(pid)
+    
+    config.controller.start
+    
+    if sphinx_running?
+      puts "Started successfully (pid #{sphinx_pid})."
     else
-      config.controller.start
-
-      if sphinx_running?
-        puts "Started successfully (pid #{sphinx_pid})."
-      else
-        puts "Failed to start searchd daemon. Check #{config.searchd_log_file}"
-        puts "Be sure to run thinking_sphinx:index before thinking_sphinx:start"
-      end
+      puts "Failed to start searchd daemon. Check #{config.searchd_log_file}"
     end
   end
-
+  
   desc "Stop Sphinx using Thinking Sphinx's settings"
   task :stop => :app_env do
     unless sphinx_running?
@@ -59,26 +47,20 @@ namespace :thinking_sphinx do
       config = ThinkingSphinx::Configuration.instance
       pid    = sphinx_pid
       config.controller.stop
-
-      # Ensure searchd is stopped, but don't try too hard
-      Timeout.timeout(config.stop_timeout) do
-        sleep(1) until config.controller.stop
-      end
-
       puts "Stopped search daemon (pid #{pid})."
     end
   end
-
+  
   desc "Restart Sphinx"
   task :restart => [:app_env, :stop, :start]
-
+  
   desc "Generate the Sphinx configuration file using Thinking Sphinx's settings"
   task :configure => :app_env do
     config = ThinkingSphinx::Configuration.instance
     puts "Generating Configuration to #{config.config_file}"
     config.build
   end
-
+  
   desc "Index data for Sphinx using Thinking Sphinx's settings"
   task :index => :app_env do
     config = ThinkingSphinx::Configuration.instance
@@ -86,21 +68,18 @@ namespace :thinking_sphinx do
       puts "Generating Configuration to #{config.config_file}"
       config.build
     end
-
+    
     FileUtils.mkdir_p config.searchd_file_path
-    ThinkingSphinx.before_index_hooks.each { |hook| hook.call }
     config.controller.index :verbose => true
   end
-
+  
   desc "Reindex Sphinx without regenerating the configuration file"
   task :reindex => :app_env do
     config = ThinkingSphinx::Configuration.instance
     FileUtils.mkdir_p config.searchd_file_path
-    output = config.controller.index
-    puts output
-    config.touch_reindex_file(output)
+    puts config.controller.index
   end
-
+  
   desc "Stop Sphinx (if it's running), rebuild the indexes, and start Sphinx"
   task :rebuild => :app_env do
     Rake::Task["thinking_sphinx:stop"].invoke if sphinx_running?