rufus-tokyo 0.1.11 → 0.1.12

data/CHANGELOG.txt

@@ -2,6 +2,14 @@
 = rufus-tokyo CHANGELOG.txt
 
 
+== rufus-tokyo - 0.1.12    released 2009/04/07
+
+- todo  : added ext method for calling embedded Lua function (Tyrant)
+- todo  : added transaction support for Rufus::Tokyo::Cabinet
+- todo  : mimicking query.count in rufus/edo
+- todo  : implemented query.count (TC 1.4.12 and TT 1.1.20 only) rufus/tokyo
+
+
 == rufus-tokyo - 0.1.11    released 2009/03/25
 
 - todo  : autodetecting /usr/lib/libtokyocabinet.so and

data/TODO.txt

@@ -9,6 +9,9 @@
 [x] edo : tran
 [ ] bench ux socket
 
+[ ] TT (TC) call [lua] function
+[ ] queryout
+
 [ ] impl lget/lput/ldelete in Rufus::Edo::Cabinet
 
 [ ] maybe supported different libs for migrations...

data/lib/rufus/edo/cabcore.rb

@@ -1,4 +1,3 @@
-#
 #--
 # Copyright (c) 2009, John Mettraux, jmettraux@gmail.com
 #
@@ -19,14 +18,10 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-#++
 #
+# Made in Japan.
+#++
 
-#
-# "made in Japan"
-#
-# jmettraux@gmail.com
-#
 
 require 'rufus/tokyo/hmethods'
 require 'rufus/tokyo/transactions'

data/lib/rufus/edo/cabinet/abstract.rb

@@ -1,4 +1,3 @@
-#
 #--
 # Copyright (c) 2009, John Mettraux, jmettraux@gmail.com
 #
@@ -19,14 +18,10 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-#++
 #
+# Made in Japan.
+#++
 
-#
-# "made in Japan"
-#
-# jmettraux@gmail.com
-#
 
 require 'tokyocabinet' # gem install careo-tokyocabinet
 

data/lib/rufus/edo/cabinet/table.rb

@@ -1,4 +1,3 @@
-#
 #--
 # Copyright (c) 2009, John Mettraux, jmettraux@gmail.com
 #
@@ -19,14 +18,10 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-#++
 #
+# Made in Japan.
+#++
 
-#
-# "made in Japan"
-#
-# jmettraux@gmail.com
-#
 
 require 'tokyocabinet'
 

data/lib/rufus/edo/error.rb

@@ -1,4 +1,3 @@
-#
 #--
 # Copyright (c) 2009, John Mettraux, jmettraux@gmail.com
 #
@@ -19,14 +18,10 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-#++
 #
+# Made in Japan.
+#++
 
-#
-# "made in Japan"
-#
-# jmettraux@gmail.com
-#
 
 module Rufus
 module Edo

data/lib/rufus/edo/ntyrant/abstract.rb

@@ -1,4 +1,3 @@
-#
 #--
 # Copyright (c) 2009, John Mettraux, jmettraux@gmail.com
 #
@@ -19,20 +18,16 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-#++
 #
+# Made in Japan.
+#++
 
-#
-# "made in Japan"
-#
-# jmettraux@gmail.com
-#
 
 require 'tokyotyrant' # gem install careo-tokyotyrant
 
 require 'rufus/edo/error'
 require 'rufus/edo/cabcore'
-require 'rufus/tokyo/stats'
+require 'rufus/tokyo/ttcommons'
 
 
 module Rufus::Edo
@@ -48,11 +43,10 @@ module Rufus::Edo
   class NetTyrant
 
     include Rufus::Edo::CabinetCore
-    include Rufus::Tokyo::TyrantStats
+    include Rufus::Tokyo::TyrantCommons
 
     attr_reader :host, :port
 
-    #
     # Connects to a given Tokyo Tyrant server.
     #
     # Note that if the port is not specified, the host parameter is expected
@@ -92,7 +86,6 @@ module Rufus::Edo
       end
     end
 
-    #
     # Returns the 'weight' of the db (in bytes)
     #
     def weight
