riddle 1.0.12 → 1.1.0

data/lib/riddle/client.rb

@@ -5,6 +5,7 @@ require 'riddle/client/response'
 module Riddle
   class VersionError < StandardError;  end
   class ResponseError < StandardError; end
+  class OutOfBoundsError < StandardError; end
   
   # This class was heavily based on the existing Client API by Dmytro Shteflyuk
   # and Alexy Kovyrin. Their code worked fine, I just wanted something a bit
@@ -529,6 +530,8 @@ module Riddle
           self.connection.call(self)
         elsif self.class.connection
           self.class.connection.call(self)
+        elsif @server.index('/') == 0
+          UNIXSocket.new @server
         else
           TCPSocket.new @server, @port
         end
@@ -598,7 +601,9 @@ module Riddle
         puts response[4, length]
         response[4 + length, response.length - 4 - length]
       when Statuses[:error], Statuses[:retry]
-        raise ResponseError, "searchd error (status: #{status}): #{response[4, response.length - 4]}"
+        message = response[4, response.length - 4]
+        klass = message[/out of bounds/] ? OutOfBoundsError : ResponseError
+        raise klass, "searchd error (status: #{status}): #{message}"
       else
         raise ResponseError, "Unknown searchd error (status: #{status})"
       end

data/lib/riddle/configuration.rb

@@ -3,6 +3,7 @@ require 'riddle/configuration/section'
 require 'riddle/configuration/distributed_index'
 require 'riddle/configuration/index'
 require 'riddle/configuration/indexer'
+require 'riddle/configuration/realtime_index'
 require 'riddle/configuration/remote_index'
 require 'riddle/configuration/searchd'
 require 'riddle/configuration/source'

data/lib/riddle/configuration/index.rb

@@ -1,27 +1,28 @@
 module Riddle
   class Configuration
     class Index < Riddle::Configuration::Section
-      self.settings = [:source, :path, :docinfo, :mlock, :morphology,
+      self.settings = [:type, :source, :path, :docinfo, :mlock, :morphology,
         :min_stemming_len, :stopwords, :wordforms, :exceptions, :min_word_len,
         :charset_dictpath, :charset_type, :charset_table, :ignore_chars,
         :min_prefix_len, :min_infix_len, :prefix_fields, :infix_fields,
-        :enable_star, :ngram_len, :ngram_chars, :phrase_boundary,
-        :phrase_boundary_step, :html_strip, :html_index_attrs,
-        :html_remove_elements, :preopen, :ondisk_dict, :inplace_enable,
-        :inplace_hit_gap, :inplace_docinfo_gap, :inplace_reloc_factor,
-        :inplace_write_factor, :index_exact_words, :overshort_step,
-        :stopwords_step]
+        :enable_star, :expand_keywords, :ngram_len, :ngram_chars,
+        :phrase_boundary, :phrase_boundary_step, :blend_chars, :html_strip,
+        :html_index_attrs, :html_remove_elements, :preopen, :ondisk_dict,
+        :inplace_enable, :inplace_hit_gap, :inplace_docinfo_gap,
+        :inplace_reloc_factor, :inplace_write_factor, :index_exact_words,
+        :overshort_step, :stopwords_step, :hitless_words]
       
-      attr_accessor :name, :parent, :sources, :path, :docinfo, :mlock,
+      attr_accessor :name, :parent, :type, :sources, :path, :docinfo, :mlock,
         :morphologies, :min_stemming_len, :stopword_files, :wordform_files,
         :exception_files, :min_word_len, :charset_dictpath, :charset_type,
         :charset_table, :ignore_characters, :min_prefix_len, :min_infix_len,
-        :prefix_field_names, :infix_field_names, :enable_star, :ngram_len,
-        :ngram_characters, :phrase_boundaries, :phrase_boundary_step,
-        :html_strip, :html_index_attrs, :html_remove_element_tags, :preopen,
-        :ondisk_dict, :inplace_enable, :inplace_hit_gap, :inplace_docinfo_gap,
-        :inplace_reloc_factor, :inplace_write_factor, :index_exact_words,
-        :overshort_step, :stopwords_step
+        :prefix_field_names, :infix_field_names, :enable_star, :expand_keywords,
+        :ngram_len, :ngram_characters, :phrase_boundaries,
+        :phrase_boundary_step, :blend_chars, :html_strip, :html_index_attrs,
+        :html_remove_element_tags, :preopen, :ondisk_dict, :inplace_enable,
+        :inplace_hit_gap, :inplace_docinfo_gap, :inplace_reloc_factor,
+        :inplace_write_factor, :index_exact_words, :overshort_step,
+        :stopwords_step, :hitless_words
       
       def initialize(name, *sources)
         @name                     = name

