ruby-tokyotyrant 0.5 → 0.5.1

data/Rakefile

@@ -20,7 +20,7 @@ CLEAN.include('pkg', 'tmp')
 
 gemspec = Gem::Specification.new do |s|
   s.name = 'ruby-tokyotyrant'
-  s.version = '0.5'
+  s.version = '0.5.1'
   s.authors = [ 'Flinn' ]
   s.email = 'flinn@actsasflinn.com'
   s.homepage = 'http://github.com/actsasflinn/ruby-tokyotyrant/'

data/ext/tokyo_tyrant_bdb.c

@@ -1,7 +1,7 @@
 #include <tokyo_tyrant_bdb.h>
 
 static VALUE cBDB_put_method(VALUE vself, VALUE vkey, VALUE vval, char *command, bool bang){
-  VALUE vres;
+  VALUE vres = Qfalse;
   TCLIST *list, *result;
   TCRDB *db = mTokyoTyrant_getdb(vself);
 
@@ -17,16 +17,16 @@ static VALUE cBDB_put_method(VALUE vself, VALUE vkey, VALUE vval, char *command,
     } else {
       vres = listtovary(result);
     }
+    tclistdel(result);
   } else {
     if (bang) mTokyoTyrant_exception(vself, NULL);
-    vres = Qfalse;
   }
   tclistdel(list);
   return vres;
 }
 
 static VALUE cBDB_putlist(VALUE vself, VALUE vhash){
-  VALUE vary;
+  VALUE vary = rb_ary_new();
   TCLIST *list, *result;
   TCRDB *db = mTokyoTyrant_getdb(vself);
   Check_Type(vhash, T_HASH);
@@ -35,8 +35,6 @@ static VALUE cBDB_putlist(VALUE vself, VALUE vhash){
   if ((result = tcrdbmisc(db, "putlist", 0, list)) != NULL){
     vary = listtovary(result);
     tclistdel(result);
-  } else {
-    vary = rb_ary_new();
   }
   tclistdel(list);
 
@@ -44,43 +42,44 @@ static VALUE cBDB_putlist(VALUE vself, VALUE vhash){
 }
 
 static VALUE cBDB_getlist(int argc, VALUE *argv, VALUE vself){
-  VALUE vkeys, vvalue, vhash;
+  VALUE vkeys, vval;
+  VALUE vhash = rb_hash_new();
   TCLIST *list, *result;
   TCRDB *db = mTokyoTyrant_getdb(vself);
   rb_scan_args(argc, argv, "*", &vkeys);
 
   // I really hope there is a better way to do this
   if (RARRAY_LEN(vkeys) == 1) {
-    vvalue = rb_ary_entry(vkeys, 0);
-    switch (TYPE(vvalue)){
+    vval = rb_ary_entry(vkeys, 0);
+    switch (TYPE(vval)){
       case T_STRING:
       case T_FIXNUM:
         break;
       case T_ARRAY:
-        vkeys = vvalue;
+        vkeys = vval;
         break;
       case T_OBJECT:
-        vkeys = rb_convert_type(vvalue, T_ARRAY, "Array", "to_a");
+        vkeys = rb_convert_type(vval, T_ARRAY, "Array", "to_a");
         break;
     }
   }
   Check_Type(vkeys, T_ARRAY);
 
   list = varytolist(vkeys);
-  result = tcrdbmisc(db, "getlist", RDBMONOULOG, list);
+  if ((result = tcrdbmisc(db, "getlist", RDBMONOULOG, list)) != NULL){
+    vhash = listtovhash(result);
+    tclistdel(result);
+  }
   tclistdel(list);
-  vhash = listtovhash(result);
-  tclistdel(result);
   return vhash;
 }
 
 static VALUE cBDB_each(VALUE vself){
-  VALUE vrv;
+  VALUE vrv = Qnil;
   const char *kbuf, *vbuf;
   int ksiz, vsiz;
   TCLIST *result;
   TCRDB *db = mTokyoTyrant_getdb(vself);
-  vrv = Qnil;
 
   if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
 
@@ -98,13 +97,12 @@ static VALUE cBDB_each(VALUE vself){
 }
 
 static VALUE cBDB_values(VALUE vself){
-  VALUE vary;
+  VALUE vary = rb_ary_new();
   const char *vbuf;
   int vsiz;
   TCLIST *result;
   TCRDB *db = mTokyoTyrant_getdb(vself);
 
-  vary = rb_ary_new();
   tcrdbiterinit(db);
   tcrdbmisc(db, "iterinit", RDBMONOULOG, tclistnew());
   while((result = tcrdbmisc(db, "iternext", RDBMONOULOG, tclistnew())) != NULL){

data/ext/tokyo_tyrant_db.c

@@ -35,15 +35,16 @@ static VALUE cDB_put(VALUE vself, VALUE vkey, VALUE vstr){
 }
 
 static VALUE cDB_mput(VALUE vself, VALUE vhash){
-  VALUE vary;
+  VALUE vary = Qnil;
   TCLIST *list, *args;
   TCRDB *db = mTokyoTyrant_getdb(vself);
 
   args = vhashtolist(vhash);
-  list = tcrdbmisc(db, "putlist", 0, args);
-  vary = listtovary(list);
+  if ((list = tcrdbmisc(db, "putlist", 0, args)) != NULL){
+    vary = listtovary(list);
+    tclistdel(list);
+  }
   tclistdel(args);
-  tclistdel(list);
   return vary;
 }
 
@@ -74,45 +75,45 @@ static VALUE cDB_putshl(VALUE vself, VALUE vkey, VALUE vstr, VALUE vwidth){
 }
 
 static VALUE cDB_get(VALUE vself, VALUE vkey){
-  VALUE vval;
+  VALUE vval = Qnil;
   char *buf;
   int bsiz, ecode;
   TCRDB *db = mTokyoTyrant_getdb(vself);
 
   // this is ugly
   vkey = StringValueEx(vkey);
-  if(!(buf = tcrdbget(db, RSTRING_PTR(vkey), RSTRING_LEN(vkey), &bsiz))){
+  if((buf = tcrdbget(db, RSTRING_PTR(vkey), RSTRING_LEN(vkey), &bsiz)) == NULL){
     if ((ecode = tcrdbecode(db))) {
       if (ecode != TTENOREC) mTokyoTyrant_exception(vself, NULL);
     }
-    return Qnil;
   } else {
     vval = StringRaw(buf, bsiz);
+    tcfree(buf);
   }
 
-  tcfree(buf);
   return vval;
 }
 
 static VALUE cDB_mget(int argc, VALUE *argv, VALUE vself){
-  VALUE vkeys, vhash, vvalue;
+  VALUE vkeys, vval;
+  VALUE vhash = Qnil;
   TCMAP *recs;
   TCRDB *db = mTokyoTyrant_getdb(vself);
   rb_scan_args(argc, argv, "*", &vkeys);
 
   // I really hope there is a better way to do this
   if (RARRAY_LEN(vkeys) == 1) {
-    vvalue = rb_ary_entry(vkeys, 0);
-    switch (TYPE(vvalue)){
+    vval = rb_ary_entry(vkeys, 0);
+    switch (TYPE(vval)){
       case T_STRING:
       case T_FIXNUM:
         break;
       case T_ARRAY:
-        vkeys = vvalue;
+        vkeys = vval;
         break;
       case T_STRUCT: // range is not a T_STRUCT instead of a T_OBJECT in ruby1.9?
       case T_OBJECT:
-        vkeys = rb_convert_type(vvalue, T_ARRAY, "Array", "to_a");
+        vkeys = rb_convert_type(vval, T_ARRAY, "Array", "to_a");
         break;
     }
   }
@@ -120,8 +121,9 @@ static VALUE cDB_mget(int argc, VALUE *argv, VALUE vself){
   Check_Type(vkeys, T_ARRAY);
 
   recs = varytomap(vkeys);
-  if(!tcrdbget3(db, recs)) return Qnil;
-  vhash = maptovhash(recs);
+  if(tcrdbget3(db, recs)){
+    vhash = maptovhash(recs);
+  }
   tcmapdel(recs);
   return vhash;
 }
@@ -154,11 +156,12 @@ static VALUE cDB_each(VALUE vself){
   tcrdbiterinit(db);
   int ksiz;
   char *kbuf;
+
   while((kbuf = tcrdbiternext(db, &ksiz)) != NULL){
-    int vsiz;
-    char *vbuf = tcrdbget(db, kbuf, ksiz, &vsiz);
-    vrv = rb_yield_values(2, rb_str_new2(kbuf), StringRaw(vbuf, vsiz));
-    tcfree(vbuf);
+    VALUE vkey = rb_str_new(kbuf, ksiz);
+    VALUE vval = cDB_get(vself, vkey);
+
+    vrv = rb_yield_values(2, vkey, vval);
     tcfree(kbuf);
   }
   return vrv;
@@ -172,11 +175,12 @@ static VALUE cDB_each_value(VALUE vself){
   tcrdbiterinit(db);
   int ksiz;
   char *kbuf;
+
   while((kbuf = tcrdbiternext(db, &ksiz)) != NULL){
-    int vsiz;
-    char *vbuf = tcrdbget(db, kbuf, ksiz, &vsiz);
-    vrv = rb_yield_values(1, StringRaw(vbuf, vsiz));
-    tcfree(vbuf);
+    VALUE vkey = rb_str_new(kbuf, ksiz);
+    VALUE vval = cDB_get(vself, vkey);
+
+    vrv = rb_yield_values(1, vval);
     tcfree(kbuf);
   }
   return vrv;
@@ -189,11 +193,12 @@ static VALUE cDB_values(VALUE vself){
   tcrdbiterinit(db);
   int ksiz;
   char *kbuf;
+
   while((kbuf = tcrdbiternext(db, &ksiz)) != NULL){
-    int vsiz;
-    char *vbuf = tcrdbget(db, kbuf, ksiz, &vsiz);
-    rb_ary_push(vary, StringRaw(vbuf, vsiz));
-    tcfree(vbuf);
+    VALUE vkey = rb_str_new(kbuf, ksiz);
+    VALUE vval = cDB_get(vself, vkey);
+
+    rb_ary_push(vary, vval);
     tcfree(kbuf);
   }
   return vary;

data/ext/tokyo_tyrant_module.c

@@ -146,7 +146,8 @@ static VALUE mTokyoTyrant_out(VALUE vself, VALUE vkey){
 
 // TODO: merge out and mout?
 static VALUE mTokyoTyrant_outlist(int argc, VALUE *argv, VALUE vself){
-  VALUE vkeys, vary, vvalue;
+  VALUE vkeys, vvalue;
+  VALUE vary = rb_ary_new();
   TCLIST *list, *result;
   TCRDB *db = mTokyoTyrant_getdb(vself);
   rb_scan_args(argc, argv, "*", &vkeys);
@@ -169,10 +170,11 @@ static VALUE mTokyoTyrant_outlist(int argc, VALUE *argv, VALUE vself){
   Check_Type(vkeys, T_ARRAY);
 
   list = varytolist(vkeys);
-  result = tcrdbmisc(db, "outlist", 0, list);
+  if ((result = tcrdbmisc(db, "outlist", 0, list)) != NULL){
+    vary = listtovary(result);
+    tclistdel(result);
+  }
   tclistdel(list);
-  vary = listtovary(result);
-  tclistdel(result);
   return vary;
 }
 
@@ -190,14 +192,14 @@ static VALUE mTokyoTyrant_iterinit(VALUE vself){
 }
 
 static VALUE mTokyoTyrant_iternext(VALUE vself){
-  VALUE vval;
+  VALUE vval = Qnil;
   char *vbuf;
   TCRDB *db = mTokyoTyrant_getdb(vself);
 
-  if(!(vbuf = tcrdbiternext2(db))) return Qnil;
-  vval = rb_str_new2(vbuf);
-  tcfree(vbuf);
-
+  if((vbuf = tcrdbiternext2(db)) != NULL){
+    vval = rb_str_new2(vbuf);
+    tcfree(vbuf);
+  }
   return vval;
 }
 
@@ -387,7 +389,8 @@ static VALUE mTokyoTyrant_stat(VALUE vself){
 }
 
 static VALUE mTokyoTyrant_misc(int argc, VALUE *argv, VALUE vself){
-  VALUE vname, vopts, vargs, vary;
+  VALUE vname, vopts, vargs;
+  VALUE vary = rb_ary_new();
   TCLIST *list, *args;
   TCRDB *db = mTokyoTyrant_getdb(vself);
   rb_scan_args(argc, argv, "13", &vname, &vopts, &vargs);
@@ -401,38 +404,41 @@ static VALUE mTokyoTyrant_misc(int argc, VALUE *argv, VALUE vself){
   if ((list = tcrdbmisc(db, RSTRING_PTR(vname), NUM2INT(vopts), args)) != NULL){
     vary = listtovary(list);
     tclistdel(list);
-  } else {
-    vary = rb_ary_new();
   }
   tclistdel(args);
 
   return vary;
 }
 
-static VALUE mTokyoTyrant_ext(VALUE vself, VALUE vext, VALUE vkey, VALUE vvalue){
-  int vsiz;
-  char *vbuf;
+static VALUE mTokyoTyrant_ext(VALUE vself, VALUE vext, VALUE vkey, VALUE vval){
+  int rsiz;
+  char *rbuf, *kbuf, *vbuf, *xbuf;
   TCRDB *db = mTokyoTyrant_getdb(vself);
+  VALUE vres = Qnil;
   vext = StringValueEx(vext);
   vkey = StringValueEx(vkey);
-  vvalue = StringValueEx(vvalue);
-
-  if(!(vbuf = tcrdbext(db, RSTRING_PTR(vext), 0, RSTRING_PTR(vkey), RSTRING_LEN(vkey), RSTRING_PTR(vvalue), RSTRING_LEN(vvalue), &vsiz))){
-    return Qnil;
-  } else {
-    return rb_str_new(vbuf, vsiz);
+  vval = StringValueEx(vval);
+  xbuf = RSTRING_PTR(vext);
+  kbuf = RSTRING_PTR(vkey);
+  vbuf = RSTRING_PTR(vval);
+
+  if((rbuf = tcrdbext(db, xbuf, 0, kbuf, RSTRING_LEN(vkey), vbuf, RSTRING_LEN(vval), &rsiz)) != NULL){
+    vres = rb_str_new(rbuf, rsiz);
+    tcfree(rbuf);
   }
+  return vres;
 }
 
 static VALUE mTokyoTyrant_each_key(VALUE vself){
-  VALUE vrv;
-  char *kxstr;
+  VALUE vrv = Qnil;
+  char *kbuf;
   if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
   TCRDB *db = mTokyoTyrant_getdb(vself);
-  vrv = Qnil;
+
   tcrdbiterinit(db);
-  while((kxstr = tcrdbiternext2(db)) != NULL){
-    vrv = rb_yield_values(1, rb_str_new2(kxstr));
+  while((kbuf = tcrdbiternext2(db)) != NULL){
+    vrv = rb_yield_values(1, rb_str_new2(kbuf));
+    tcfree(kbuf);
   }
   return vrv;
 }

data/ext/tokyo_tyrant_table.c

@@ -36,7 +36,8 @@ static VALUE cTable_put(VALUE vself, VALUE vkey, VALUE vcols){
 
 static VALUE cTable_mput(VALUE vself, VALUE vhash){
   int i, num, j;
-  VALUE vary, vkeys, vkey, vval;
+  VALUE vkeys, vkey, vval;
+  VALUE vary = Qnil;
   TCLIST *list, *result;
   TCRDB *db = mTokyoTyrant_getdb(vself);
 
@@ -63,10 +64,12 @@ static VALUE cTable_mput(VALUE vself, VALUE vhash){
     tclistdel(cols);
     tcxstrdel(xstr);
   }
-  result = tcrdbmisc(db, "putlist", 0, list);
+
+  if ((result = tcrdbmisc(db, "putlist", 0, list)) != NULL){
+    vary = listtovary(result);
+    tclistdel(result);
+  }
   tclistdel(list);
-  vary = listtovary(result);
-  tclistdel(result);
   return vary;
 }
 
@@ -86,61 +89,61 @@ static VALUE cTable_out(VALUE vself, VALUE vkey){
 }
 
 static VALUE cTable_get(VALUE vself, VALUE vkey){
-  VALUE vcols;
+  VALUE vcols = Qnil;
   int ecode;
   TCMAP *cols;
   TCRDB *db = mTokyoTyrant_getdb(vself);
 
   vkey = StringValueEx(vkey);
-  if(!(cols = tcrdbtblget(db, RSTRING_PTR(vkey), RSTRING_LEN(vkey)))){
+  if((cols = tcrdbtblget(db, RSTRING_PTR(vkey), RSTRING_LEN(vkey))) == NULL){
     if ((ecode = tcrdbecode(db))) {
       if (ecode != TTENOREC) mTokyoTyrant_exception(vself, NULL);
     }
-    return Qnil;
   } else {
     vcols = maptovhash(cols);
+    tcmapdel(cols);
   }
-
-  tcmapdel(cols);
   return vcols;
 }
 
 static VALUE cTable_mget(int argc, VALUE *argv, VALUE vself){
   const char *kbuf;
   int ksiz, vsiz;
-  VALUE vkeys, vhash, vcols, vvalue;
+  VALUE vkeys, vcols, vval;
+  VALUE vhash = Qnil;
   TCMAP *recs, *cols;
   TCRDB *db = mTokyoTyrant_getdb(vself);
   rb_scan_args(argc, argv, "*", &vkeys);
 
   // I really hope there is a better way to do this
   if (RARRAY_LEN(vkeys) == 1) {
-    vvalue = rb_ary_entry(vkeys, 0);
-    switch (TYPE(vvalue)){
+    vval = rb_ary_entry(vkeys, 0);
+    switch (TYPE(vval)){
       case T_STRING:
       case T_FIXNUM:
         break;
       case T_ARRAY:
-        vkeys = vvalue;
+        vkeys = vval;
         break;
       case T_STRUCT: // range is not a T_STRUCT instead of a T_OBJECT in ruby1.9?
       case T_OBJECT:
-        vkeys = rb_convert_type(vvalue, T_ARRAY, "Array", "to_a");
+        vkeys = rb_convert_type(vval, T_ARRAY, "Array", "to_a");
         break;
     }
   }
   Check_Type(vkeys, T_ARRAY);
 
   recs = varytomap(vkeys);
-  if(!tcrdbget3(db, recs)) return Qnil;
-  vhash = rb_hash_new();
-  tcmapiterinit(recs);
-  while((kbuf = tcmapiternext(recs, &ksiz)) != NULL){
-    const char *vbuf = tcmapiterval(kbuf, &vsiz);
-    cols = tcstrsplit4(vbuf, vsiz);
-    vcols = maptovhash(cols);
-    tcmapdel(cols);
-    rb_hash_aset(vhash, StringRaw(kbuf, ksiz), vcols);
+  if(tcrdbget3(db, recs)){
+    vhash = rb_hash_new();
+    tcmapiterinit(recs);
+    while((kbuf = tcmapiternext(recs, &ksiz)) != NULL){
+      const char *vbuf = tcmapiterval(kbuf, &vsiz);
+      cols = tcstrsplit4(vbuf, vsiz);
+      vcols = maptovhash(cols);
+      tcmapdel(cols);
+      rb_hash_aset(vhash, StringRaw(kbuf, ksiz), vcols);
+    }
   }
   tcmapdel(recs);
   return vhash;
@@ -177,65 +180,59 @@ static VALUE cTable_fetch(int argc, VALUE *argv, VALUE vself){
     vrv = rb_yield(vkey);
     cTable_put(vself, vkey, vrv);
   }
-
   return vrv;
 }
 
 static VALUE cTable_each(VALUE vself){
-  VALUE vrv;
-  TCMAP *cols;
+  VALUE vrv = Qnil;
   char *kbuf;
   int ksiz;
   if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
   TCRDB *db = mTokyoTyrant_getdb(vself);
-  vrv = Qnil;
+
   tcrdbiterinit(db);
   while((kbuf = tcrdbiternext(db, &ksiz)) != NULL){
-    if((cols = tcrdbtblget(db, kbuf, ksiz)) != NULL){
-      vrv = rb_yield_values(2, rb_str_new(kbuf, ksiz), maptovhash(cols));
-      tcmapdel(cols);
-    } else {
-      vrv = rb_yield_values(2, rb_str_new(kbuf, ksiz), Qnil);
-    }
+    VALUE vkey = rb_str_new(kbuf, ksiz);
+    VALUE vval = cTable_get(vself, vkey);
+
+    vrv = rb_yield_values(2, vkey, vval);
     tcfree(kbuf);
   }
   return vrv;
 }
 
 static VALUE cTable_each_value(VALUE vself){
-  VALUE vrv;
-  TCMAP *cols;
+  VALUE vrv = Qnil;
   char *kbuf;
   int ksiz;
   if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
   TCRDB *db = mTokyoTyrant_getdb(vself);
-  vrv = Qnil;
+
   tcrdbiterinit(db);
   while((kbuf = tcrdbiternext(db, &ksiz)) != NULL){
-    if((cols = tcrdbtblget(db, kbuf, ksiz)) != NULL){
-      vrv = rb_yield(maptovhash(cols));
-      tcmapdel(cols);
-    } else {
-      vrv = rb_yield(Qnil);
-    }
+    VALUE vkey = rb_str_new(kbuf, ksiz);
+    VALUE vval = cTable_get(vself, vkey);
+
+    vrv = rb_yield_values(1, vval);
     tcfree(kbuf);
   }
   return vrv;
 }
 
 static VALUE cTable_values(VALUE vself){
-  VALUE vary;
-  TCMAP *cols;
-  char *kxstr;
+  VALUE vary = rb_ary_new();;
+  char *kbuf;
   int ksiz;
   TCRDB *db = mTokyoTyrant_getdb(vself);
+
   vary = rb_ary_new2(tcrdbrnum(db));
   tcrdbiterinit(db);
-  while((kxstr = tcrdbiternext(db, &ksiz)) != NULL){
-    cols = tcrdbtblget(db, kxstr, ksiz);
-    rb_ary_push(vary, maptovhash(cols));
-    tcmapdel(cols);
-    tcfree(kxstr);
+  while((kbuf = tcrdbiternext(db, &ksiz)) != NULL){
+    VALUE vkey = rb_str_new(kbuf, ksiz);
+    VALUE vval = cTable_get(vself, vkey);
+
+    rb_ary_push(vary, vval);
+    tcfree(kbuf);
   }
   return vary;
 }

metadata

@@ -1,11 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-tokyotyrant
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 5
-  version: "0.5"
+  version: 0.5.1
 platform: ruby
 authors: 
 - Flinn
@@ -13,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-31 00:00:00 -04:00
+date: 2010-05-22 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -75,20 +71,18 @@ 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.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A C based TokyoTyrant Ruby binding