@@ -100,7 +93,6 @@ module Rufus::Edo
       self.stat['size']
     end
 
-    #
     # isn't that a bit dangerous ? it creates a file on the server...
     #
     # DISABLED.
@@ -111,7 +103,6 @@ module Rufus::Edo
       raise 'not allowed to create files on the server'
     end
 
-    #
     # Copies the current cabinet to a new file.
     #
     # Does it by copying each entry afresh to the target file. Spares some
@@ -122,7 +113,6 @@ module Rufus::Edo
       raise NotImplementedError.new('not creating files locally')
     end
 
-    #
     # Deletes all the entries whose keys begin with the given prefix
     #
     def delete_keys_with_prefix (prefix)
@@ -131,7 +121,6 @@ module Rufus::Edo
       nil
     end
 
-    #
     # Given a list of keys, returns a Hash { key => value } of the
     # matching entries (in one sweep).
     #
@@ -140,7 +129,6 @@ module Rufus::Edo
       Hash[*@db.misc('getlist', keys)]
     end
 
-    #
     # Merges the given hash into this Tyrant and returns self.
     #
     def merge! (hash)
@@ -150,7 +138,6 @@ module Rufus::Edo
     end
     alias :lput :merge!
 
-    #
     # Given a list of keys, deletes all the matching entries (in one sweep).
     #
     def ldelete (keys)
@@ -159,6 +146,20 @@ module Rufus::Edo
       nil
     end
 
+    # Calls a lua embedded function
+    # (http://tokyocabinet.sourceforge.net/tyrantdoc/#luaext)
+    #
+    # Options are :global_locking and :record_locking
+    #
+    # Returns the return value of the called function.
+    #
+    # Nil is returned in case of failure.
+    #
+    def ext (func_name, key, value, opts={})
+
+      @db.ext(func_name.to_s, key.to_s, value.to_s, compute_ext_opts(opts))
+    end
+
     protected
 
     def do_stat #:nodoc#

data/lib/rufus/edo/ntyrant/table.rb

@@ -27,7 +27,7 @@ require 'tokyotyrant'
 
 require 'rufus/edo/error'
 require 'rufus/edo/tabcore'
-require 'rufus/tokyo/stats'
+require 'rufus/tokyo/ttcommons'
 
 
 module Rufus::Edo
@@ -48,7 +48,7 @@ module Rufus::Edo
   class NetTyrantTable
 
     include Rufus::Edo::TableCore
-    include Rufus::Tokyo::TyrantStats
+    include Rufus::Tokyo::TyrantCommons
 
     attr_reader :host, :port
 

data/lib/rufus/edo/tabcore.rb

@@ -431,7 +431,19 @@ module Rufus::Edo
     # Runs this query (returns a TableResultSet instance)
     #
     def run
-      TableResultSet.new(@table, @query.search, @opts)
+      @last_resultset = TableResultSet.new(@table, @query.search, @opts)
+    end
+
+    #
+    # Returns the count of results this query return when last run.
+    # Returns 0 if the query was not yet run.
+    #
+    def count
+
+      #@query.count
+        # not yet implemented by Hirabayashi-san
+
+      @last_resultset ? @last_resultset.size : 0
     end
 
     #

data/lib/rufus/tokyo/cabinet/abstract.rb

@@ -1,4 +1,3 @@
-#
 #--
 # Copyright (c) 2009, John Mettraux, jmettraux@gmail.com
 #
@@ -19,14 +18,13 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-#++
 #
+# Made in Japan.
+#++
+
+
+require 'rufus/tokyo/transactions'
 
-#
-# "made in Japan"
-#
-# jmettraux@gmail.com
-#
 
 module Rufus::Tokyo
 
@@ -53,6 +51,7 @@ module Rufus::Tokyo
   class Cabinet
 
     include HashMethods
+    include Transactions
 
     #
     # Creates/opens the cabinet, raises an exception in case of
@@ -396,8 +395,52 @@ module Rufus::Tokyo
       call_misc('outlist', Rufus::Tokyo::List.new(keys))
     end
 
