actsasflinn-ruby-tokyotyrant 0.1.8 → 0.1.9

data/README.rdoc

@@ -4,7 +4,7 @@ This is a c extension for Ruby to access TokyoTyrant databases.  It currently su
 
 == Install
 
-  # install tokyocabinet and tokyotyrant (requires 1.1.27)
+  # install tokyocabinet (1.4.29) and tokyotyrant (requires 1.1.31)
   # after installing tc and tt on linux I had to /sbin/ldconfig (as root)
   gem sources -a http://gems.github.com
   sudo gem install actsasflinn-ruby-tokyotyrant
@@ -111,6 +111,51 @@ This is not in production but the initial benchmarks are very interesting. Resul
   q.get
   # => [{:sex=>"male", :name=>"Pat 1", :__id=>"1"}, {:sex=>"male", :name=>"Pat 3", :__id=>"3"}, {:sex=>"male", :name=>"Pat 5", :__id=>"5"}, {:sex=>"male", :name=>"Pat 7", :__id=>"7"}, {:sex=>"male", :name=>"Pat 9", :__id=>"9"}]
 
-== TODO
-* implement get_reverse for has_value?
-* fix up and test extensions
+=== Full Text Search
+
+  require 'tokyo_tyrant'
+  require 'nokogiri'
+  require 'open-uri'
+
+  t = TokyoTyrant::Table.new('127.0.0.1', 1978)
+
+  (1..13).each do |n|
+    doc = Nokogiri::HTML(open("http://www.sacred-texts.com/chr/herm/hermes#{n}.htm"))
+    chapter = doc.css('h2').last.inner_text.gsub(/\n/, '').gsub(/ +/, ' ').strip
+    doc.css('p').each_with_index do |paragraph, i|
+      paragraph = paragraph.inner_text.gsub(/\n/, '').gsub(/ +/, ' ').strip
+      key = "chapter:#{n}:paragraph:#{i+1}"
+      t[key] = { :chapter => chapter, :paragraph => paragraph }
+    end
+  end
+
+  # full-text search with the phrase of
+  t.query{ |q| q.condition(:paragraph, :fts, 'rebirth') }
+  # => ["chapter:13:paragraph:4", "chapter:13:paragraph:5", "chapter:13:paragraph:7", "chapter:13:paragraph:19", "chapter:13:paragraph:27", "chapter:13:paragraph:44", "chapter:13:paragraph:57", "chapter:13:paragraph:69", "chapter:13:paragraph:125"]
+
+  # full-text search with all tokens in
+  t.query{ |q| q.condition(:paragraph, :ftsand, 'logos word') }
+  # => ["chapter:1:paragraph:12", "chapter:1:paragraph:14", "chapter:1:paragraph:17", "chapter:1:paragraph:19", "chapter:1:paragraph:24", "chapter:1:paragraph:27", "chapter:1:paragraph:43", "chapter:1:paragraph:53", "chapter:1:paragraph:62", "chapter:1:paragraph:89", "chapter:1:paragraph:90", "chapter:1:paragraph:94", "chapter:9:paragraph:5", "chapter:9:paragraph:35", "chapter:11:paragraph:3", "chapter:13:paragraph:2", "chapter:13:paragraph:94", "chapter:13:paragraph:121"]
+
+  # full-text search with at least one token in
+  t.query{ |q| q.condition(:paragraph, :ftsor, 'sermon key') }
+  # => ["chapter:5:paragraph:1", "chapter:9:paragraph:3", "chapter:10:paragraph:1", "chapter:10:paragraph:4", "chapter:10:paragraph:28", "chapter:11:paragraph:3", "chapter:11:paragraph:66", "chapter:11:paragraph:69", "chapter:13:paragraph:4", "chapter:13:paragraph:5", "chapter:13:paragraph:69"]
+
+  # negated full-text search with at least one token in
+  t.query{ |q| q.condition(:paragraph, '!ftsor', 'the god he and I that said') }
+  # => ["chapter:1:paragraph:95", "chapter:1:paragraph:96", "chapter:1:paragraph:97", "chapter:1:paragraph:98", "chapter:1:paragraph:99", "chapter:2:paragraph:3", "chapter:2:paragraph:5", "chapter:2:paragraph:6", "chapter:2:paragraph:7", "chapter:2:paragraph:9", "chapter:2:paragraph:11", "chapter:2:paragraph:13", "chapter:2:paragraph:15", "chapter:2:paragraph:17", "chapter:2:paragraph:19", "chapter:2:paragraph:21", "chapter:2:paragraph:36", "chapter:2:paragraph:43", "chapter:2:paragraph:47", "chapter:2:paragraph:48", "chapter:2:paragraph:49", "chapter:5:paragraph:4", "chapter:10:paragraph:27", "chapter:10:paragraph:62", "chapter:10:paragraph:64", "chapter:13:paragraph:3", "chapter:13:paragraph:9", "chapter:13:paragraph:17", "chapter:13:paragraph:24", "chapter:13:paragraph:29", "chapter:13:paragraph:32", "chapter:13:paragraph:37", "chapter:13:paragraph:45", "chapter:13:paragraph:50", "chapter:13:paragraph:56", "chapter:13:paragraph:59", "chapter:13:paragraph:63", "chapter:13:paragraph:67", "chapter:13:paragraph:70", "chapter:13:paragraph:76", "chapter:13:paragraph:82", "chapter:13:paragraph:87", "chapter:13:paragraph:88", "chapter:13:paragraph:90", "chapter:13:paragraph:98", "chapter:13:paragraph:101", "chapter:13:paragraph:105", "chapter:13:paragraph:110", "chapter:13:paragraph:113", "chapter:13:paragraph:117", "chapter:13:paragraph:123"]
+
+=== Lua Extension
+
+  # ttserver -ext spec/ext.lua 
+  require 'tokyo_tyrant'
+  t = TokyoTyrant::Table.new('127.0.0.1', 1978)
+
+  t.run(:echo, 'hello', 'world')
+  # => "hello\tworld"
+
+== Contributors
+
+* Flinn Mueller (actsasflinn) author/maintainer
+* Justin Reagor (cheapRoc) specs
+* Seth Yates (sethyates) run method (lua ext)

