tyrantmanager 1.1.0 → 1.2.0

data/HISTORY.rdoc

@@ -1,4 +1,10 @@
 = Changelog
+== Version 1.2.0 2009-09-13
+
+* have TyrantInstance use TyrantTable or Tyrant as appropriate for the connection
+* WARN if the configured lua extension file is missing
+* add in configuration of indexes for Table databases
+
 == Version 1.1.0 2009-08-10
 
 * change 'status' command to 'process-status'

data/data/default_instance_config.rb

@@ -158,6 +158,27 @@ Loquacious::Configuration.for( "<%= instance_name %>" ) do
  
   }
 
+  desc <<-txt
+  Column index configuration.  This is in the format of 'column_name' 'index type'
+  Tuning parameters.  Each of these alters a tuning parameter on the database.
+
+  Indexes only apply to databases of type 'table'.  A column may have only one 
+  index.
+
+  The available index types are:
+  |  lexical   - lexical string
+  |  decimal   - decimal string
+  |  token     - token inverted index
+  |  qgram     - q-gram inverted index
+  |  optimize  - the index is optimize
+  |  void      - the index is removed
+  txt
+
+  indexes {
+    # my_col [ "lexical" | "decimal" | "token" | "qgram" | "optimize" | "void" ]
+  }
+
+
   desc <<-txt
   The directory holding the database file.  By default this is relative
   to the instance directory.  If you want to put it somewhere else, then
@@ -219,6 +240,9 @@ Loquacious::Configuration.for( "<%= instance_name %>" ) do
   The name of a file to load as a lua extension.  By default this 
   is relative to the root of the instance directory.  This file will
   only be loaded if it exists.
+
+  If this is set to a value and the file does not exist, a WARN message
+  is printed to the log.
   txt
   lua_extension_file "lua/<%= instance_name %>.lua"
 

data/lib/tyrant_manager/tyrant_instance.rb

@@ -166,6 +166,17 @@ class TyrantManager
       @replication_timestamp_file ||= append_to_home_if_not_absolute( configuration.replication_timestamp_file )
     end
 
+    #
+    # Valid index styles as defined by Tokyo Cabinet
+    #
+    # See Tokyo Cabinet source code, tctdbstrtoindex() in
+    # tctdb.c
+    #
+    def index_types
+      %w[ lex lexical str dec decimal num tok token qgr qgram fts void optimize ]
+    end
+
+
 
     #
     # Start command.
@@ -174,90 +185,103 @@ class TyrantManager
     # into one big commandline item.  
     #
     def start_command
+      unless @start_command then
+        ##-- ttserver executable
+        parts = [ manager.configuration.ttserver ]
 
-      ##-- ttserver executable
-      parts = [ manager.configuration.ttserver ]
+        ##-- host and port
+        parts << "-host #{configuration.host}" if configuration.host
+        parts << "-port #{configuration.port}" if configuration.port
 
-      ##-- host and port
-      parts << "-host #{configuration.host}" if configuration.host
-      parts << "-port #{configuration.port}" if configuration.port
+        ##-- thread options
+        if thnum = cascading_config( 'thread_count' ) then
+          parts << "-thnum #{thnum}"
+        end
+        if tout = cascading_config( 'session_timeout' ) then
+          parts << "-tout #{tout}"
+        end
 
-      ##-- thread options
-      if thnum = cascading_config( 'thread_count' ) then
-        parts << "-thnum #{thnum}"
-      end
-      if tout = cascading_config( 'session_timeout' ) then
-        parts << "-tout #{tout}"
-      end
+        ##-- daemoization and pid
+        parts << "-dmn" if cascading_config( 'daemonize' )
+        parts << "-pid #{pid_file}"
+
+
+        ##-- logging
+        parts << "-log #{log_file}"
+        if log_level = cascading_config( 'log_level' ) then
+          if log_level == "error" then
+            parts << "-le"
+          elsif log_level == "debug" then
+            parts << "-ld" 
+          elsif log_level == "info" then
+            # leave it at info
+          else
+            raise Error, "Invalid log level setting [#{log_level}]"
+          end
+        end
+
+        ##-- update logs
+        parts << "-ulog #{ulog_dir}"
+        if ulim = cascading_config( 'update_log_size' )then
+          parts << "-ulim #{ulim}"
+        end
+        parts << "-uas" if cascading_config( 'update_log_async' )
+
+        ##-- replication items, server id, master, replication timestamp file
+        parts << "-sid #{configuration.server_id}"       if configuration.server_id
+        parts << "-mhost #{configuration.master_server}" if configuration.master_server
+        parts << "-mport #{configuration.master_port}"   if configuration.master_port
+        parts << "-rts #{replication_timestamp_file}" if configuration.replication_timestamp_file
+
+        ##-- lua extension
+        if configuration.lua_extension_file then
+          if File.exist?( lua_extension_file ) then
+            parts << "-ext #{lua_extension_file}" 
+            if pc = configuration.periodic_command then
+              if pc.name and pc.period then
+                parts << "-extpc #{pc.name} #{pc.period}"
+              end
+            end
+          else
+            logger.warn "lua extension file #{lua_extension_file} does not exist"
+          end
+        end
 