+    # Warning : this method is low-level, you probably only need
+    # to use #transaction and a block.
+    #
+    # Direct call for 'transaction begin'.
+    #
+    def tranbegin
+
+      check_transaction_support
+
+      libcall(:tcadbtranbegin)
+    end
+
+    # Warning : this method is low-level, you probably only need
+    # to use #transaction and a block.
+    #
+    # Direct call for 'transaction commit'.
+    #
+    def trancommit
+
+      check_transaction_support
+
+      libcall(:tcadbtrancommit)
+    end
+
+    # Warning : this method is low-level, you probably only need
+    # to use #transaction and a block.
+    #
+    # Direct call for 'transaction abort'.
+    #
+    def tranabort
+
+      check_transaction_support
+
+      libcall(:tcadbtranabort)
+    end
+
     protected
 
+    def check_transaction_support
+
+      raise(TokyoError.new(
+        "The version of Tokyo Cabinet you're using doesn't support " +
+        "transactions for non-table structures. Upgrade to TC >= 1.4.13.")
+      ) unless lib.respond_to?(:tcadbtranbegin)
+    end
+
     #
     # wrapping tcadbmisc or tcrdbmisc
     # (and taking care of freeing the list_pointer)
@@ -416,10 +459,18 @@ module Rufus::Tokyo
       end
     end
 
+    # calls the tcadbmisc function
+    #
     def do_call_misc (function, list_pointer)
 
       lib.tcadbmisc(@db, function, list_pointer)
     end