data/Rakefile

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

data/ext/tokyo_tyrant.c

@@ -103,19 +103,6 @@ extern VALUE maptovhash(TCMAP *map){
   return vhash;
 }
 
-extern VALUE maptovhashsym(TCMAP *map){
-  const char *kbuf;
-  int ksiz, vsiz;
-  VALUE vhash;
-  vhash = rb_hash_new();
-  tcmapiterinit(map);
-  while((kbuf = tcmapiternext(map, &ksiz)) != NULL){
-    const char *vbuf = tcmapiterval(kbuf, &vsiz);
-    rb_hash_aset(vhash, ID2SYM(rb_intern(kbuf)), StringRaw(vbuf, vsiz));
-  }
-  return vhash;
-}
-
 extern TCMAP *varytomap(VALUE vary){
   int i;
   TCLIST *keys;

data/ext/tokyo_tyrant.h

@@ -42,7 +42,6 @@ extern TCLIST *varytolist(VALUE vary);
 extern VALUE listtovary(TCLIST *list);
 extern TCMAP *vhashtomap(VALUE vhash);
 extern VALUE maptovhash(TCMAP *map);
-extern VALUE maptovhashsym(TCMAP *map);
 extern TCMAP *varytomap(VALUE vhash);
 extern TCLIST *vhashtolist(VALUE vhash);
 

data/ext/tokyo_tyrant_db.c

@@ -1,38 +1,33 @@
 #include <tokyo_tyrant_db.h>
 
 static VALUE cDB_put_method(VALUE vself, VALUE vkey, VALUE vstr, int method){
-  int ecode;
   bool res;
-  TCRDB *db;
-  Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
+  TCRDB *db = mTokyoTyrant_getdb(vself);
 
   vkey = StringValueEx(vkey);
   vstr = StringValueEx(vstr);
 
   switch(method){
     case TTPUT:
-      res = tcrdbput2(db, RSTRING_PTR(vkey), RSTRING_PTR(vstr));
+      res = tcrdbput(db, RSTRING_PTR(vkey), RSTRING_LEN(vkey), RSTRING_PTR(vstr), RSTRING_LEN(vstr));
       break;
     case TTPUTKEEP:
-      res = tcrdbputkeep2(db, RSTRING_PTR(vkey), RSTRING_PTR(vstr));
+      res = tcrdbputkeep(db, RSTRING_PTR(vkey), RSTRING_LEN(vkey), RSTRING_PTR(vstr), RSTRING_LEN(vstr));
       break;
     case TTPUTCAT:
-      res = tcrdbputcat2(db, RSTRING_PTR(vkey), RSTRING_PTR(vstr));
+      res = tcrdbputcat(db, RSTRING_PTR(vkey), RSTRING_LEN(vkey), RSTRING_PTR(vstr), RSTRING_LEN(vstr));
       break;
     case TTPUTNR:
-      res = tcrdbputnr2(db, RSTRING_PTR(vkey), RSTRING_PTR(vstr));
+      res = tcrdbputnr(db, RSTRING_PTR(vkey), RSTRING_LEN(vkey), RSTRING_PTR(vstr), RSTRING_LEN(vstr));
       break;
     default:
       res = false;
       break;
   }
 
-  if(!res){
-    ecode = tcrdbecode(db);
-    rb_raise(eTokyoTyrantError, "put error: %s", tcrdberrmsg(ecode));
-  }
+  if(!res) mTokyoTyrant_exception(vself);
 
-  return Qtrue;  
+  return Qtrue;
 }
 
 static VALUE cDB_put(VALUE vself, VALUE vkey, VALUE vstr){
@@ -41,9 +36,8 @@ static VALUE cDB_put(VALUE vself, VALUE vkey, VALUE vstr){
 
 static VALUE cDB_mput(VALUE vself, VALUE vhash){
   VALUE vary;
-  TCRDB *db;
   TCLIST *list, *args;
-  Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
+  TCRDB *db = mTokyoTyrant_getdb(vself);
 
   args = vhashtolist(vhash);
   list = tcrdbmisc(db, "putlist", 0, args);
@@ -66,17 +60,15 @@ static VALUE cDB_putnr(VALUE vself, VALUE vkey, VALUE vstr){
 }
 
 static VALUE cDB_putshl(VALUE vself, VALUE vkey, VALUE vstr, VALUE vwidth){
-  int ecode;
-  TCRDB *db;
-  Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
+  bool res;
+  TCRDB *db = mTokyoTyrant_getdb(vself);
 
   vkey = StringValueEx(vkey);
   vstr = StringValueEx(vstr);
 
-  if(!tcrdbputshl2(db, RSTRING_PTR(vkey), RSTRING_PTR(vstr), FIXNUM_P(vwidth))){
-    ecode = tcrdbecode(db);
-    rb_raise(eTokyoTyrantError, "put error: %s", tcrdberrmsg(ecode));
-  }
+  res = tcrdbputshl(db, RSTRING_PTR(vkey), RSTRING_LEN(vkey), RSTRING_PTR(vstr), RSTRING_LEN(vstr), FIXNUM_P(vwidth));
+
+  if(!res) mTokyoTyrant_exception(vself);
 
   return Qtrue;
 }
@@ -85,16 +77,13 @@ static VALUE cDB_get(VALUE vself, VALUE vkey){
   VALUE vval;
   char *buf;
   int bsiz, ecode;
-  TCRDB *db;
-  Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
+  TCRDB *db = mTokyoTyrant_getdb(vself);
 
   // this is ugly
   vkey = StringValueEx(vkey);
   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));
-      }
+      if (ecode != TTENOREC) mTokyoTyrant_exception(vself);
     }
     return Qnil;
   } else {
@@ -107,9 +96,8 @@ static VALUE cDB_get(VALUE vself, VALUE vkey){
 
 static VALUE cDB_mget(int argc, VALUE *argv, VALUE vself){
   VALUE vkeys, vhash, vvalue;
-  TCRDB *db;
   TCMAP *recs;
-  Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
+  TCRDB *db = mTokyoTyrant_getdb(vself);
   rb_scan_args(argc, argv, "*", &vkeys);
 
   // I really hope there is a better way to do this
@@ -122,6 +110,7 @@ static VALUE cDB_mget(int argc, VALUE *argv, VALUE vself){
       case T_ARRAY:
         vkeys = vvalue;
         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");
         break;
@@ -138,21 +127,19 @@ static VALUE cDB_mget(int argc, VALUE *argv, VALUE vself){
 }
 
 static VALUE cDB_vsiz(VALUE vself, VALUE vkey){
-  TCRDB *db;
-  Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
+  TCRDB *db = mTokyoTyrant_getdb(vself);
 
   vkey = StringValueEx(vkey);
-  return INT2NUM(tcrdbvsiz2(db, RSTRING_PTR(vkey)));
+  return INT2NUM(tcrdbvsiz(db, RSTRING_PTR(vkey), RSTRING_LEN(vkey)));
 }
 
 static VALUE cDB_fetch(int argc, VALUE *argv, VALUE vself){
   VALUE vkey, vdef, vval;
-  TCRDB *db;
   char *vbuf;
   int vsiz;
   rb_scan_args(argc, argv, "11", &vkey, &vdef);
+  TCRDB *db = mTokyoTyrant_getdb(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 = StringRaw(vbuf, vsiz);
     tcfree(vbuf);
@@ -164,9 +151,8 @@ static VALUE cDB_fetch(int argc, VALUE *argv, VALUE vself){
 
 static VALUE cDB_each(VALUE vself){
   VALUE vrv;
-  TCRDB *db;
   if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
-  Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
+  TCRDB *db = mTokyoTyrant_getdb(vself);
   vrv = Qnil;
   tcrdbiterinit(db);
   int ksiz;
@@ -183,9 +169,8 @@ static VALUE cDB_each(VALUE vself){
 
 static VALUE cDB_each_value(VALUE vself){
   VALUE vrv;
-  TCRDB *db;
   if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
-  Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
+  TCRDB *db = mTokyoTyrant_getdb(vself);
   vrv = Qnil;
   tcrdbiterinit(db);
   int ksiz;
@@ -202,8 +187,7 @@ static VALUE cDB_each_value(VALUE vself){
 
 static VALUE cDB_values(VALUE vself){
   VALUE vary;
-  TCRDB *db;
-  Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
+  TCRDB *db = mTokyoTyrant_getdb(vself);
   vary = rb_ary_new2(tcrdbrnum(db));
   tcrdbiterinit(db);
   int ksiz;
@@ -225,7 +209,7 @@ void init_db(){
   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, "putshl", cDB_putshl, 3);
   rb_define_method(cDB, "putnr", cDB_putnr, 2);
   rb_define_method(cDB, "get", cDB_get, 1);
   rb_define_alias(cDB, "[]", "get");

data/ext/tokyo_tyrant_module.c

@@ -1,17 +1,30 @@
 #include <tokyo_tyrant_db.h>
 
+extern TCRDB *mTokyoTyrant_getdb(VALUE vself){
+  TCRDB *db;
+  Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
+  return db;
+}
+
+extern void mTokyoTyrant_exception(VALUE vself){
+  int ecode;
+  TCRDB *db = mTokyoTyrant_getdb(vself);
+
+  ecode = tcrdbecode(db);
+  rb_raise(eTokyoTyrantError, tcrdberrmsg(ecode));
+}
+
 static void mTokyoTyrant_free(TCRDB *db){
   tcrdbdel(db);
 }
 
 static VALUE mTokyoTyrant_server(VALUE vself){
-  return rb_iv_get(vself, "@server");;
+  return rb_iv_get(vself, "@server");
 }
 
 static VALUE mTokyoTyrant_close(VALUE vself){
   int ecode;
-  TCRDB *db;
-  Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
+  TCRDB *db = mTokyoTyrant_getdb(vself);
 
   if(!tcrdbclose(db)){
     ecode = tcrdbecode(db);
@@ -54,8 +67,7 @@ static VALUE mTokyoTyrant_errmsg(int argc, VALUE *argv, VALUE vself){
   VALUE vecode;
   const char *msg;
   int ecode;
-  TCRDB *db;
-  Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
+  TCRDB *db = mTokyoTyrant_getdb(vself);
   rb_scan_args(argc, argv, "01", &vecode);
 
   ecode = (vecode == Qnil) ? tcrdbecode(db) : NUM2INT(vecode);
@@ -64,26 +76,23 @@ static VALUE mTokyoTyrant_errmsg(int argc, VALUE *argv, VALUE vself){
 }
 
 static VALUE mTokyoTyrant_ecode(VALUE vself){
-  TCRDB *db;
-  Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
+  TCRDB *db = mTokyoTyrant_getdb(vself);
 
   return INT2NUM(tcrdbecode(db));
 }
 
 static VALUE mTokyoTyrant_out(VALUE vself, VALUE vkey){
-  TCRDB *db;
-  Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
+  TCRDB *db = mTokyoTyrant_getdb(vself);
 
   vkey = StringValueEx(vkey);
-  return tcrdbout2(db, RSTRING_PTR(vkey)) ? Qtrue : Qfalse;
+  return tcrdbout(db, RSTRING_PTR(vkey), RSTRING_LEN(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);
+  TCRDB *db = mTokyoTyrant_getdb(vself);
   rb_scan_args(argc, argv, "*", &vkeys);
 
   // I really hope there is a better way to do this
@@ -112,16 +121,14 @@ static VALUE mTokyoTyrant_outlist(int argc, VALUE *argv, VALUE vself){
 }
 
 static VALUE mTokyoTyrant_check(VALUE vself, VALUE vkey){
-  TCRDB *db;
-  Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
+  TCRDB *db = mTokyoTyrant_getdb(vself);
 
   vkey = StringValueEx(vkey);
-  return tcrdbvsiz2(db, RSTRING_PTR(vkey)) >= 0 ? Qtrue : Qfalse;
+  return tcrdbvsiz(db, RSTRING_PTR(vkey), RSTRING_LEN(vkey)) >= 0 ? Qtrue : Qfalse;
 }
 
 static VALUE mTokyoTyrant_iterinit(VALUE vself){
-  TCRDB *db;
-  Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
+  TCRDB *db = mTokyoTyrant_getdb(vself);
 
   return tcrdbiterinit(db) ? Qtrue : Qfalse;
 }
@@ -129,8 +136,7 @@ static VALUE mTokyoTyrant_iterinit(VALUE vself){
 static VALUE mTokyoTyrant_iternext(VALUE vself){
   VALUE vval;
   char *vbuf;
-  TCRDB *db;
-  Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
+  TCRDB *db = mTokyoTyrant_getdb(vself);
 
   if(!(vbuf = tcrdbiternext2(db))) return Qnil;
   vval = rb_str_new2(vbuf);
@@ -143,8 +149,7 @@ static VALUE mTokyoTyrant_fwmkeys(int argc, VALUE *argv, VALUE vself){
   VALUE vprefix, vmax, vary;
   TCLIST *keys;
   int max;
-  TCRDB *db;
-  Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
+  TCRDB *db = mTokyoTyrant_getdb(vself);
   rb_scan_args(argc, argv, "11", &vprefix, &vmax);
 
   vprefix = StringValueEx(vprefix);
@@ -159,8 +164,7 @@ static VALUE mTokyoTyrant_delete_keys_with_prefix(int argc, VALUE *argv, VALUE v
   VALUE vprefix, vmax;
   TCLIST *keys;
   int max;
-  TCRDB *db;
-  Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
+  TCRDB *db = mTokyoTyrant_getdb(vself);
   rb_scan_args(argc, argv, "11", &vprefix, &vmax);
 
   vprefix = StringValueEx(vprefix);
@@ -174,9 +178,8 @@ static VALUE mTokyoTyrant_delete_keys_with_prefix(int argc, VALUE *argv, VALUE v
 static VALUE mTokyoTyrant_keys(VALUE vself){
   /*
   VALUE vary;
-  TCRDB *db;
   char *kxstr;
-  Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
+  TCRDB *db = mTokyoTyrant_getdb(vself);
   vary = rb_ary_new2(tcrdbrnum(db));
   tcrdbiterinit(db);
   while((kxstr = tcrdbiternext2(db)) != NULL){
@@ -188,9 +191,8 @@ static VALUE mTokyoTyrant_keys(VALUE vself){
   // Using forward matching keys with an empty string is 100x faster than iternext+get
   VALUE vary;
   TCLIST *keys;
-  TCRDB *db;
   char *prefix;
-  Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
+  TCRDB *db = mTokyoTyrant_getdb(vself);
   prefix = "";
   keys = tcrdbfwmkeys2(db, prefix, -1);
   vary = listtovary(keys);
@@ -198,51 +200,77 @@ static VALUE mTokyoTyrant_keys(VALUE vself){
   return vary;
 }
 
-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);
+static VALUE mTokyoTyrant_addint(VALUE vself, VALUE vkey, int inum){
+  TCRDB *db = mTokyoTyrant_getdb(vself);
+  vkey = StringValueEx(vkey);
+
+  inum = tcrdbaddint(db, RSTRING_PTR(vkey), RSTRING_LEN(vkey), inum);
+  return inum == INT_MIN ? Qnil : INT2NUM(inum);
+}
+
+static VALUE mTokyoTyrant_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);
 
-  num = tcrdbaddint(db, RSTRING_PTR(vkey), RSTRING_LEN(vkey), NUM2INT(vnum));
-  return num == INT_MIN ? Qnil : INT2NUM(num);
+  return mTokyoTyrant_addint(vself, vkey, NUM2INT(vnum));
 }
 
 static VALUE mTokyoTyrant_get_int(VALUE vself, VALUE vkey){
-  return mTokyoTyrant_add_int(vself, vkey, INT2NUM(0));
+  return mTokyoTyrant_addint(vself, vkey, 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);
+static VALUE mTokyoTyrant_adddouble(VALUE vself, VALUE vkey, double dnum){
+  TCRDB *db = mTokyoTyrant_getdb(vself);
+
+  vkey = StringValueEx(vkey);
+  dnum = tcrdbadddouble(db, RSTRING_PTR(vkey), RSTRING_LEN(vkey), dnum);
+  return isnan(dnum) ? Qnil : rb_float_new(dnum);
+}
 
+static VALUE mTokyoTyrant_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);
-  num = tcrdbadddouble(db, RSTRING_PTR(vkey), RSTRING_LEN(vkey), NUM2DBL(vnum));
-  return isnan(num) ? Qnil : rb_float_new(num);
+  if(NIL_P(vnum)) vnum = rb_float_new(dnum);
+
+  return mTokyoTyrant_adddouble(vself, vkey, NUM2DBL(vnum));
 }
 
 static VALUE mTokyoTyrant_get_double(VALUE vself, VALUE vkey){
-  return mTokyoTyrant_add_double(vself, vkey, INT2NUM(0));
+  return mTokyoTyrant_adddouble(vself, vkey, 0.0);
 }
 
 static VALUE mTokyoTyrant_sync(VALUE vself){
-  TCRDB *db;
-  Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
+  TCRDB *db = mTokyoTyrant_getdb(vself);
 
   return tcrdbsync(db) ? Qtrue : Qfalse;
 }
 
+static VALUE mTokyoTyrant_optimize(int argc, VALUE *argv, VALUE vself){
+  VALUE vparams;
+  const char *params = NULL;
+  TCRDB *db = mTokyoTyrant_getdb(vself);
+  rb_scan_args(argc, argv, "01", &vparams);
+  if(NIL_P(vparams)) vparams = Qnil;
+  if(vparams != Qnil) params = RSTRING_PTR(vparams);
+
+  return tcrdboptimize(db, params) ? Qtrue : Qfalse;
+}
+
 static VALUE mTokyoTyrant_vanish(VALUE vself){
-  TCRDB *db;
-  Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
+  TCRDB *db = mTokyoTyrant_getdb(vself);
 
   return tcrdbvanish(db) ? Qtrue : Qfalse;
 }
 
 static VALUE mTokyoTyrant_copy(VALUE vself, VALUE path){
-  TCRDB *db;
-  Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
+  TCRDB *db = mTokyoTyrant_getdb(vself);
 
   Check_Type(path, T_STRING);
   return tcrdbcopy(db, RSTRING_PTR(path)) ? Qtrue : Qfalse;
@@ -251,8 +279,7 @@ static VALUE mTokyoTyrant_copy(VALUE vself, VALUE path){
 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);
+  TCRDB *db = mTokyoTyrant_getdb(vself);
 
   Check_Type(vpath, T_STRING);
   ts = (uint64_t) FIX2INT(vts);
@@ -263,8 +290,7 @@ static VALUE mTokyoTyrant_restore(VALUE vself, VALUE vpath, VALUE vts, VALUE vop
 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);
+  TCRDB *db = mTokyoTyrant_getdb(vself);
 
   ts = (uint64_t) FIX2INT(vts);
   opts = FIX2INT(vopts);
@@ -272,39 +298,33 @@ static VALUE mTokyoTyrant_setmst(VALUE vself, VALUE vhost, VALUE vport, VALUE vt
 }
 
 static VALUE mTokyoTyrant_rnum(VALUE vself){
-  TCRDB *db;
-  Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
+  TCRDB *db = mTokyoTyrant_getdb(vself);
 
   return LL2NUM(tcrdbrnum(db));
 }
 
 static VALUE mTokyoTyrant_empty(VALUE vself){
-  TCRDB *db;
-  Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
+  TCRDB *db = mTokyoTyrant_getdb(vself);
 
   return tcrdbrnum(db) < 1 ? Qtrue : Qfalse;
 }
 
 static VALUE mTokyoTyrant_size(VALUE vself){
-  TCRDB *db;
-  Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
+  TCRDB *db = mTokyoTyrant_getdb(vself);
 
   return LL2NUM(tcrdbsize(db));
 }
 
 static VALUE mTokyoTyrant_stat(VALUE vself){
-  TCRDB *db;
-  Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
+  TCRDB *db = mTokyoTyrant_getdb(vself);
 
   return rb_str_new2(tcrdbstat(db));
 }
 
 static VALUE mTokyoTyrant_misc(int argc, VALUE *argv, VALUE vself){
-  VALUE vname, vopts, vargs;
-  TCRDB *db;
+  VALUE vname, vopts, vargs, vary;
   TCLIST *list, *args;
-  VALUE vary;
-  Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
+  TCRDB *db = mTokyoTyrant_getdb(vself);
   rb_scan_args(argc, argv, "13", &vname, &vopts, &vargs);
 
   args = varytolist(vargs);
@@ -316,12 +336,26 @@ static VALUE mTokyoTyrant_misc(int argc, VALUE *argv, VALUE vself){
   return vary;
 }
 
+static VALUE mTokyoTyrant_ext(VALUE vself, VALUE vext, VALUE vkey, VALUE vvalue){
+  int vsiz;
+  char *vbuf;
+  TCRDB *db = mTokyoTyrant_getdb(vself);
+  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);
+  }
+}
+
 static VALUE mTokyoTyrant_each_key(VALUE vself){
   VALUE vrv;
-  TCRDB *db;
   char *kxstr;
   if(rb_block_given_p() != Qtrue) rb_raise(rb_eArgError, "no block given");
-  Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
+  TCRDB *db = mTokyoTyrant_getdb(vself);
   vrv = Qnil;
   tcrdbiterinit(db);
   while((kxstr = tcrdbiternext2(db)) != NULL){
@@ -367,11 +401,15 @@ void init_mod(){
   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, "add_int", mTokyoTyrant_add_int, 2);
+  rb_define_method(mTokyoTyrant, "add_int", mTokyoTyrant_add_int, -1);
+  rb_define_alias(mTokyoTyrant, "addint", "add_int");
+  rb_define_alias(mTokyoTyrant, "increment", "add_int");
   rb_define_method(mTokyoTyrant, "get_int", mTokyoTyrant_get_int, 1);
-  rb_define_method(mTokyoTyrant, "add_double", mTokyoTyrant_add_double, 2);
+  rb_define_method(mTokyoTyrant, "add_double", mTokyoTyrant_add_double, -1);
+  rb_define_alias(mTokyoTyrant, "adddouble", "add_double");
   rb_define_method(mTokyoTyrant, "get_double", mTokyoTyrant_get_double, 1);
   rb_define_method(mTokyoTyrant, "sync", mTokyoTyrant_sync, 0);
+  rb_define_method(mTokyoTyrant, "optimize", mTokyoTyrant_optimize, -1);
   rb_define_method(mTokyoTyrant, "vanish", mTokyoTyrant_vanish, 0);
   rb_define_alias(mTokyoTyrant, "clear", "vanish");
   rb_define_method(mTokyoTyrant, "copy", mTokyoTyrant_copy, 1);
@@ -385,5 +423,7 @@ void init_mod(){
   rb_define_alias(mTokyoTyrant, "length", "size");
   rb_define_method(mTokyoTyrant, "stat", mTokyoTyrant_stat, 0);
   rb_define_method(mTokyoTyrant, "misc", mTokyoTyrant_misc, -1);
+  rb_define_method(mTokyoTyrant, "ext", mTokyoTyrant_ext, 3);
+  rb_define_alias(mTokyoTyrant, "run", "ext");
   rb_define_method(mTokyoTyrant, "each_key", mTokyoTyrant_each_key, 0);
 }