actsasflinn-ruby-tokyotyrant 0.1.6 → 0.1.7

data/README.rdoc

@@ -4,7 +4,7 @@ This is a c extension for Ruby to access TokyoTyrant databases.  It currently su
 
 == Install
 
-  # install tokyocabint and tokyotyrant
+  # install tokyocabinet and tokyotyrant (requires 1.1.27)
   # 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

data/Rakefile

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

data/ext/tokyo_tyrant_db.c

@@ -81,17 +81,13 @@ static VALUE cDB_putshl(VALUE vself, VALUE vkey, VALUE vstr, VALUE vwidth){
   return Qtrue;
 }
 
-static VALUE cDB_get(int argc, VALUE *argv, VALUE vself){
-  VALUE vkey, vraw, vval;
+static VALUE cDB_get(VALUE vself, VALUE vkey){
+  VALUE 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(!(buf = tcrdbget(db, RSTRING_PTR(vkey), RSTRING_LEN(vkey), &bsiz))){
@@ -231,7 +227,7 @@ void init_db(){
   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

data/ext/tokyo_tyrant_module.c

@@ -4,6 +4,10 @@ static void mTokyoTyrant_free(TCRDB *db){
   tcrdbdel(db);
 }
 
+static VALUE mTokyoTyrant_server(VALUE vself){
+  return rb_iv_get(vself, "@server");;
+}
+
 static VALUE mTokyoTyrant_close(VALUE vself){
   int ecode;
   TCRDB *db;
@@ -17,23 +21,30 @@ static VALUE mTokyoTyrant_close(VALUE vself){
 }
 
 static VALUE mTokyoTyrant_initialize(int argc, VALUE *argv, VALUE vself){
-  VALUE host, port;
+  VALUE host, port, timeout, retry, server;
   int ecode;
   TCRDB *db;
 
-  rb_scan_args(argc, argv, "02", &host, &port);
+  rb_scan_args(argc, argv, "04", &host, &port, &timeout, &retry);
   if(NIL_P(host)) host = rb_str_new2("127.0.0.1");
   if(NIL_P(port)) port = INT2FIX(1978);
+  if(NIL_P(timeout)) timeout = rb_float_new(0.0);
+  if(NIL_P(retry)) retry = Qfalse;
 
   db = tcrdbnew();
 
-  if(!tcrdbopen(db, StringValuePtr(host), FIX2INT(port))){
+  if((!tcrdbtune(db, timeout, retry == Qtrue ? RDBTRECON : 0)) ||
+     (!tcrdbopen(db, RSTRING_PTR(host), FIX2INT(port)))){
     ecode = tcrdbecode(db);
     rb_raise(eTokyoTyrantError, "open error: %s", tcrdberrmsg(ecode));
   }
 
+  server = rb_str_new2(tcrdbexpr(db));
+  rb_iv_set(vself, "@server", server);
   rb_iv_set(vself, "@host", host);
   rb_iv_set(vself, "@port", port);
+  rb_iv_set(vself, "@timeout", timeout);
+  rb_iv_set(vself, "@retry", retry);
   rb_iv_set(vself, RDBVNDATA, Data_Wrap_Struct(rb_cObject, 0, mTokyoTyrant_free, db));
 
   return Qtrue;
@@ -336,6 +347,7 @@ void init_mod(){
   rb_define_const(mTokyoTyrant, "ITKEEP", INT2NUM(RDBITKEEP));
 
   rb_define_private_method(mTokyoTyrant, "initialize", mTokyoTyrant_initialize, -1);
+  rb_define_method(mTokyoTyrant, "server", mTokyoTyrant_server, 0);
   rb_define_method(mTokyoTyrant, "close", mTokyoTyrant_close, 0);
   rb_define_method(mTokyoTyrant, "errmsg", mTokyoTyrant_errmsg, -1);
   rb_define_method(mTokyoTyrant, "ecode", mTokyoTyrant_ecode, 0);

data/ext/tokyo_tyrant_query.c

@@ -53,12 +53,15 @@ static VALUE cQuery_setorder(VALUE vself, VALUE vname, VALUE vtype){
   return vself;
 }
 
-static VALUE cQuery_setmax(VALUE vself, VALUE vmax){
-  VALUE vqry;
+static VALUE cQuery_setlimit(int argc, VALUE *argv, VALUE vself){
+  VALUE vqry, vmax, vskip;
   RDBQRY *qry;
   vqry = rb_iv_get(vself, RDBQRYVNDATA);
   Data_Get_Struct(vqry, RDBQRY, qry);
-  tcrdbqrysetmax(qry, NUM2INT(vmax));
+  rb_scan_args(argc, argv, "11", &vmax, &vskip);
+  if(NIL_P(vskip)) vskip = INT2FIX(0);
+
+  tcrdbqrysetlimit(qry, NUM2INT(vmax), NUM2INT(vskip));
   return vself;
 }
 
@@ -157,8 +160,9 @@ void init_query(){
   rb_define_alias(cQuery, "add", "addcond");                    // Rufus Compat
   rb_define_method(cQuery, "setorder", cQuery_setorder, 2);
   rb_define_alias(cQuery, "order_by", "setorder");              // Rufus Compat
-  rb_define_method(cQuery, "setmax", cQuery_setmax, 1);
-  rb_define_alias(cQuery, "limit", "setmax");                   // Rufus Compat
+  rb_define_method(cQuery, "setlimit", cQuery_setlimit, -1);
+  rb_define_alias(cQuery, "setmax", "setlimit");                 // Rufus Compat
+  rb_define_alias(cQuery, "limit", "setlimit");                 // Rufus Compat
   rb_define_method(cQuery, "search", cQuery_search, 0);
   rb_define_alias(cQuery, "run", "search");
   rb_define_method(cQuery, "searchout", cQuery_searchout, 0);

data/ext/tokyo_tyrant_table.c

@@ -95,13 +95,23 @@ static VALUE cTable_out(VALUE vself, VALUE vkey){
 
 static VALUE cTable_get(VALUE vself, VALUE vkey){
   VALUE vcols;
+  int ecode;
   TCRDB *db;
   TCMAP *cols;
   Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
+
   vkey = StringValueEx(vkey);
+  if(!(cols = tcrdbtblget(db, RSTRING_PTR(vkey), RSTRING_LEN(vkey)))){
+    if ((ecode = tcrdbecode(db))) {
+      if (ecode != TTENOREC) {
+        rb_raise(eTokyoTyrantError, "get error: %s", tcrdberrmsg(ecode));
+      }
+    }
+    return Qnil;
+  } else {
+    vcols = maptovhashsym(cols);
+  }
 
-  if(!(cols = tcrdbtblget(db, RSTRING_PTR(vkey), RSTRING_LEN(vkey)))) return Qnil;
-  vcols = maptovhashsym(cols);
   tcmapdel(cols);
   return vcols;
 }

data/spec/tokyo_tyrant_query_spec.rb

@@ -41,10 +41,19 @@ describe TokyoTyrant::Query, "with an open database" do
   end
 
   it "should get limited keys for search conditions with limit" do
-    q = @db.query
-    q.addcond('type', :streq, 'Apple')
-    q.setmax(10)
-    q.search.sort.should == ["3072", "3073", "3074", "3075", "3076", "3077", "3078", "3348", "3349", "4182"]
+    q = @db.query{ |q| 
+      q.addcond('type', :streq, 'Apple')
+      q.order_by('variety', :strdesc)
+      q.setlimit(10)
+    }.should == ["4860", "3011", "3271", "3382", "4182", "3353", "4176", "3272", "3297", "3009"]
+  end
+
+  it "should get limited keys for search conditions with limit and offset" do
+    q = @db.query{ |q| 
+      q.addcond('type', :streq, 'Apple')
+      q.order_by('variety', :strdesc)
+      q.setlimit(10, 10)
+    }.should == ["3008", "3352", "3077", "3349", "3076", "3073", "3348", "3007", "3078", "3347"]
   end
 
   it "should get records for search conditions" do

data/spec/tokyo_tyrant_spec.rb

@@ -21,6 +21,10 @@ describe TokyoTyrant::DB, "with an open database" do
     end
   end
 
+  it "should return a server expression" do
+    @db.server.should == '127.0.0.1:45000'
+  end
+
   it "should save a value" do
     @db[:salad] = 'bacon bits'
     @db[:salad].should == 'bacon bits'
@@ -152,7 +156,7 @@ describe TokyoTyrant::DB, "with an open database" do
 
   it "should report db size" do
     @db['rootbeer'] = 'virgils'
-    @db.db_size.should == 528736
+    @db.db_size.should.not == 0
   end
 
   it "should fetch a record" do

data/spec/tokyo_tyrant_table_spec.rb

@@ -21,6 +21,10 @@ describe TokyoTyrant::Table, "with an open database" do
     end
   end
   
+  it "should return a server expression" do
+    @db.server.should == '127.0.0.1:45001'
+  end
+
   it "should save a value" do
     value = { :lettuce => 'Red Leaf', :dressing => 'ranch', :extra => 'bacon bits' }
     @db[:salad] = value
@@ -156,7 +160,7 @@ describe TokyoTyrant::Table, "with an open database" do
 
   it "should report db size" do
     @db['rootbeer'] = { :gourmet => 'Virgils', :natural => 'Hansens' }
-    @db.db_size.should == 528768
+    @db.db_size.should.not == 0
   end
 
   it "should fetch a record" do

metadata

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