+
+    def libcall (lib_method, *args)
+
+      (eval(%{ lib.#{lib_method}(@db, *args) }) == 1) or \
+        raise TokyoError.new("call to #{lib_method} failed")
+    end
   end
 end
 

data/lib/rufus/tokyo/cabinet/lib.rb

@@ -42,14 +42,17 @@ module Rufus::Tokyo
       /usr/local/lib/libtokyocabinet.so
     })
 
-    path = paths.find { |path| File.exist?(path) }
+    begin
 
-    raise(
-      "didn't find Tokyo Cabinet libs on your system. " +
-      "Please install Tokyo Cabinet (http://tokyocabinet.sf.net)"
-    ) unless path
+      ffi_lib(*paths)
 
-    ffi_lib(path)
+    rescue LoadError => le
+      raise(
+        "didn't find Tokyo Cabinet libs on your system. " +
+        "Please install Tokyo Cabinet (http://tokyocabinet.sf.net) " +
+        "(see also http://openwferu.rubyforge.org/tokyo.html)"
+      )
+    end
 
     class << self
       alias :attfunc :attach_function
@@ -97,6 +100,13 @@ module Rufus::Tokyo
 
     attfunc :tcadbmisc, [ :pointer, :string, :pointer ], :pointer
 
+    begin # since TC 1.4.13
+      attfunc :tcadbtranbegin, [ :pointer ], :int
+      attfunc :tcadbtrancommit, [ :pointer ], :int
+      attfunc :tcadbtranabort, [ :pointer ], :int
+    rescue FFI::NotFoundError => nfe
+    end
+
     #
     # tctdb functions
     #
@@ -154,7 +164,7 @@ module Rufus::Tokyo
     attfunc :qry_addcond, :tctdbqryaddcond, [ :pointer, :string, :int, :string ], :void
     attfunc :qry_setorder, :tctdbqrysetorder, [ :pointer, :string, :int ], :void
 
-    begin
+    begin # since TC 1.4.10
       attfunc :qry_setmax, :tctdbqrysetmax, [ :pointer, :int ], :void
     rescue FFI::NotFoundError => nfe
       attfunc :qry_setlimit, :tctdbqrysetlimit, [ :pointer, :int, :int ], :void
@@ -162,6 +172,11 @@ module Rufus::Tokyo
 
     attfunc :qry_search, :tctdbqrysearch, [ :pointer ], :pointer
 
+    begin # since TC 1.4.12
+      attfunc :qry_count, :tctdbqrycount, [ :pointer ], :int
+    rescue FFI::NotFoundError => nfe
+    end
+
     #
     # tcmap functions
     #

data/lib/rufus/tokyo/cabinet/table.rb

@@ -287,6 +287,8 @@ module Rufus::Tokyo
     #
     def delete_keys_with_prefix (prefix)
 
+      # TODO : use ...searchout
+
       ks = lib.tab_fwmkeys2(@db, prefix, -1) # -1 for no limit
       #Rufus::Tokyo::List.new(ks).release.each { |k| self.delete(k) }
       begin
@@ -335,7 +337,6 @@ module Rufus::Tokyo
       a
     end
 
-    #
     # Warning : this method is low-level, you probably only need
     # to use #transaction and a block.
     #
@@ -345,7 +346,6 @@ module Rufus::Tokyo
       libcall(:tctdbtranbegin)
     end
 
-    #
     # Warning : this method is low-level, you probably only need
     # to use #transaction and a block.
     #
@@ -355,7 +355,6 @@ module Rufus::Tokyo
       libcall(:tctdbtrancommit)
     end
 
-    #
     # Warning : this method is low-level, you probably only need
     # to use #transaction and a block.
     #
@@ -403,7 +402,7 @@ module Rufus::Tokyo
       err_code = lib.tab_ecode(@db)
       err_msg = lib.tab_errmsg(err_code)
 
-      raise TokyoError, "(err #{err_code}) #{err_msg}"
+      raise TokyoError.new("(err #{err_code}) #{err_msg}")
     end
   end
 
@@ -557,7 +556,23 @@ module Rufus::Tokyo
     # Runs this query (returns a TableResultSet instance)
     #
     def run
-      TableResultSet.new(@table, lib.qry_search(@query), @opts)
+
+      @last_resultset =
+        TableResultSet.new(@table, lib.qry_search(@query), @opts)
+    end
+
+    #
+    # Gets the count of records returned by this query.
+    #
+    # Note : the 'real' impl is only available since TokyoCabinet 1.4.12.
+    #
+    def count
+
+      if lib.respond_to?(:qry_count)
+        lib.qry_count(@query)
+      else
+        @last_resultset ? @last_resultset.size : 0
+      end
     end
 
     #

data/lib/rufus/tokyo/cabinet/util.rb

@@ -1,4 +1,3 @@
-#
 #--
 # Copyright (c) 2009, John Mettraux, jmettraux@gmail.com
 #
@@ -19,14 +18,10 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-#++
 #
+# Made in Japan.
+#++
 
-#
-# "made in Japan"
-#
-# jmettraux@gmail.com
-#
 
 require 'rufus/tokyo/hmethods'
 

data/lib/rufus/tokyo/config.rb

@@ -1,4 +1,3 @@
-#
 #--
 # Copyright (c) 2009, John Mettraux, jmettraux@gmail.com
 #
@@ -19,14 +18,10 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-#++
 #
+# Made in Japan.
+#++
 
-#
-# "made in Japan"
-#
-# jmettraux@gmail.com
-#
 
 module Rufus
 module Tokyo

data/lib/rufus/tokyo/dystopia/lib.rb

@@ -1,4 +1,3 @@
-#
 #--
 # Copyright (c) 2009, John Mettraux, jmettraux@gmail.com
 #
@@ -19,14 +18,10 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-#++
 #
+# Made in Japan.
+#++
 
-#
-# "made in Japan"
-#
-# jmettraux@gmail.com
-#
 
 module Rufus::Tokyo
 

data/lib/rufus/tokyo/dystopia/words.rb

@@ -1,4 +1,3 @@
-#
 #--
 # Copyright (c) 2009, John Mettraux, jmettraux@gmail.com
 #
@@ -19,14 +18,10 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-#++
 #
+# Made in Japan.
+#++
 
-#
-# "made in Japan"
-#
-# jmettraux@gmail.com
-#
 
 module Rufus::Tokyo
 

data/lib/rufus/tokyo/dystopia.rb

@@ -1,4 +1,3 @@
-#
 #--
 # Copyright (c) 2009, John Mettraux, jmettraux@gmail.com
 #
@@ -19,14 +18,10 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-#++
 #
+# Made in Japan.
+#++
 
-#
-# "made in Japan"
-#
-# jmettraux@gmail.com
-#
 
 require 'rufus/tokyo'
 

data/lib/rufus/tokyo/hmethods.rb

@@ -1,4 +1,3 @@
-#
 #--
 # Copyright (c) 2009, John Mettraux, jmettraux@gmail.com
 #
@@ -19,14 +18,10 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-#++
 #
+# Made in Japan.
+#++
 
-#
-# "made in Japan"
-#
-# jmettraux@gmail.com
-#
 
 module Rufus
 module Tokyo

data/lib/rufus/tokyo/query.rb

@@ -1,4 +1,3 @@
-#
 #--
 # Copyright (c) 2009, John Mettraux, jmettraux@gmail.com
 #
@@ -19,14 +18,10 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-#++
 #
+# Made in Japan.
+#++
 
-#
-# "made in Japan"
-#
-# jmettraux@gmail.com
-#
 
 module Rufus
 module Tokyo

data/lib/rufus/tokyo/transactions.rb

@@ -1,4 +1,3 @@
-#
 #--
 # Copyright (c) 2009, John Mettraux, jmettraux@gmail.com
 #
@@ -19,14 +18,10 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-#++
 #
+# Made in Japan.
+#++
 
-#
-# "made in Japan"
-#
-# jmettraux@gmail.com
-#
 
 module Rufus
 module Tokyo

data/lib/rufus/tokyo/{stats.rb → ttcommons.rb}

@@ -1,4 +1,3 @@
-#
 #--
 # Copyright (c) 2009, John Mettraux, jmettraux@gmail.com
 #
@@ -19,24 +18,19 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-#++
 #
+# Made in Japan.
+#++
 
-#
-# "made in Japan"
-#
-# jmettraux@gmail.com
-#
 
 module Rufus
 module Tokyo
 
   #
-  # Just a handy #stat method for now
+  # #stat and #compte_ext_opts, that's all.
   #
-  module TyrantStats
+  module TyrantCommons
 
-    #
     # Returns a hash of information about the Tokyo Tyrant database (or table)
     # at the other end of the connection.
     #
@@ -48,6 +42,17 @@ module Tokyo
         r
       }
     end