data/lib/riddle/configuration/indexer.rb

@@ -2,7 +2,7 @@ module Riddle
   class Configuration
     class Indexer < Riddle::Configuration::Section
       self.settings = [:mem_limit, :max_iops, :max_iosize, :max_xmlpipe2_field,
-        :write_buffer]
+        :write_buffer, :max_file_field_buffer]
       
       attr_accessor *self.settings
             

data/lib/riddle/configuration/realtime_index.rb

@@ -0,0 +1,39 @@
+module Riddle
+  class Configuration
+    class RealtimeIndex < Riddle::Configuration::Section
+      self.settings = [:type, :path, :rt_mem_limit, :rt_field, :rt_attr_uint,
+        :rt_attr_bigint, :rt_attr_float, :rt_attr_timestamp, :rt_attr_string]
+      
+      attr_accessor :name
+      attr_accessor *self.settings
+      
+      def initialize(name)
+        @name               = name
+        @rt_field           = []
+        @rt_attr_uint       = []
+        @rt_attr_bigint     = []
+        @rt_attr_float      = []
+        @rt_attr_timestamp  = []
+        @rt_attr_string     = []
+      end
+      
+      def type
+        "rt"
+      end
+      
+      def valid?
+        !(@name.nil? || @path.nil?)
+      end
+      
+      def render
+        raise ConfigurationError unless valid?
+        
+        (
+          ["index #{name}", "{"] +
+          settings_body +
+          ["}", ""]
+        ).join("\n")
+      end
+    end
+  end
+end

data/lib/riddle/configuration/searchd.rb

@@ -6,7 +6,9 @@ module Riddle
         :seamless_rotate, :preopen_indexes, :unlink_old, :attr_flush_period,
         :ondisk_dict_default, :max_packet_size, :mva_updates_pool,
         :crash_log_path, :max_filters, :max_filter_values, :listen_backlog,
-        :read_buffer, :read_unhinted]
+        :read_buffer, :read_unhinted, :max_batch_queries, :subtree_docs_cache,
+        :subtree_hits_cache, :workers, :dist_threads, :binlog_path,
+        :binlog_flush, :binlog_max_log_size]
       
       attr_accessor *self.settings
             

data/lib/riddle/configuration/sql_source.rb

@@ -4,12 +4,14 @@ module Riddle
       self.settings = [:type, :sql_host, :sql_user, :sql_pass, :sql_db,
         :sql_port, :sql_sock, :mysql_connect_flags, :mysql_ssl_cert,
         :mysql_ssl_key, :mysql_ssl_ca, :odbc_dsn, :sql_query_pre, :sql_query,
-        :sql_query_range, :sql_range_step, :sql_query_killlist, :sql_attr_uint,
-        :sql_attr_bool, :sql_attr_bigint, :sql_attr_timestamp,
-        :sql_attr_str2ordinal, :sql_attr_float, :sql_attr_multi,
-        :sql_query_post, :sql_query_post_index, :sql_ranged_throttle,
-        :sql_query_info, :mssql_winauth, :mssql_unicode, :unpack_zlib,
-        :unpack_mysqlcompress, :unpack_mysqlcompress_maxsize]
+        :sql_joined_field, :sql_file_field, :sql_query_range, :sql_range_step,
+        :sql_query_killlist, :sql_attr_uint, :sql_attr_bool, :sql_attr_bigint,
+        :sql_attr_timestamp, :sql_attr_str2ordinal, :sql_attr_float,
+        :sql_attr_multi, :sql_attr_string, :sql_attr_str2wordcount,
+        :sql_field_string, :sql_field_str2wordcount, :sql_query_post,
+        :sql_query_post_index, :sql_ranged_throttle, :sql_query_info,
+        :mssql_winauth, :mssql_unicode, :unpack_zlib, :unpack_mysqlcompress,
+        :unpack_mysqlcompress_maxsize]
       
       attr_accessor *self.settings
       
@@ -17,18 +19,24 @@ module Riddle
         @name = name
         @type = type
         
