actsasflinn-ruby-tokyotyrant 0.1.5 → 0.1.6

data/Rakefile

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

data/ext/tokyo_tyrant.c

@@ -1,5 +1,21 @@
 #include <tokyo_tyrant.h>
 
+extern VALUE StringRaw(const char *buf, int bsiz){
+  VALUE vval;
+  int i;
+  vval = rb_str_buf_new2("");
+  char s[5];
+
+  for(i=0;i<bsiz;i++){
+    char c = *buf++;
+    s[0] = c;
+    rb_str_buf_cat(vval, s, 1);
+  }
+//    buf -= bsiz;
+//    rb_str_buf_cat2(vval, "");
+  return vval;
+}
+
 extern VALUE StringValueEx(VALUE vobj){
   char kbuf[NUMBUFSIZ];
   int ksiz;
@@ -75,27 +91,27 @@ extern TCMAP *vhashtomap(VALUE vhash){
 }
 
 extern VALUE maptovhash(TCMAP *map){
-  const char *kbuf, *vbuf;
+  const char *kbuf;
   int ksiz, vsiz;
   VALUE vhash;
   vhash = rb_hash_new();
   tcmapiterinit(map);
   while((kbuf = tcmapiternext(map, &ksiz)) != NULL){
-    vbuf = tcmapiterval(kbuf, &vsiz);
-    rb_hash_aset(vhash, rb_str_new(kbuf, ksiz), rb_str_new(vbuf, vsiz));
+    const char *vbuf = tcmapiterval(kbuf, &vsiz);
+    rb_hash_aset(vhash, rb_str_new(kbuf, ksiz), StringRaw(vbuf, vsiz));
   }
   return vhash;
 }
 
 extern VALUE maptovhashsym(TCMAP *map){
-  const char *kbuf, *vbuf;
+  const char *kbuf;
   int ksiz, vsiz;
   VALUE vhash;
   vhash = rb_hash_new();
   tcmapiterinit(map);
   while((kbuf = tcmapiternext(map, &ksiz)) != NULL){
-    vbuf = tcmapiterval(kbuf, &vsiz);
-    rb_hash_aset(vhash, ID2SYM(rb_intern(kbuf)), rb_str_new(vbuf, vsiz));
+    const char *vbuf = tcmapiterval(kbuf, &vsiz);
+    rb_hash_aset(vhash, ID2SYM(rb_intern(kbuf)), StringRaw(vbuf, vsiz));
   }
   return vhash;
 }

data/ext/tokyo_tyrant.h

@@ -36,6 +36,7 @@ extern VALUE cDB;
 extern VALUE cTable;
 extern VALUE cQuery;
 
+extern VALUE StringRaw(const char *buf, int bsiz);
 extern VALUE StringValueEx(VALUE vobj);
 extern TCLIST *varytolist(VALUE vary);
 extern VALUE listtovary(TCLIST *list);

data/ext/tokyo_tyrant_db.c

@@ -81,16 +81,31 @@ static VALUE cDB_putshl(VALUE vself, VALUE vkey, VALUE vstr, VALUE vwidth){
   return Qtrue;
 }
 
-static VALUE cDB_get(VALUE vself, VALUE vkey){
-  VALUE vval;
-  char *vbuf;
+static VALUE cDB_get(int argc, VALUE *argv, VALUE vself){
+  VALUE vkey, vraw, vval;
+  char *buf;
+  int bsiz, ecode;
+  bool raw;
   TCRDB *db;
   Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
 
+  rb_scan_args(argc, argv, "11", &vkey, &vraw);
+  raw = (vraw == Qtrue);
+
+  // this is ugly
   vkey = StringValueEx(vkey);
-  if(!(vbuf = tcrdbget2(db, RSTRING_PTR(vkey)))) return Qnil;
-  vval = rb_str_new2(vbuf);
-  tcfree(vbuf);
+  if(!(buf = tcrdbget(db, RSTRING_PTR(vkey), RSTRING_LEN(vkey), &bsiz))){
+    if ((ecode = tcrdbecode(db))) {
+      if (ecode != TTENOREC) {
+        rb_raise(eTokyoTyrantError, "get error: %s", tcrdberrmsg(ecode));
+      }
+    }
+    return Qnil;
+  } else {
+    vval = StringRaw(buf, bsiz);
+  }
+
+  tcfree(buf);
   return vval;
 }
 
@@ -134,26 +149,6 @@ static VALUE cDB_vsiz(VALUE vself, VALUE vkey){
   return INT2NUM(tcrdbvsiz2(db, RSTRING_PTR(vkey)));
 }
 
-static VALUE cDB_addint(VALUE vself, VALUE vkey, VALUE vnum){
-  int num;
-  TCRDB *db;
-  Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
-  vkey = StringValueEx(vkey);
-
-  num = tcrdbaddint(db, RSTRING_PTR(vkey), RSTRING_LEN(vkey), NUM2INT(vnum));
-  return num == INT_MIN ? Qnil : INT2NUM(num);
-}
-
-static VALUE cDB_adddouble(VALUE vself, VALUE vkey, VALUE vnum){
-  double num;
-  TCRDB *db;
-  Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
-
-  vkey = StringValueEx(vkey);
-  num = tcrdbadddouble(db, RSTRING_PTR(vkey), RSTRING_LEN(vkey), NUM2DBL(vnum));
-  return isnan(num) ? Qnil : rb_float_new(num);
-}
-
 static VALUE cDB_fetch(int argc, VALUE *argv, VALUE vself){
   VALUE vkey, vdef, vval;
   TCRDB *db;
@@ -163,7 +158,7 @@ static VALUE cDB_fetch(int argc, VALUE *argv, VALUE vself){
   vkey = StringValueEx(vkey);
   Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
   if((vbuf = tcrdbget(db, RSTRING_PTR(vkey), RSTRING_LEN(vkey), &vsiz)) != NULL){
-    vval = rb_str_new(vbuf, vsiz);
+    vval = StringRaw(vbuf, vsiz);
     tcfree(vbuf);
   } else {
     vval = vdef;
@@ -174,16 +169,18 @@ static VALUE cDB_fetch(int argc, VALUE *argv, VALUE vself){
 static VALUE cDB_each(VALUE vself){
   VALUE vrv;
   TCRDB *db;
-  char *kxstr, *vxstr;
   if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
   Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
   vrv = Qnil;
   tcrdbiterinit(db);
-  while((kxstr = tcrdbiternext2(db)) != NULL){
-    vxstr = tcrdbget2(db, kxstr);
-    vrv = rb_yield_values(2, rb_str_new2(kxstr), rb_str_new2(vxstr));
-    tcfree(vxstr);
-    tcfree(kxstr);
+  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);
+    tcfree(kbuf);
   }
   return vrv;
 }
@@ -191,16 +188,18 @@ static VALUE cDB_each(VALUE vself){
 static VALUE cDB_each_value(VALUE vself){
   VALUE vrv;
   TCRDB *db;
-  char *kxstr, *vxstr;
   if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
   Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
   vrv = Qnil;
   tcrdbiterinit(db);
-  while((kxstr = tcrdbiternext2(db)) != NULL){
-    vxstr = tcrdbget2(db, kxstr);
-    vrv = rb_yield_values(1, rb_str_new2(vxstr));
-    tcfree(vxstr);
-    tcfree(kxstr);
+  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);
+    tcfree(kbuf);
   }
   return vrv;
 }
@@ -208,38 +207,40 @@ static VALUE cDB_each_value(VALUE vself){
 static VALUE cDB_values(VALUE vself){
   VALUE vary;
   TCRDB *db;
-  char *kxstr, *vxstr;
   Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
   vary = rb_ary_new2(tcrdbrnum(db));
   tcrdbiterinit(db);
-  while((kxstr = tcrdbiternext2(db)) != NULL){
-    vxstr = tcrdbget2(db, kxstr);
-    rb_ary_push(vary, rb_str_new2(vxstr));
-    tcfree(vxstr);
-    tcfree(kxstr);
+  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);
+    tcfree(kbuf);
   }
   return vary;
 }
 
 void init_db(){
   rb_define_method(cDB, "mput", cDB_mput, 1);
+  rb_define_alias(cDB, "lput", "mput");       // Rufus Compat
   rb_define_method(cDB, "put", cDB_put, 2);
   rb_define_alias(cDB, "[]=", "put");
   rb_define_method(cDB, "putkeep", cDB_putkeep, 2);
   rb_define_method(cDB, "putcat", cDB_putcat, 2);
   rb_define_method(cDB, "putshl", cDB_putshl, 2);
   rb_define_method(cDB, "putnr", cDB_putnr, 2);
-  rb_define_method(cDB, "get", cDB_get, 1);
+  rb_define_method(cDB, "get", cDB_get, -1);
   rb_define_alias(cDB, "[]", "get");
   rb_define_method(cDB, "mget", cDB_mget, -1);
+  rb_define_alias(cDB, "lget", "mget");       // Rufus Compat
   rb_define_method(cDB, "vsiz", cDB_vsiz, 1);
   /*
   rb_define_method(cDB, "check_value", cDB_check_value, 1);
   rb_define_alias(cDB, "has_value?", "check_value");
   rb_define_alias(cDB, "value?", "check_value");
   */
-  rb_define_method(cDB, "addint", cDB_addint, 2);
-  rb_define_method(cDB, "adddouble", cDB_adddouble, 2);
 
   rb_define_method(cDB, "fetch", cDB_fetch, -1);
   rb_define_method(cDB, "each", cDB_each, 0);

data/ext/tokyo_tyrant_module.c

@@ -67,6 +67,39 @@ static VALUE mTokyoTyrant_out(VALUE vself, VALUE vkey){
   return tcrdbout2(db, RSTRING_PTR(vkey)) ? Qtrue : Qfalse;
 }
 
+// TODO: merge out and mout?
+static VALUE mTokyoTyrant_outlist(int argc, VALUE *argv, VALUE vself){
+  VALUE vkeys, vary, vvalue;
+  TCRDB *db;
+  TCLIST *list, *result;
+  Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
+  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)){
+      case T_STRING:
+      case T_FIXNUM:
+        break;
+      case T_ARRAY:
+        vkeys = vvalue;
+        break;
+      case T_OBJECT:
+        vkeys = rb_convert_type(vvalue, T_ARRAY, "Array", "to_a");
+        break;
+    }
+  }
+  Check_Type(vkeys, T_ARRAY);
+
+  list = varytolist(vkeys);
+  result = tcrdbmisc(db, "outlist", 0, list);
+  tclistdel(list);
+  vary = listtovary(result);
+  tclistdel(result);
+  return vary;
+}
+
 static VALUE mTokyoTyrant_check(VALUE vself, VALUE vkey){
   TCRDB *db;
   Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
@@ -111,6 +144,22 @@ static VALUE mTokyoTyrant_fwmkeys(int argc, VALUE *argv, VALUE vself){
   return vary;
 }
 
+static VALUE mTokyoTyrant_delete_keys_with_prefix(int argc, VALUE *argv, VALUE vself){
+  VALUE vprefix, vmax;
+  TCLIST *keys;
+  int max;
+  TCRDB *db;
+  Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
+  rb_scan_args(argc, argv, "11", &vprefix, &vmax);
+
+  vprefix = StringValueEx(vprefix);
+  max = (vmax == Qnil) ? -1 : NUM2INT(vmax);
+  keys = tcrdbfwmkeys(db, RSTRING_PTR(vprefix), RSTRING_LEN(vprefix), max);
+  tcrdbmisc(db, "outlist", 0, keys);
+  tclistdel(keys);
+  return Qnil;
+}
+
 static VALUE mTokyoTyrant_keys(VALUE vself){
   /*
   VALUE vary;
@@ -138,20 +187,32 @@ static VALUE mTokyoTyrant_keys(VALUE vself){
   return vary;
 }
 
-// TODO: Give this more attention, it's untested and needs defaults for scan_args
-static VALUE mTokyoTyrant_ext(int argc, VALUE *argv, VALUE vself){
-  const char *res;
-  VALUE vname, vkey, vvalue, vopts;
+static VALUE mTokyoTyrant_add_int(VALUE vself, VALUE vkey, VALUE vnum){
+  int num;
   TCRDB *db;
   Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
+  vkey = StringValueEx(vkey);
 
-  rb_scan_args(argc, argv, "14", &vname, &vkey, &vvalue, &vopts);
+  num = tcrdbaddint(db, RSTRING_PTR(vkey), RSTRING_LEN(vkey), NUM2INT(vnum));
+  return num == INT_MIN ? Qnil : INT2NUM(num);
+}
+
+static VALUE mTokyoTyrant_get_int(VALUE vself, VALUE vkey){
+  return mTokyoTyrant_add_int(vself, vkey, INT2NUM(0));
+}
+
+static VALUE mTokyoTyrant_add_double(VALUE vself, VALUE vkey, VALUE vnum){
+  double num;
+  TCRDB *db;
+  Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
 
-  vname = StringValueEx(vname);
   vkey = StringValueEx(vkey);
-  vvalue = StringValueEx(vvalue);
-  res = tcrdbext2(db, RSTRING_PTR(vname), FIXNUM_P(vopts), RSTRING_PTR(vkey), RSTRING_PTR(vvalue));
-  return rb_str_new2(res);
+  num = tcrdbadddouble(db, RSTRING_PTR(vkey), RSTRING_LEN(vkey), NUM2DBL(vnum));
+  return isnan(num) ? Qnil : rb_float_new(num);
+}
+
+static VALUE mTokyoTyrant_get_double(VALUE vself, VALUE vkey){
+  return mTokyoTyrant_add_double(vself, vkey, INT2NUM(0));
 }
 
 static VALUE mTokyoTyrant_sync(VALUE vself){
@@ -176,19 +237,27 @@ static VALUE mTokyoTyrant_copy(VALUE vself, VALUE path){
   return tcrdbcopy(db, RSTRING_PTR(path)) ? Qtrue : Qfalse;
 }
 
-static VALUE mTokyoTyrant_restore(VALUE vself, VALUE path, uint64_t ts){
+static VALUE mTokyoTyrant_restore(VALUE vself, VALUE vpath, VALUE vts, VALUE vopts){
+  uint64_t ts;
+  int opts;
   TCRDB *db;
   Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
 
-  Check_Type(path, T_STRING);
-  return tcrdbrestore(db, RSTRING_PTR(path), ts) ? Qtrue : Qfalse;
+  Check_Type(vpath, T_STRING);
+  ts = (uint64_t) FIX2INT(vts);
+  opts = FIX2INT(vopts);
+  return tcrdbrestore(db, RSTRING_PTR(vpath), ts, opts) ? Qtrue : Qfalse;
 }
 
-static VALUE mTokyoTyrant_setmst(VALUE vself, VALUE host, VALUE port){
+static VALUE mTokyoTyrant_setmst(VALUE vself, VALUE vhost, VALUE vport, VALUE vts, VALUE vopts){
+  uint64_t ts;
+  int opts;
   TCRDB *db;
   Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
 
-  return tcrdbsetmst(db, StringValuePtr(host), FIX2INT(port)) ? Qtrue : Qfalse;
+  ts = (uint64_t) FIX2INT(vts);
+  opts = FIX2INT(vopts);
+  return tcrdbsetmst(db, RSTRING_PTR(vhost), FIX2INT(vport), ts, opts) ? Qtrue : Qfalse;
 }
 
 static VALUE mTokyoTyrant_rnum(VALUE vself){
@@ -271,6 +340,10 @@ void init_mod(){
   rb_define_method(mTokyoTyrant, "errmsg", mTokyoTyrant_errmsg, -1);
   rb_define_method(mTokyoTyrant, "ecode", mTokyoTyrant_ecode, 0);
   rb_define_method(mTokyoTyrant, "out", mTokyoTyrant_out, 1);
+  rb_define_alias(mTokyoTyrant, "delete", "out");                 // Rufus Compat
+  rb_define_method(mTokyoTyrant, "outlist", mTokyoTyrant_outlist, -1);
+  rb_define_alias(mTokyoTyrant, "mdelete", "outlist");
+  rb_define_alias(mTokyoTyrant, "ldelete", "outlist");            // Rufus Compat
   rb_define_method(mTokyoTyrant, "check", mTokyoTyrant_check, 1);
   rb_define_alias(mTokyoTyrant, "has_key?", "check");
   rb_define_alias(mTokyoTyrant, "key?", "check");
@@ -279,8 +352,13 @@ void init_mod(){
   rb_define_method(mTokyoTyrant, "iterinit", mTokyoTyrant_iterinit, 0);
   rb_define_method(mTokyoTyrant, "iternext", mTokyoTyrant_iternext, 0);
   rb_define_method(mTokyoTyrant, "fwmkeys", mTokyoTyrant_fwmkeys, -1);
+  rb_define_method(mTokyoTyrant, "delete_keys_with_prefix", mTokyoTyrant_delete_keys_with_prefix, -1);// Rufus Compat
+  rb_define_alias(mTokyoTyrant, "dfwmkeys", "delete_keys_with_prefix");  
   rb_define_method(mTokyoTyrant, "keys", mTokyoTyrant_keys, 0);
-  rb_define_method(mTokyoTyrant, "ext", mTokyoTyrant_ext, -1);
+  rb_define_method(mTokyoTyrant, "add_int", mTokyoTyrant_add_int, 2);
+  rb_define_method(mTokyoTyrant, "get_int", mTokyoTyrant_get_int, 1);
+  rb_define_method(mTokyoTyrant, "add_double", mTokyoTyrant_add_double, 2);
+  rb_define_method(mTokyoTyrant, "get_double", mTokyoTyrant_get_double, 1);
   rb_define_method(mTokyoTyrant, "sync", mTokyoTyrant_sync, 0);
   rb_define_method(mTokyoTyrant, "vanish", mTokyoTyrant_vanish, 0);
   rb_define_alias(mTokyoTyrant, "clear", "vanish");
@@ -290,7 +368,8 @@ void init_mod(){
   rb_define_method(mTokyoTyrant, "rnum", mTokyoTyrant_rnum, 0);
   rb_define_alias(mTokyoTyrant, "count", "rnum");
   rb_define_method(mTokyoTyrant, "empty?", mTokyoTyrant_empty, 0);
-  rb_define_method(mTokyoTyrant, "size", mTokyoTyrant_size, 0);
+  rb_define_alias(mTokyoTyrant, "size", "rnum");                    // Rufus Compat
+  rb_define_method(mTokyoTyrant, "db_size", mTokyoTyrant_size, 0);  // Rufus Compat
   rb_define_alias(mTokyoTyrant, "length", "size");
   rb_define_method(mTokyoTyrant, "stat", mTokyoTyrant_stat, 0);
   rb_define_method(mTokyoTyrant, "misc", mTokyoTyrant_misc, -1);

data/ext/tokyo_tyrant_query.c

@@ -82,10 +82,18 @@ static VALUE cQuery_searchout(VALUE vself){
   return tcrdbqrysearchout(qry) ? Qtrue : Qfalse;
 }
 
+static VALUE cQuery_searchcount(VALUE vself){
+  VALUE vqry;
+  RDBQRY *qry;
+  vqry = rb_iv_get(vself, RDBQRYVNDATA);
+  Data_Get_Struct(vqry, RDBQRY, qry);
+  return LL2NUM(tcrdbqrysearchcount(qry));
+}
+
 static VALUE cQuery_get(VALUE vself){
   int i, num, ksiz;
-  const char *name, *col;
-  VALUE vqry, vary, vcols;
+  const char *name, *col, *pkey;
+  VALUE vqry, vary, vcols, vpkey;
   RDBQRY *qry;
   TCLIST *res;
   TCMAP *cols;
@@ -95,6 +103,8 @@ static VALUE cQuery_get(VALUE vself){
   res = tcrdbqrysearchget(qry);
   num = tclistnum(res);
   vary = rb_ary_new2(num);
+  vpkey = rb_iv_get(vself, "@pkey");
+  pkey = vpkey == Qnil ? "__id" : STR2CSTR(StringValueEx(vpkey));
   for(i = 0; i < num; i++){
     vcols = rb_hash_new();
     cols = tcrdbqryrescols(res, i);
@@ -102,7 +112,7 @@ static VALUE cQuery_get(VALUE vself){
       tcmapiterinit(cols);
       while((name = tcmapiternext(cols, &ksiz)) != NULL){
         col = tcmapget2(cols, name);
-        if (ksiz == 0) name = "__id";
+        if (ksiz == 0) name = pkey;
         rb_hash_aset(vcols, ID2SYM(rb_intern(name)), rb_str_new2(col));
       }
     }
@@ -113,6 +123,10 @@ static VALUE cQuery_get(VALUE vself){
   return vary;
 }
 
+static VALUE cQuery_set_pkey(VALUE vself, VALUE vpkey) {
+  return rb_iv_set(vself, "@pkey", vpkey);
+}
+
 void init_query(){
   rb_define_const(cQuery, "CSTREQ", INT2NUM(RDBQCSTREQ));
   rb_define_const(cQuery, "CSTRINC", INT2NUM(RDBQCSTRINC));
@@ -140,12 +154,18 @@ void init_query(){
   rb_define_method(cQuery, "addcond", cQuery_addcond, 3);
   rb_define_alias(cQuery, "add_condition", "addcond");
   rb_define_alias(cQuery, "condition", "addcond");
+  rb_define_alias(cQuery, "add", "addcond");                    // Rufus Compat
   rb_define_method(cQuery, "setorder", cQuery_setorder, 2);
-  rb_define_alias(cQuery, "order_by", "setorder");
+  rb_define_alias(cQuery, "order_by", "setorder");              // Rufus Compat
   rb_define_method(cQuery, "setmax", cQuery_setmax, 1);
-  rb_define_alias(cQuery, "limit", "setmax");
+  rb_define_alias(cQuery, "limit", "setmax");                   // Rufus Compat
   rb_define_method(cQuery, "search", cQuery_search, 0);
   rb_define_alias(cQuery, "run", "search");
   rb_define_method(cQuery, "searchout", cQuery_searchout, 0);
+  rb_define_alias(cQuery, "delete", "searchout");               // Rufus Compat
+  rb_define_method(cQuery, "searchcount", cQuery_searchcount, 0);
+  rb_define_alias(cQuery, "count", "searchcount");              // Rufus Compat
   rb_define_method(cQuery, "get", cQuery_get, 0);
+  rb_define_method(cQuery, "set_pkey", cQuery_set_pkey, 1);
+  rb_define_alias(cQuery, "pkey=", "set_pkey");
 }

data/ext/tokyo_tyrant_table.c

@@ -107,7 +107,7 @@ static VALUE cTable_get(VALUE vself, VALUE vkey){
 }
 
 static VALUE cTable_mget(int argc, VALUE *argv, VALUE vself){
-  const char *kbuf, *vbuf;
+  const char *kbuf;
   int ksiz, vsiz;
   VALUE vkeys, vhash, vcols, vvalue;
   TCRDB *db;
@@ -137,11 +137,11 @@ static VALUE cTable_mget(int argc, VALUE *argv, VALUE vself){
   vhash = rb_hash_new();
   tcmapiterinit(recs);
   while((kbuf = tcmapiternext(recs, &ksiz)) != NULL){
-    vbuf = tcmapiterval(kbuf, &vsiz);
+    const char *vbuf = tcmapiterval(kbuf, &vsiz);
     cols = tcstrsplit4(vbuf, vsiz);
     vcols = maptovhashsym(cols);
     tcmapdel(cols);
-    rb_hash_aset(vhash, rb_str_new(kbuf, ksiz), vcols);
+    rb_hash_aset(vhash, StringRaw(kbuf, ksiz), vcols);
   }
   tcmapdel(recs);
   return vhash;
@@ -150,7 +150,15 @@ static VALUE cTable_mget(int argc, VALUE *argv, VALUE vself){
 static VALUE cTable_setindex(VALUE vself, VALUE vname, VALUE vtype){
   TCRDB *db;
   Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
-  Check_Type(vname, T_STRING);
+  vname = StringValueEx(vname);
+  if (TYPE(vtype) == T_SYMBOL) vtype = rb_str_new2(rb_id2name(SYM2ID(vtype)));
+
+  if (TYPE(vtype) == T_STRING){
+    vtype = StringValueEx(vtype);
+    vtype = tctdbstrtoindextype(RSTRING_PTR(toupper(vtype)));
+    vtype = INT2NUM(vtype);
+  }
+
   return tcrdbtblsetindex(db, RSTRING_PTR(vname), NUM2INT(vtype)) ? Qtrue : Qfalse;
 }
 
@@ -268,15 +276,18 @@ static VALUE cTable_find(VALUE vself){
 
 void init_table(){
   rb_define_method(cTable, "mput", cTable_mput, 1);
+  rb_define_alias(cTable, "lput", "mput");                    // Rufus Compat
   rb_define_method(cTable, "put", cTable_put, 2);
   rb_define_alias(cTable, "[]=", "put");
   rb_define_method(cTable, "putkeep", cTable_putkeep, 2);
   rb_define_method(cTable, "putcat", cTable_putcat, 2);
   rb_define_method(cTable, "out", cTable_out, 1);
+  rb_define_alias(cTable, "delete", "out");                   // Rufus Compat
   rb_define_method(cTable, "get", cTable_get, 1);
   rb_define_method(cTable, "mget", cTable_mget, -1);
+  rb_define_alias(cTable, "lget", "mget");                    // Rufus Compat
   rb_define_alias(cTable, "[]", "get");
-  rb_define_method(cTable, "setindex", cTable_setindex, 2);
+  rb_define_method(cTable, "set_index", cTable_setindex, 2);  // Rufus Compat
   rb_define_method(cTable, "genuid", cTable_genuid, 0);
   rb_define_alias(cTable, "generate_unique_id", "genuid");
   rb_define_method(cTable, "fetch", cTable_fetch, -1);

data/spec/tokyo_tyrant_query_spec.rb

@@ -88,4 +88,20 @@ describe TokyoTyrant::Query, "with an open database" do
                    {:type=>"Cucumber", :variety=>"Lemon", :__id=>"4595", :code=>"4595"},
                    {:type=>"Cucumber", :variety=>"Japanese / White", :__id=>"4594", :code=>"4594"}]
   end
+
+  it "should show query count" do
+    res = @db.prepare_query{ |q| q.condition(:type, :streq, 'Cucumber') }.count
+    res.should == 5
+  end
+
+  it "should allow a custom pkey for a result set" do
+    q = @db.query
+    q.condition(:type, :streq, 'Cucumber')
+    q.set_pkey(:pk)
+    q.get.should == [{:type=>"Cucumber", :code=>"4592", :pk=>"4592", :variety=>"Armenian"},
+                     {:type=>"Cucumber", :code=>"4593", :pk=>"4593", :variety=>"English / Hot House / Long Seedless / Telegraph / Continental"},
+                     {:type=>"Cucumber", :code=>"4594", :pk=>"4594", :variety=>"Japanese / White"},
+                     {:type=>"Cucumber", :code=>"4595", :pk=>"4595", :variety=>"Lemon"},
+                     {:type=>"Cucumber", :code=>"4596", :pk=>"4596", :variety=>"Pickling / Gherkin"}]
+  end
 end

data/spec/tokyo_tyrant_spec.rb

@@ -42,6 +42,16 @@ describe TokyoTyrant::DB, "with an open database" do
     end
   end
 
+  it "should delete multiple values" do
+    h = { 'pizza' => 'old forge style',
+          'sandwich' => 'peanut butter jelly',
+          'yogurt' => 'greek',
+          'coffee' => 'black' }
+    @db.mput(h)
+    @db.outlist('coffee', 'yogurt').should.be.empty
+    @db.keys.sort.should == ['pizza','sandwich']
+  end
+
   it "should get multiple values" do
     h = { 'pizza' => 'old forge style',
           'sandwich' => 'peanut butter jelly',
@@ -97,6 +107,17 @@ describe TokyoTyrant::DB, "with an open database" do
     @db.fwmkeys('apples').sort.should == ["apples/grannysmith", "apples/royalgala"]
   end
 
+  it "should delete forward matching keys" do
+    @db['apples/royalgala'] = '4173'
+    @db['apples/grannysmith'] = '4139'
+    @db['bananas/yellow'] = '4011'
+    @db['oranges/shamouti'] = '3027'
+    @db['grapefruit/deepred'] = '4288'
+    @db.delete_keys_with_prefix('apples').should == nil
+    @db.fwmkeys('apples').should.be.empty
+    @db.keys.sort.should == ['bananas/yellow', 'grapefruit/deepred', 'oranges/shamouti']
+  end
+
   it "should get all keys" do
     keys = %w[appetizers entree dessert]
     values = %w[chips chicken\ caeser\ salad ice\ cream]
@@ -131,7 +152,7 @@ describe TokyoTyrant::DB, "with an open database" do
 
   it "should report db size" do
     @db['rootbeer'] = 'virgils'
-    @db.size.should == 528736
+    @db.db_size.should == 528736
   end
 
   it "should fetch a record" do
@@ -177,4 +198,20 @@ describe TokyoTyrant::DB, "with an open database" do
       i = i += 1
     end
   end
+
+  it "should add serialized integer values" do
+    key = 'counter'
+    @db.out(key)
+    @db.add_int(key, 1).should == 1
+    @db.add_int(key, 1).should == 2
+    @db.get_int(key).should == 2
+  end
+
+  it "should add serialized double values" do
+    key = 'counter'
+    @db.out(key)
+    @db.add_double(key, 1.0).should.be.close?(1.0, 0.005)
+    @db.add_double(key, 1.0).should.be.close?(2.0, 0.005)
+    @db.get_double(key).should.be.close?(2.0, 0.005)
+  end
 end

data/spec/tokyo_tyrant_table_spec.rb

@@ -45,6 +45,17 @@ describe TokyoTyrant::Table, "with an open database" do
     end
   end
 
+  it "should delete multiple values" do
+    h = { 'pizza' => { :best => 'old forge style', :ok => 'new york style', :worst => 'chicago style' },
+          'sandwich' => { :best => 'peanut butter jelly', :ok => 'turkey', :worst => 'olive loaf' },
+          'yogurt' => { :best => 'greek', :ok => 'organic', :worst => '+hfcs' },
+          'coffee' => { :best => 'black', :ok => 'espresso', :worst => 'latte' } }
+
+    @db.mput(h)
+    @db.outlist('coffee', 'yogurt').should.be.empty
+    @db.keys.sort.should == ['pizza','sandwich']
+  end
+
   it "should get multiple values" do
     h = { 'pizza' => { :best => 'old forge style', :ok => 'new york style', :worst => 'chicago style' },
           'sandwich' => { :best => 'peanut butter jelly', :ok => 'turkey', :worst => 'olive loaf' },
@@ -94,6 +105,17 @@ describe TokyoTyrant::Table, "with an open database" do
     @db.fwmkeys('apples').sort.should == ["apples/grannysmith", "apples/royalgala"]
   end
 
+  it "should delete forward matching keys" do
+    @db['apples/royalgala'] = { :code => '4173', :color => 'red-yellow' }
+    @db['apples/grannysmith'] = { :code => '4139', :color => 'green' }
+    @db['bananas/yellow'] = { :code => '4011', :color => 'yellow' }
+    @db['oranges/shamouti'] = { :code => '3027', :color => 'orange' }
+    @db['grapefruit/deepred'] = { :code => '4288', :color => 'yellow/pink' }
+    @db.delete_keys_with_prefix('apples').should == nil
+    @db.fwmkeys('apples').should.be.empty
+    @db.keys.sort.should == ['bananas/yellow', 'grapefruit/deepred', 'oranges/shamouti']
+  end
+
   it "should get all keys" do
     keys = %w[appetizers entree dessert]
     values = [{ :cheap => 'chips', :expensive => 'sample everything platter' },
@@ -134,7 +156,7 @@ describe TokyoTyrant::Table, "with an open database" do
 
   it "should report db size" do
     @db['rootbeer'] = { :gourmet => 'Virgils', :natural => 'Hansens' }
-    @db.size.should == 528768
+    @db.db_size.should == 528768
   end
 
   it "should fetch a record" do
@@ -187,4 +209,33 @@ describe TokyoTyrant::Table, "with an open database" do
       i = i += 1
     end
   end
+
+  it "should add serialized integer values" do
+    key = 'counter'
+    @db.out(key)
+    @db[key] = { :title => 'Bean Counter' }
+    @db.add_int(key, 1).should == 1
+    @db.add_int(key, 1).should == 2
+    @db.get_int(key).should == 2
+    @db[key].should == { :title => 'Bean Counter', :_num => "2" }
+  end
+
+  it "should add serialized double values" do
+    key = 'counter'
+    @db.out(key)
+    @db[key] = { :title => 'Bean Counter' }
+    @db.add_double(key, 1.0).should.be.close?(1.0, 0.005)
+    @db.add_double(key, 1.0).should.be.close?(2.0, 0.005)
+    @db.get_double(key).should.be.close?(2.0, 0.005)
+    @db[key].should == { :title => 'Bean Counter', :_num => "2" }
+  end
+
+  it "should set an index" do
+    key = 'counter'
+    50.times do |i|
+      @db["key#{i}"] = { :title => %w{rice beans corn}.sort_by{rand}.first,
+                         :description => 'a whole protein' }
+    end
+    @db.set_index(:title, :lexical).should.be.true
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: actsasflinn-ruby-tokyotyrant
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Flinn
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-11 00:00:00 -07:00
+date: 2009-05-21 00:00:00 -07:00
 default_executable: 
 dependencies: []