+
+    # Computes the :int option for the "ext" function (triggering
+    # tyrant embedded lua functions)
+    #
+    def compute_ext_opts (opts)
+
+      r = 0
+      r = r | 1 if opts[:record_locking]
+      r = r | 2 if opts[:global_locking]
+      r
+    end
   end
 end
 end

data/lib/rufus/tokyo/tyrant/abstract.rb

@@ -1,4 +1,3 @@
-#
 #--
 # Copyright (c) 2009, John Mettraux, jmettraux@gmail.com
 #
@@ -19,16 +18,12 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-#++
 #
+# Made in Japan.
+#++
 
-#
-# "made in Japan"
-#
-# jmettraux@gmail.com
-#
 
-require 'rufus/tokyo/stats'
+require 'rufus/tokyo/ttcommons'
 
 
 module Rufus::Tokyo
@@ -43,11 +38,10 @@ module Rufus::Tokyo
   #
   class Tyrant < Cabinet
 
-    include TyrantStats
+    include TyrantCommons
 
     attr_reader :host, :port
 
-    #
     # Connects to a given Tokyo Tyrant server.
     #
     # Note that if the port is not specified, the host parameter is expected
@@ -89,14 +83,12 @@ module Rufus::Tokyo
       end
     end
 
-    #
     # Using the tyrant lib
     #
     def lib
       TyrantLib
     end
 
-    #
     # isn't that a bit dangerous ? it creates a file on the server...
     #
     # DISABLED.
@@ -106,6 +98,22 @@ module Rufus::Tokyo
       raise 'not allowed to create files on the server'
     end
 
+    # Calls a lua embedded function
+    # (http://tokyocabinet.sourceforge.net/tyrantdoc/#luaext)
+    #
+    # Options are :global_locking and :record_locking
+    #
+    # Returns the return value of the called function.
+    #
+    # Nil is returned in case of failure.
+    #
+    def ext (func_name, key, value, opts={})
+
+      lib.tcrdbext2(
+        @db, func_name.to_s, compute_ext_opts(opts), key.to_s, value.to_s
+      ) rescue nil
+    end
+
     protected
 
     def do_call_misc (function, list_pointer)
