cabinet/tyrant tables now accepting binary data as keys (put/get)

lib/rufus/tokyo/cabinet/lib.rb

@@ -134,12 +134,12 @@ class << self
 
     attfunc :tab_genuid, :tctdbgenuid, [ :pointer ], :int64
 
-    attfunc :tab_get, :tctdbget, [ :pointer, :string, :int ], :pointer
+    attfunc :tab_get, :tctdbget, [ :pointer, :pointer, :int ], :pointer
 
     attfunc :tab_iterinit, :tctdbiterinit, [ :pointer ], :int
     attfunc :tab_iternext2, :tctdbiternext2, [ :pointer ], :string
 
-    attfunc :tab_put, :tctdbput, [ :pointer, :string, :int, :pointer ], :int
+    attfunc :tab_put, :tctdbput, [ :pointer, :pointer, :int, :pointer ], :int
 
     #attfunc :tctdbput3, [ :pointer, :string, :string ], :int
       # not using it anymore, Ruby can turn an array into a hash so easily

lib/rufus/tokyo/cabinet/table.rb

@@ -226,7 +226,7 @@ def []= (pk, h_or_a)
 
       m = Rufus::Tokyo::Map[h_or_a]
 
-      r = lib.tab_put(@db, pk, CabinetLib.strlen(pk), m.pointer)
+      r = lib.tab_put(@db, pk, Rufus::Tokyo.blen(pk), m.pointer)
 
       m.free
 
@@ -404,8 +404,11 @@ def pointer
     # (the actual #[] method is provided by HashMethods)
     #
     def get (k)
-      m = lib.tab_get(@db, k, CabinetLib.strlen(k))
-      return nil if m.address == 0 # :( too bad, but it works
+
+      m = lib.tab_get(@db, k, Rufus::Tokyo.blen(k))
+
+      return nil if m.address == 0
+
       Map.to_h(m) # which frees the map
     end
 

lib/rufus/tokyo/tyrant/lib.rb

@@ -103,12 +103,12 @@ class << self
 
     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_put, :tcrdbtblput, [ :pointer, :string, :int, :pointer ], :int
+    attfunc :tab_put, :tcrdbtblput, [ :pointer, :pointer, :int, :pointer ], :int
 
     attfunc :tab_out, :tcrdbtblout, [ :pointer, :string, :int ], :int
 

spec/table_spec.rb

@@ -147,6 +147,12 @@
     @t['pk0'].should.equal({ 'a' => 'A' })
   end
 
+  it 'should store binary data \0' do
+    s = "toto#{0.chr}nada"
+    @t[s] = { s => s }
+    @t[s].should.equal({ s => s })
+  end
+
 end
 
 

spec/tyrant_table_spec.rb

@@ -121,6 +121,12 @@
     }.should.raise(NoMethodError)
   end
 
+  it 'should store binary data \0' do
+    s = "toto#{0.chr}nada"
+    @t[s] = { s => s }
+    @t[s].should.equal({ s => s })
+  end
+
 end