-        @sql_query_pre        = []
-        @sql_attr_uint        = []
-        @sql_attr_bool        = []
-        @sql_attr_bigint      = []
-        @sql_attr_timestamp   = []
-        @sql_attr_str2ordinal = []
-        @sql_attr_float       = []
-        @sql_attr_multi       = []
-        @sql_query_post       = []
-        @sql_query_post_index = []
-        @unpack_zlib          = []
-        @unpack_mysqlcompress = []
+        @sql_query_pre            = []
+        @sql_joined_field         = []
+        @sql_file_field           = []
+        @sql_attr_uint            = []
+        @sql_attr_bool            = []
+        @sql_attr_bigint          = []
+        @sql_attr_timestamp       = []
+        @sql_attr_str2ordinal     = []
+        @sql_attr_float           = []
+        @sql_attr_multi           = []
+        @sql_attr_string          = []
+        @sql_attr_str2wordcount   = []
+        @sql_field_string         = []
+        @sql_field_str2wordcount  = []
+        @sql_query_post           = []
+        @sql_query_post_index     = []
+        @unpack_zlib              = []
+        @unpack_mysqlcompress     = []
       end
       
       def valid?

data/lib/riddle/controller.rb

@@ -45,10 +45,12 @@ module Riddle
     end
     
     def stop
-      return unless running?
+      return true unless running?
       Process.kill('SIGTERM', pid.to_i)
     rescue Errno::EINVAL
       Process.kill('SIGKILL', pid.to_i)
+    ensure
+      return !running?
     end
     
     def pid

data/spec/unit/configuration/realtime_index_spec.rb

@@ -0,0 +1,65 @@
+require 'spec/spec_helper'
+
+describe Riddle::Configuration::RealtimeIndex do
+  let(:index) { Riddle::Configuration::RealtimeIndex.new('rt1') }
+  
+  describe '#valid?' do
+    it "should not be valid without a name" do
+      index.name = nil
+      index.path = 'foo'
+      index.should_not be_valid
+    end
+    
+    it "should not be valid without a path" do
+      index.path = nil
+      index.should_not be_valid
+    end
+    
+    it "should be valid with a name and path" do
+      index.path = 'foo'
+      index.should be_valid
+    end
+  end
+  
+  describe '#type' do
+    it "should be 'rt'" do
+      index.type.should == 'rt'
+    end
+  end
+  
+  describe '#render' do
+    it "should raise a ConfigurationError if rendering when not valid" do
+      lambda {
+        index.render
+      }.should raise_error(Riddle::Configuration::ConfigurationError)
+    end
+  
+    it "should render correctly if supplied settings are valid" do
+      index.path = '/var/data/rt'
+      index.rt_mem_limit = '512M'
+      index.rt_field << 'title' << 'content'
+      
+      index.rt_attr_uint      << 'gid'
+      index.rt_attr_bigint    << 'guid'
+      index.rt_attr_float     << 'gpa'
+      index.rt_attr_timestamp << 'ts_added'
+      index.rt_attr_string    << 'author'
+          
+      index.render.should == <<-RTINDEX
+index rt1
+{
+  type = rt
+  path = /var/data/rt
+  rt_mem_limit = 512M
+  rt_field = title
+  rt_field = content
+  rt_attr_uint = gid
+  rt_attr_bigint = guid
+  rt_attr_float = gpa
+  rt_attr_timestamp = ts_added
+  rt_attr_string = author
+}
+      RTINDEX
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: riddle
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 19
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 12
-  version: 1.0.12
+  version: 1.1.0
 platform: ruby
 authors: 
 - Pat Allan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-27 00:00:00 +10:00
+date: 2010-08-29 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,6 +75,7 @@ files:
 - lib/riddle/configuration/distributed_index.rb
 - lib/riddle/configuration/index.rb
 - lib/riddle/configuration/indexer.rb
+- lib/riddle/configuration/realtime_index.rb
 - lib/riddle/configuration/remote_index.rb
 - lib/riddle/configuration/searchd.rb
 - lib/riddle/configuration/section.rb
@@ -100,6 +101,7 @@ files:
 - spec/unit/configuration/distributed_index_spec.rb
 - spec/unit/configuration/index_spec.rb
 - spec/unit/configuration/indexer_spec.rb
+- spec/unit/configuration/realtime_index_spec.rb
 - spec/unit/configuration/searchd_spec.rb
 - spec/unit/configuration/source_spec.rb
 - spec/unit/configuration/sql_source_spec.rb
@@ -162,6 +164,7 @@ test_files:
 - spec/unit/configuration/distributed_index_spec.rb
 - spec/unit/configuration/index_spec.rb
 - spec/unit/configuration/indexer_spec.rb
+- spec/unit/configuration/realtime_index_spec.rb
 - spec/unit/configuration/searchd_spec.rb
 - spec/unit/configuration/source_spec.rb
 - spec/unit/configuration/sql_source_spec.rb