-      ##-- daemoization and pid
-      parts << "-dmn" if cascading_config( 'daemonize' )
-      parts << "-pid #{pid_file}"
+        ##-- command permissiosn
+        if deny = cascading_config( "deny_commands" ) then
+          parts << "-mask #{deny.join(",")}"
+        end
 
+        if allow = cascading_config( "allow_commands" ) then
+          parts << "-unmask #{allow.join(",")}"
+        end
 
-      ##-- logging
-      parts << "-log #{log_file}"
-      if log_level = cascading_config( 'log_level' ) then
-        if log_level == "error" then
-          parts << "-le"
-        elsif log_level == "debug" then
-          parts << "-ld" 
-        elsif log_level == "info" then
-          # leave it at info
-        else
-          raise Error, "Invalid log level setting [#{log_level}]"
+        ##-- now for the filename.  The format is
+        #  filename.ext#opts=ld#mode=wc#tuning_param=value#tuning_param=value#idx=field:dec...
+        #
+        file_pairs = []
+        file_pairs << "opts=#{configuration.opts}"
+        file_pairs << "mode=#{configuration.mode}"
+        Loquacious::Configuration::Iterator.new( configuration.tuning_params ).each do |node|
+          file_pairs << "#{node.name}=#{node.obj}" if node.obj
         end
-      end
 
-      ##-- update logs
-      parts << "-ulog #{ulog_dir}"
-      if ulim = cascading_config( 'update_log_size' )then
-        parts << "-ulim #{ulim}"
-      end
-      parts << "-uas" if cascading_config( 'update_log_async' )
-
-      ##-- replication items, server id, master, replication timestamp file
-      parts << "-sid #{configuration.server_id}"       if configuration.server_id
-      parts << "-mhost #{configuration.master_server}" if configuration.master_server
-      parts << "-mport #{configuration.master_port}"   if configuration.master_port
-      parts << "-rts #{replication_timestamp_file}" if configuration.replication_timestamp_file
-
-      ##-- lua extension
-      if configuration.lua_extension_file then
-        if File.exist?( lua_extension_file ) then
-          parts << "-ext #{lua_extension_file}" 
-          if pc = configuration.periodic_command then
-            if pc.name and pc.period then
-              parts << "-extpc #{pc.name} #{pc.period}"
+        if configuration.type == "table" then
+          Loquacious::Configuration::Iterator.new( configuration.indexes ).each do |index_node|
+            if index_node.obj and index_types.include?( index_node.obj.downcase ) then
+              file_pairs << "idx=#{index_node.name}:#{index_node.obj}"
             end
           end
         end
-      end
 
-      ##-- command permissiosn
-      if deny = cascading_config( "deny_commands" ) then
-        parts << "-mask #{deny.join(",")}"
-      end
+        file_name_and_params = "#{db_file}##{file_pairs.join("#")}"
 
-      if allow = cascading_config( "allow_commands" ) then
-        parts << "-unmask #{allow.join(",")}"
-      end
+        parts << file_name_and_params
 
-      ##-- now for the filename.  The format is
-      #  filename.ext#opts=ld#mode=wc#tuning_param=value#tuning_param=value...
-      #
-      file_pairs = []
-      file_pairs << "opts=#{configuration.opts}"
-      file_pairs << "mode=#{configuration.mode}"
-      Loquacious::Configuration::Iterator.new( configuration.tuning_params ).each do |node|
-        file_pairs << "#{node.name}=#{node.obj}" if node.obj
+        @start_command = parts.join( " " )
       end
 
-      file_name_and_params = "#{db_file}##{file_pairs.join("#")}"
-
-      parts << file_name_and_params
-
-      return parts.join( " " )  
+      return @start_command
     end
 
     #
@@ -325,7 +349,12 @@ class TyrantManager
       if host == "0.0.0.0" then
         host = "localhost"
       end
-      Rufus::Tokyo::Tyrant.new( configuration.host, configuration.port.to_i )
+      tclass = Rufus::Tokyo::Tyrant
+
+      if configuration.type == "table" then
+        tclass = Rufus::Tokyo::TyrantTable
+      end
+      tclass.new( configuration.host, configuration.port.to_i )
     end
 
     #

data/lib/tyrant_manager/version.rb

@@ -6,7 +6,7 @@
 class TyrantManager
   module Version
     MAJOR   = 1
-    MINOR   = 1
+    MINOR   = 2
     BUILD   = 0
 
     def to_a 

data/tasks/distribution.rake

@@ -18,7 +18,7 @@ if pkg_config = Configuration.for_if_exist?("packaging") then
 
     desc "Install as a gem"
     task :install => [:clobber, :package] do
-      sh "sudo gem install pkg/#{TyrantManager::GEM_SPEC.full_name}.gem"
+      sh "sudo gem install pkg/#{TyrantManager::GEM_SPEC.full_name}.gem --no-rdoc --no-ri --local"
     end
 
     desc "Uninstall gem"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tyrantmanager
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Jeremy Hinegardner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-10 00:00:00 -06:00
+date: 2009-09-13 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency