ruby-tokyotyrant 0.4 → 0.5

data/ext/tokyo_tyrant_module.h

@@ -4,7 +4,7 @@
 #include <tokyo_tyrant.h>
 
 extern TCRDB *mTokyoTyrant_getdb(VALUE vself);
-extern void mTokyoTyrant_exception(VALUE vself);
+extern void mTokyoTyrant_exception(VALUE vself, void *message);
 void init_mod();
 
 #endif

data/ext/tokyo_tyrant_table.c

@@ -25,7 +25,7 @@ static VALUE cTable_put_method(VALUE vself, VALUE vkey, VALUE vcols, int method)
       break;
   }
 
-  if(!res) mTokyoTyrant_exception(vself);
+  if(!res) mTokyoTyrant_exception(vself, NULL);
   tcmapdel(cols);
   return Qtrue;
 }
@@ -94,7 +94,7 @@ static VALUE cTable_get(VALUE vself, VALUE vkey){
   vkey = StringValueEx(vkey);
   if(!(cols = tcrdbtblget(db, RSTRING_PTR(vkey), RSTRING_LEN(vkey)))){
     if ((ecode = tcrdbecode(db))) {
-      if (ecode != TTENOREC) mTokyoTyrant_exception(vself);
+      if (ecode != TTENOREC) mTokyoTyrant_exception(vself, NULL);
     }
     return Qnil;
   } else {

data/spec/spec_base.rb

@@ -9,7 +9,7 @@ require 'rubygems'
 require 'fileutils'
 require 'bacon'
 require 'tokyo_tyrant'
-require 'lib/tokyo_tyrant/balancer'
+require 'tokyo_tyrant/balancer'
 
 $root.class.glob('spec/*_spec.rb').each {|l| load l}
 

data/spec/start_tyrants.sh

@@ -34,3 +34,10 @@ ttserver \
   -ext $SPEC/ext.lua \
   $TMP/tyrant_table2.tct
 
+ttserver \
+  -dmn \
+  -port 45003 \
+  -pid $TMP/ttb_spec.pid -rts $TMP/ttb_spec.rts \
+  -log $TMP/ttb.log \
+  -ext $SPEC/ext.lua \
+  $TMP/tyrant.tcb

data/spec/stop_tyrants.sh

@@ -2,8 +2,9 @@
 
 # stopping the spec ttservers
 
-ruby -e "%w{ tmp/t_spec.pid tmp/tt1_spec.pid tmp/tt2_spec.pid }.each { |pf| File.exist?(pf) && Process.kill(9, File.read(pf).strip.to_i) }"
+ruby -e "%w{ tmp/t_spec.pid tmp/tt1_spec.pid tmp/tt2_spec.pid tmp/ttb_spec.pid }.each { |pf| File.exist?(pf) && Process.kill(9, File.read(pf).strip.to_i) }"
 
 rm tmp/t_spec.pid
 rm tmp/tt1_spec.pid
 rm tmp/tt2_spec.pid
+rm tmp/ttb_spec.pid

data/spec/tokyo_tyrant_bdb_spec.rb

@@ -0,0 +1,34 @@
+require 'pathname'
+require Pathname(__FILE__).dirname.join('spec_base') unless $root
+
+describe TokyoTyrant::BDB, "with an open database" do
+  before do
+    @db = TokyoTyrant::BDB.new('127.0.0.1', 45003)
+    @db.clear
+  end
+
+  it "should put duplicate keys and values" do
+    key = 'desert'
+    values = ['baklava', 'chocolate mousse', 'tiramisu', 'tiramisu']
+    h = { key => values }
+    @db.outlist(key)
+    values.each do |value|
+      @db.putdup(key, value).should.be.true
+    end
+    @db.getlist(h.keys).should == h
+  end
+
+  it "should put a list" do
+    h = { 'mushrooms' => ['portobello', 'button'] }
+    @db.outlist(h.keys)
+    @db.putlist(h).should == []
+    @db.getlist(h.keys).should == h
+  end
+
+  it "should getlist" do
+    h = { 'mushrooms' => ['portobello', 'button'] }
+    @db.outlist(h.keys)
+    @db.putlist(h)
+    @db.getlist(h.keys).should == h
+  end
+end

data/spec/tokyo_tyrant_spec.rb

@@ -1,6 +1,16 @@
 require 'pathname'
 require Pathname(__FILE__).dirname.join('spec_base') unless $root
 
+describe TokyoTyrant::DB, "with an erroneous socket path" do
+  it "should throw an error" do
+    begin
+      TokyoTyrant::DB.new('/tmp/no_such_file_for_ruby_tokyo_tyrant', 0)
+    rescue => e
+      e.message.should == "Can't open unix socket: /tmp/no_such_file_for_ruby_tokyo_tyrant"
+    end
+  end
+end
+
 describe TokyoTyrant::DB, "with an open database" do
 
   before do

metadata

@@ -1,7 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-tokyotyrant
 version: !ruby/object:Gem::Version 
-  version: "0.4"
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  version: "0.5"
 platform: ruby
 authors: 
 - Flinn
@@ -9,19 +13,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-29 00:00:00 -05:00
+date: 2010-03-31 00:00:00 -04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: fast_hash_ring
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.1.1
-    version: 
+dependencies: []
+
 description: 
 email: flinn@actsasflinn.com
 executables: []
@@ -36,6 +31,10 @@ files:
 - README.rdoc
 - ext/tokyo_tyrant.c
 - ext/tokyo_tyrant.h
+- ext/tokyo_tyrant_bdb.c
+- ext/tokyo_tyrant_bdb.h
+- ext/tokyo_tyrant_consistent_hash.c
+- ext/tokyo_tyrant_consistent_hash.h
 - ext/tokyo_tyrant_db.c
 - ext/tokyo_tyrant_db.h
 - ext/tokyo_tyrant_module.c
@@ -44,9 +43,8 @@ files:
 - ext/tokyo_tyrant_query.h
 - ext/tokyo_tyrant_table.c
 - ext/tokyo_tyrant_table.h
-- ext/tokyo_utils.c
-- ext/tokyo_utils.h
-- lib/tokyo_tyrant/balancer.rb
+- ext/tokyo_tyrant/balancer.rb
+- ext/tokyo_tyrant/rails/tokyo_tyrant_store.rb
 - spec/ext.lua
 - spec/plu_db.rb
 - spec/spec.rb
@@ -55,6 +53,7 @@ files:
 - spec/stop_tyrants.sh
 - spec/tokyo_tyrant_balancer_db_spec.rb
 - spec/tokyo_tyrant_balancer_table_spec.rb
+- spec/tokyo_tyrant_bdb_spec.rb
 - spec/tokyo_tyrant_query_spec.rb
 - spec/tokyo_tyrant_spec.rb
 - spec/tokyo_tyrant_table_spec.rb
@@ -76,18 +75,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A C based TokyoTyrant Ruby binding

data/ext/tokyo_utils.c

@@ -1,362 +0,0 @@
-#include <tokyo_utils.h>
-
-extern TCMDB *cMDB_getdb(VALUE vself){
-  TCMDB *db;
-  Data_Get_Struct(rb_iv_get(vself, MDBVNDATA), TCMDB, db);
-  return db;
-}
-
-static void cMDB_free(TCMDB *db){
-  tcmdbdel(db);
-}
-
-static VALUE cMDB_bnum(VALUE vself){
-  return rb_iv_get(vself, "@bnum");
-}
-
-static VALUE cMDB_initialize(int argc, VALUE *argv, VALUE vself){
-  VALUE bnum;
-  TCMDB *db;
-
-  rb_scan_args(argc, argv, "0", &bnum);
-  if(NIL_P(bnum)){
-    db = tcmdbnew();
-  } else {
-    db = tcmdbnew2(bnum);
-  }
-
-  rb_iv_set(vself, "@bnum", bnum);
-
-  rb_iv_set(vself, MDBVNDATA, Data_Wrap_Struct(rb_cObject, 0, cMDB_free, db));
-
-  return Qtrue;
-}
-
-static VALUE cMDB_put_method(VALUE vself, VALUE vkey, VALUE vstr, int method){
-  bool res;
-  TCMDB *db = cMDB_getdb(vself);
-
-  vkey = StringValueEx(vkey);
-  vstr = StringValueEx(vstr);
-
-  res = true;
-  switch(method){
-    case TTPUT:
-      tcmdbput(db, RSTRING_PTR(vkey), RSTRING_LEN(vkey), RSTRING_PTR(vstr), RSTRING_LEN(vstr));
-      break;
-    case TTPUTKEEP:
-      res = tcmdbputkeep(db, RSTRING_PTR(vkey), RSTRING_LEN(vkey), RSTRING_PTR(vstr), RSTRING_LEN(vstr));
-      break;
-    case TTPUTCAT:
-      tcmdbputcat(db, RSTRING_PTR(vkey), RSTRING_LEN(vkey), RSTRING_PTR(vstr), RSTRING_LEN(vstr));
-      break;
-    default:
-      res = false;
-      break;
-  }
-
-  return res ? Qtrue : Qfalse;
-}
-
-static VALUE cMDB_put(VALUE vself, VALUE vkey, VALUE vstr){
-  return cMDB_put_method(vself, vkey, vstr, TTPUT);
-}
-
-static VALUE cMDB_putkeep(VALUE vself, VALUE vkey, VALUE vstr){
-  return cMDB_put_method(vself, vkey, vstr, TTPUTKEEP);  
-}
-
-static VALUE cMDB_putcat(VALUE vself, VALUE vkey, VALUE vstr){
-  return cMDB_put_method(vself, vkey, vstr, TTPUTCAT);
-}
-
-static VALUE cMDB_get(VALUE vself, VALUE vkey){
-  VALUE vval;
-  char *buf;
-  int bsiz;
-  TCMDB *db = cMDB_getdb(vself);
-
-  // this is ugly
-  vkey = StringValueEx(vkey);
-  if(!(buf = tcmdbget(db, RSTRING_PTR(vkey), RSTRING_LEN(vkey), &bsiz))){
-    return Qnil;
-  } else {
-    vval = StringRaw(buf, bsiz);
-  }
-
-  tcfree(buf);
-  return vval;
-}
-
-static VALUE cMDB_vsiz(VALUE vself, VALUE vkey){
-  TCMDB *db = cMDB_getdb(vself);
-
-  vkey = StringValueEx(vkey);
-  return INT2NUM(tcmdbvsiz(db, RSTRING_PTR(vkey), RSTRING_LEN(vkey)));
-}
-
-static VALUE cMDB_fetch(int argc, VALUE *argv, VALUE vself){
-  VALUE vkey, vrv, vforce;
-  rb_scan_args(argc, argv, "11", &vkey, &vforce);
-  if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
-  if(vforce == Qnil) vforce = Qfalse;
-
-  if(vforce != Qfalse || (vrv = cMDB_get(vself, vkey)) == Qnil){
-    vrv = rb_yield(vkey);
-    cMDB_put(vself, vkey, vrv);
-  }
-  return vrv;
-}
-
-static VALUE cMDB_each(VALUE vself){
-  VALUE vrv;
-  if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
-  TCMDB *db = cMDB_getdb(vself);
-  vrv = Qnil;
-  tcmdbiterinit(db);
-  int ksiz;
-  char *kbuf;
-  while((kbuf = tcmdbiternext(db, &ksiz)) != NULL){
-    int vsiz;
-    char *vbuf = tcmdbget(db, kbuf, ksiz, &vsiz);
-    vrv = rb_yield_values(2, rb_str_new2(kbuf), StringRaw(vbuf, vsiz));
-    tcfree(vbuf);
-    tcfree(kbuf);
-  }
-  return vrv;
-}
-
-static VALUE cMDB_each_value(VALUE vself){
-  VALUE vrv;
-  if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
-  TCMDB *db = cMDB_getdb(vself);
-  vrv = Qnil;
-  tcmdbiterinit(db);
-  int ksiz;
-  char *kbuf;
-  while((kbuf = tcmdbiternext(db, &ksiz)) != NULL){
-    int vsiz;
-    char *vbuf = tcmdbget(db, kbuf, ksiz, &vsiz);
-    vrv = rb_yield_values(1, StringRaw(vbuf, vsiz));
-    tcfree(vbuf);
-    tcfree(kbuf);
-  }
-  return vrv;
-}
-
-static VALUE cMDB_values(VALUE vself){
-  VALUE vary;
-  TCMDB *db = cMDB_getdb(vself);
-  vary = rb_ary_new2(tcmdbrnum(db));
-  tcmdbiterinit(db);
-  int ksiz;
-  char *kbuf;
-  while((kbuf = tcmdbiternext(db, &ksiz)) != NULL){
-    int vsiz;
-    char *vbuf = tcmdbget(db, kbuf, ksiz, &vsiz);
-    rb_ary_push(vary, StringRaw(vbuf, vsiz));
-    tcfree(vbuf);
-    tcfree(kbuf);
-  }
-  return vary;
-}
-
-static VALUE cMDB_out(VALUE vself, VALUE vkey){
-  TCMDB *db = cMDB_getdb(vself);
-
-  vkey = StringValueEx(vkey);
-  return tcmdbout(db, RSTRING_PTR(vkey), RSTRING_LEN(vkey)) ? Qtrue : Qfalse;
-}
-
-static VALUE cMDB_check(VALUE vself, VALUE vkey){
-  TCMDB *db = cMDB_getdb(vself);
-
-  vkey = StringValueEx(vkey);
-  return tcmdbvsiz(db, RSTRING_PTR(vkey), RSTRING_LEN(vkey)) >= 0 ? Qtrue : Qfalse;
-}
-
-static VALUE cMDB_iterinit(VALUE vself){
-  TCMDB *db = cMDB_getdb(vself);
-
-  tcmdbiterinit(db);
-  return Qtrue;
-}
-
-static VALUE cMDB_iternext(VALUE vself){
-  VALUE vval;
-  char *vbuf;
-  TCMDB *db = cMDB_getdb(vself);
-
-  if(!(vbuf = tcmdbiternext2(db))) return Qnil;
-  vval = rb_str_new2(vbuf);
-  tcfree(vbuf);
-
-  return vval;
-}
-
-static VALUE cMDB_fwmkeys(int argc, VALUE *argv, VALUE vself){
-  VALUE vprefix, vmax, vary;
-  TCLIST *keys;
-  int max;
-  TCMDB *db = cMDB_getdb(vself);
-  rb_scan_args(argc, argv, "11", &vprefix, &vmax);
-
-  vprefix = StringValueEx(vprefix);
-  max = (vmax == Qnil) ? -1 : NUM2INT(vmax);
-  keys = tcmdbfwmkeys(db, RSTRING_PTR(vprefix), RSTRING_LEN(vprefix), max);
-  vary = listtovary(keys);
-  tclistdel(keys);
-  return vary;
-}
-
-static VALUE cMDB_keys(VALUE vself){
-  /*
-  VALUE vary;
-  char *kxstr;
-  TCMDB *db = cMDB_getdb(vself);
-  vary = rb_ary_new2(tcmdbrnum(db));
-  tcmdbiterinit(db);
-  while((kxstr = tcmdbiternext2(db)) != NULL){
-    rb_ary_push(vary, rb_str_new2(kxstr));
-  }
-  return vary;
-  */
-
-  // Using forward matching keys with an empty string is 100x faster than iternext+get
-  VALUE vary;
-  TCLIST *keys;
-  char *prefix;
-  TCMDB *db = cMDB_getdb(vself);
-  prefix = "";
-  keys = tcmdbfwmkeys2(db, prefix, -1);
-  vary = listtovary(keys);
-  tclistdel(keys);
-  return vary;
-}
-
-static VALUE cMDB_addint(VALUE vself, VALUE vkey, int inum){
-  TCMDB *db = cMDB_getdb(vself);
-  vkey = StringValueEx(vkey);
-
-  inum = tcmdbaddint(db, RSTRING_PTR(vkey), RSTRING_LEN(vkey), inum);
-  return inum == INT_MIN ? Qnil : INT2NUM(inum);
-}
-
-static VALUE cMDB_add_int(int argc, VALUE *argv, VALUE vself){
-  VALUE vkey, vnum;
-  int inum = 1;
-
-  rb_scan_args(argc, argv, "11", &vkey, &vnum);
-  vkey = StringValueEx(vkey);
-  if(NIL_P(vnum)) vnum = INT2NUM(inum);
-
-  return cMDB_addint(vself, vkey, NUM2INT(vnum));
-}
-
-static VALUE cMDB_get_int(VALUE vself, VALUE vkey){
-  return cMDB_addint(vself, vkey, 0);
-}
-
-static VALUE cMDB_adddouble(VALUE vself, VALUE vkey, double dnum){
-  TCMDB *db = cMDB_getdb(vself);
-
-  vkey = StringValueEx(vkey);
-  dnum = tcmdbadddouble(db, RSTRING_PTR(vkey), RSTRING_LEN(vkey), dnum);
-  return isnan(dnum) ? Qnil : rb_float_new(dnum);
-}
-
-static VALUE cMDB_add_double(int argc, VALUE *argv, VALUE vself){
-  VALUE vkey, vnum;
-  double dnum = 1.0;
-
-  rb_scan_args(argc, argv, "11", &vkey, &vnum);
-  vkey = StringValueEx(vkey);
-  if(NIL_P(vnum)) vnum = rb_float_new(dnum);
-
-  return cMDB_adddouble(vself, vkey, NUM2DBL(vnum));
-}
-
-static VALUE cMDB_get_double(VALUE vself, VALUE vkey){
-  return cMDB_adddouble(vself, vkey, 0.0);
-}
-
-static VALUE cMDB_vanish(VALUE vself){
-  TCMDB *db = cMDB_getdb(vself);
-
-  tcmdbvanish(db);
-  return Qtrue;
-}
-
-static VALUE cMDB_rnum(VALUE vself){
-  TCMDB *db = cMDB_getdb(vself);
-
-  return LL2NUM(tcmdbrnum(db));
-}
-
-static VALUE cMDB_empty(VALUE vself){
-  TCMDB *db = cMDB_getdb(vself);
-
-  return tcmdbrnum(db) < 1 ? Qtrue : Qfalse;
-}
-
-static VALUE cMDB_size(VALUE vself){
-  TCMDB *db = cMDB_getdb(vself);
-
-  return LL2NUM(tcmdbmsiz(db));
-}
-
-static VALUE cMDB_each_key(VALUE vself){
-  VALUE vrv;
-  char *kxstr;
-  if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
-  TCMDB *db = cMDB_getdb(vself);
-  vrv = Qnil;
-  tcmdbiterinit(db);
-  while((kxstr = tcmdbiternext2(db)) != NULL){
-    vrv = rb_yield_values(1, rb_str_new2(kxstr));
-  }
-  return vrv;
-}
-
-void init_utils(){
-  rb_define_private_method(cMDB, "initialize", cMDB_initialize, -1);
-  rb_define_method(cMDB, "bnum", cMDB_bnum, 0);
-  rb_define_method(cMDB, "put", cMDB_put, 2);
-  rb_define_alias(cMDB, "[]=", "put");
-  rb_define_method(cMDB, "putkeep", cMDB_putkeep, 2);
-  rb_define_method(cMDB, "putcat", cMDB_putcat, 2);
-  rb_define_method(cMDB, "get", cMDB_get, 1);
-  rb_define_alias(cMDB, "[]", "get");
-  rb_define_method(cMDB, "vsiz", cMDB_vsiz, 1);
-  rb_define_method(cMDB, "out", cMDB_out, 1);
-  rb_define_method(cMDB, "check", cMDB_check, 1);
-  rb_define_alias(cMDB, "has_key?", "check");
-  rb_define_alias(cMDB, "key?", "check");
-  rb_define_alias(cMDB, "include?", "check");
-  rb_define_alias(cMDB, "member?", "check");
-  rb_define_method(cMDB, "iterinit", cMDB_iterinit, 0);
-  rb_define_method(cMDB, "iternext", cMDB_iternext, 0);
-  rb_define_method(cMDB, "fwmkeys", cMDB_fwmkeys, -1);
-  rb_define_method(cMDB, "keys", cMDB_keys, 0);
-  rb_define_method(cMDB, "add_int", cMDB_add_int, -1);
-  rb_define_alias(cMDB, "addint", "add_int");
-  rb_define_alias(cMDB, "increment", "add_int");
-  rb_define_method(cMDB, "get_int", cMDB_get_int, 1);
-  rb_define_method(cMDB, "add_double", cMDB_add_double, -1);
-  rb_define_alias(cMDB, "adddouble", "add_double");
-  rb_define_method(cMDB, "get_double", cMDB_get_double, 1);
-  rb_define_method(cMDB, "vanish", cMDB_vanish, 0);
-  rb_define_alias(cMDB, "clear", "vanish");
-  rb_define_method(cMDB, "rnum", cMDB_rnum, 0);
-  rb_define_alias(cMDB, "count", "rnum");
-  rb_define_alias(cMDB, "length", "rnum");
-  rb_define_method(cMDB, "size", cMDB_size, 0);
-  rb_define_method(cMDB, "empty?", cMDB_empty, 0);
-  rb_define_method(cMDB, "each_key", cMDB_each_key, 0);
-
-  rb_define_method(cMDB, "fetch", cMDB_fetch, -1);
-  rb_define_method(cMDB, "each", cMDB_each, 0);
-  rb_define_alias(cMDB, "each_pair", "each");
-  rb_define_method(cMDB, "each_value", cMDB_each_value, 0);
-  rb_define_method(cMDB, "values", cMDB_values, 0);
-}