rufus-tokyo 0.1.12 → 0.1.13

data/lib/rufus/tokyo/config.rb

@@ -33,7 +33,6 @@ module Tokyo
 
     protected
 
-    #
     # Given a path, a hash of parameters and a suffix,
     #
     # a) makes sure that the path has the given suffix or raises an exception
@@ -113,8 +112,12 @@ module Tokyo
 
         :width => (params[:width] || 255).to_i,
           # width of the value of each record (:fixed)
-        :limsiz => (params[:limsiz] || 26_8435_456).to_i
+        :limsiz => (params[:limsiz] || 26_8435_456).to_i,
           # limit size of the database file (:fixed)
+
+        :dfunit => (params[:dfunit] || 0).to_i
+          # unit step number. If it is not more than 0,
+          # the auto defragmentation is disabled.
       }
     end
 

data/lib/rufus/tokyo/hmethods.rb

@@ -30,69 +30,76 @@ module Tokyo
   # A mixin for Cabinet and Map, gathers all the hash-like methods
   #
   module HashMethods
+
     include Enumerable
 
-    #
     # The [] methods
     #
     # (assumes there's an underlying get(k) method)
     #
     def [] (k)
+
       val = get(k)
+
       return val unless val.nil?
       return nil unless @default_proc
+
       @default_proc.call(self, k)
     end
 
-    #
     # Returns an array of all the values
     #
     def values
+
       collect { |k, v| v }
     end
 
-    #
     # Our classical 'each'
     #
     def each
+
       keys.each { |k| yield(k, self[k]) }
     end
 
-    #
     # Turns this instance into a Ruby hash
     #
     def to_h
+
       self.inject({}) { |h, (k, v)| h[k] = v; h }
     end
 
-    #
     # Turns this instance into an array of [ key, value ]
     #
     def to_a
+
       self.collect { |e| e }
     end
 
-    #
     # Returns a new Ruby hash which is a merge of this Map and the given hash
     #
     def merge (h)
+
       self.to_h.merge(h)
     end
 
-    #
     # Merges the entries in the given hash into this map
     #
     def merge! (h)
+
       h.each { |k, v| self[k] = v }
+
       self
     end
 
     def default (key=nil)
+
       val = self[key]
+
       val.nil? ? @default_proc.call(self, key) : val
     end
 
     def default= (val)
+
       @default_proc = lambda { |h, k| val }
     end
 

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

@@ -86,6 +86,7 @@ module Rufus::Tokyo
     # Using the tyrant lib
     #
     def lib
+
       TyrantLib
     end
 
@@ -94,6 +95,7 @@ module Rufus::Tokyo
     # DISABLED.
     #
     def copy (target_path)
+
       #@db.copy(target_path)
       raise 'not allowed to create files on the server'
     end
@@ -109,11 +111,22 @@ module Rufus::Tokyo
     #
     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
+      k = key.to_s
+      v = value.to_s
+
+      outlen_op(
+        :tcrdbext,
+        func_name.to_s,
+        compute_ext_opts(opts),
+        k, Rufus::Tokyo.blen(k),
+        v, Rufus::Tokyo.blen(v))
     end
 
+    # Tyrant databases DO NOT support the 'defrag' call. Calling this method
+    # will raise an exception.
+    #
+    undef_method(:defrag)
+
     protected
 
     def do_call_misc (function, list_pointer)

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

@@ -75,22 +75,28 @@ module Rufus::Tokyo
     attfunc :abs_rnum, :tcrdbrnum, [ :pointer ], :uint64
     attfunc :abs_size, :tcrdbsize, [ :pointer ], :uint64
 
-    attfunc :abs_put2, :tcrdbput2, [ :pointer, :string, :string ], :int
-    attfunc :abs_get2, :tcrdbget2, [ :pointer, :string ], :string
-    attfunc :abs_out2, :tcrdbout2, [ :pointer, :string ], :int
+    attfunc :abs_get, :tcrdbget, [ :pointer, :pointer, :int, :pointer ], :pointer
+    attfunc :abs_put, :tcrdbput, [ :pointer, :pointer, :int, :pointer, :int ], :int
+
+    attfunc :abs_out, :tcrdbout, [ :pointer, :pointer, :int ], :int
+
+    attfunc :abs_putkeep, :tcrdbputkeep, [ :pointer, :pointer, :int, :pointer, :int ], :int
 
     attfunc :abs_iterinit, :tcrdbiterinit, [ :pointer ], :int