@@ -114,10 +122,10 @@ module Rufus::Tokyo
         # opts always to 0 for now
     end
 
-    #
     # Returns the raw stat string from the Tyrant server.
     #
     def do_stat
+
       lib.tcrdbstat(@db)
     end
   end

data/lib/rufus/tokyo/tyrant/lib.rb

@@ -43,11 +43,18 @@ module Rufus::Tokyo
       /usr/local/lib/libtokyotyrant.so
     })
 
-    path = paths.find { |path| File.exist?(path) }
+    begin
+
+      ffi_lib(*paths)
 
-    raise "Did not find Tokyo Tyrant libraries on your system" unless path
+    rescue LoadError => le
+      raise(
+        "didn't find Tokyo Tyrant libs on your system. " +
+        "Please install Tokyo Tyrant (http://tokyocabinet.sf.net) " +
+        "(see also http://openwferu.rubyforge.org/tokyo.html)"
+      )
+    end
 
-    ffi_lib(path)
 
     class << self
       alias :attfunc :attach_function
@@ -83,6 +90,8 @@ module Rufus::Tokyo
     attfunc :abs_fwmkeys2, :tcrdbfwmkeys2, [ :pointer, :string, :int ], :pointer
     attfunc :tcrdbmisc, [ :pointer, :string, :int, :pointer ], :pointer
 
+    attfunc :tcrdbext2, [ :pointer, :string, :int, :string, :string ], :string
+
     #
     # table functions
 
@@ -128,5 +137,10 @@ module Rufus::Tokyo
     end
 
     attfunc :qry_search, :tcrdbqrysearch, [ :pointer ], :pointer
+
+    begin # since TC 1.4.21
+      attfunc :qry_count, :tcrdbqrysearchcount, [ :pointer ], :int
+    rescue FFI::NotFoundError => nfe
+    end
   end
 end

data/lib/rufus/tokyo/tyrant/table.rb

@@ -1,4 +1,3 @@
-#
 #--
 # Copyright (c) 2009, John Mettraux, jmettraux@gmail.com
 #
@@ -19,16 +18,12 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-#++
 #
+# Made in Japan.
+#++
 
-#
-# "made in Japan"
-#
-# jmettraux@gmail.com
-#
 
-require 'rufus/tokyo/stats'
+require 'rufus/tokyo/ttcommons'
 
 
 module Rufus::Tokyo
@@ -47,7 +42,7 @@ module Rufus::Tokyo
   #
   class TyrantTable < Table
 
-    include TyrantStats
+    include TyrantCommons
 
 
     attr_reader :host, :port

data/lib/rufus/tokyo/tyrant.rb

@@ -1,4 +1,3 @@
-#
 #--
 # Copyright (c) 2009, John Mettraux, jmettraux@gmail.com
 #
@@ -19,14 +18,10 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
-#++
 #
+# Made in Japan.
+#++
 
-#
-# "made in Japan"
-#
-# jmettraux@gmail.com
-#
 
 require 'rufus/tokyo'
 

data/lib/rufus/tokyo.rb

@@ -29,7 +29,7 @@ require 'ffi' # sudo gem install ffi
 module Rufus
 module Tokyo
 
-  VERSION = '0.1.11'
+  VERSION = '0.1.12'
 
   #
   # A common error class

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rufus-tokyo
 version: !ruby/object:Gem::Version 
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors: 
 - John Mettraux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-25 00:00:00 +09:00
+date: 2009-04-07 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,8 +52,8 @@ files:
 - lib/rufus/tokyo/dystopia.rb
 - lib/rufus/tokyo/hmethods.rb
 - lib/rufus/tokyo/query.rb
-- lib/rufus/tokyo/stats.rb
 - lib/rufus/tokyo/transactions.rb
+- lib/rufus/tokyo/ttcommons.rb
 - lib/rufus/tokyo/tyrant/abstract.rb
 - lib/rufus/tokyo/tyrant/lib.rb
 - lib/rufus/tokyo/tyrant/table.rb