-    attfunc :abs_iternext2, :tcrdbiternext2, [ :pointer ], :string
+    attfunc :abs_iternext, :tcrdbiternext, [ :pointer, :pointer ], :pointer
 
     attfunc :abs_vanish, :tcrdbvanish, [ :pointer ], :int
 
     attfunc :abs_sync, :tcrdbsync, [ :pointer ], :int
     attfunc :abs_copy, :tcrdbcopy, [ :pointer, :string ], :int
 
-    attfunc :abs_fwmkeys2, :tcrdbfwmkeys2, [ :pointer, :string, :int ], :pointer
+    attfunc :abs_fwmkeys, :tcrdbfwmkeys, [ :pointer, :pointer, :int, :int ], :pointer
     attfunc :tcrdbmisc, [ :pointer, :string, :int, :pointer ], :pointer
 
-    attfunc :tcrdbext2, [ :pointer, :string, :int, :string, :string ], :string
+    attfunc :tcrdbext, [ :pointer, :string, :int, :pointer, :int, :pointer, :int, :pointer ], :pointer
+
+    attfunc :addint, :tcrdbaddint, [ :pointer, :string, :int, :int ], :int
+    attfunc :adddouble, :tcrdbadddouble, [ :pointer, :string, :int, :double ], :double
 
     #
     # table functions
@@ -99,12 +105,12 @@ module Rufus::Tokyo
 
     attfunc :tab_genuid, :tcrdbtblgenuid, [ :pointer ], :int64
 
-    attfunc :tab_get, :tcrdbtblget, [ :pointer, :string, :int ], :pointer
+    attfunc :tab_get, :tcrdbtblget, [ :pointer, :pointer, :int ], :pointer
 
     attfunc :tab_iterinit, :tcrdbiterinit, [ :pointer ], :int
-    attfunc :tab_iternext2, :tcrdbiternext2, [ :pointer ], :string
+    attfunc :tab_iternext, :tcrdbiternext, [ :pointer, :pointer ], :pointer
 
-    attfunc :tab_put, :tcrdbtblput, [ :pointer, :string, :int, :pointer ], :int
+    attfunc :tab_put, :tcrdbtblput, [ :pointer, :pointer, :int, :pointer ], :int
 
     attfunc :tab_out, :tcrdbtblout, [ :pointer, :string, :int ], :int
 
@@ -119,7 +125,7 @@ module Rufus::Tokyo
 
     attfunc :tab_setindex, :tcrdbtblsetindex, [ :pointer, :string, :int ], :int
 
-    attfunc :tab_fwmkeys2, :tcrdbfwmkeys2, [ :pointer, :string, :int ], :pointer
+    attfunc :tab_fwmkeys, :tcrdbfwmkeys, [ :pointer, :pointer, :int, :int ], :pointer
 
     #
     # qry functions

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

@@ -47,7 +47,6 @@ module Rufus::Tokyo
 
     attr_reader :host, :port
 
-    #
     # Connects to the Tyrant table listening at the given host and port.
     #
     # You start such a Tyrant with :
@@ -133,7 +132,6 @@ module Rufus::Tokyo
         "Tyrant tables don't support transactions", method_name)
     end
 
-    #
     # Returns the raw stat string from the Tyrant server.
     #
     def do_stat

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rufus-tokyo
 version: !ruby/object:Gem::Version 
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors: 
 - John Mettraux
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-07 00:00:00 +09:00
+date: 2009-06-02 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,6 +68,8 @@ files:
 - TODO.txt
 has_rdoc: true
 homepage: http://rufus.rubyforge.org/
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -88,9 +90,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - ffi
 rubyforge_project: rufus
-rubygems_version: 1.3.1
+rubygems_version: 1.3.2
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: ruby-ffi based lib to access Tokyo Cabinet and Tyrant
 test_files: 
 - spec/spec.rb