actsasflinn-ruby-tokyotyrant 0.1.4 → 0.1.5

data/README.rdoc

@@ -84,6 +84,33 @@ This is not in production but the initial benchmarks are very interesting. Resul
   q.get
   # => [{:__id=>"99", :sex=>"male", :name=>"Pat 99"}, {:__id=>"97", :sex=>"male", :name=>"Pat 97"}, {:__id=>"95", :sex=>"male", :name=>"Pat 95"}, {:__id=>"93", :sex=>"male", :name=>"Pat 93"}, {:__id=>"91", :sex=>"male", :name=>"Pat 91"}]
 
+  # Alternative Syntax (better)
+
+  # Query using a block
+  t.query{ |q|
+    q.condition('sex', :streq, 'male')
+    q.limit(5)
+  }
+  # => ["1", "3", "5", "7", "9"]
+
+  # Get records for a query
+  t.find{ |q|
+    q.condition('sex', :streq, 'male')
+    q.limit(5)
+  }
+  # => [{: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"}]
+
+  # Prepare but don't run a search, return a prepared query object
+  q = t.prepare_query{ |q|
+    q.condition('sex', :streq, 'male')
+    q.limit(5)
+  }
+  # => #<TokyoTyrant::Query:0x247c14 @rdb=#<Object:0x2800a0>, @rdbquery=#<Object:0x247c00>>
+  q.search
+  # => ["1", "3", "5", "7", "9"]
+  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

data/Rakefile

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

data/ext/tokyo_tyrant.c

@@ -110,6 +110,7 @@ extern TCMAP *varytomap(VALUE vary){
     const char *kbuf = tclistval(keys, i, &ksiz);
     tcmapput(recs, kbuf, ksiz, "", 0);
   }
+  tclistdel(keys);
   return recs;
 }
 

data/ext/tokyo_tyrant_db.c

@@ -48,6 +48,7 @@ static VALUE cDB_mput(VALUE vself, VALUE vhash){
   args = vhashtolist(vhash);
   list = tcrdbmisc(db, "putlist", 0, args);
   vary = listtovary(list);
+  tclistdel(args);
   tclistdel(list);
   return vary;
 }
@@ -181,6 +182,8 @@ static VALUE cDB_each(VALUE vself){
   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);
   }
   return vrv;
 }
@@ -196,6 +199,8 @@ static VALUE cDB_each_value(VALUE vself){
   while((kxstr = tcrdbiternext2(db)) != NULL){
     vxstr = tcrdbget2(db, kxstr);
     vrv = rb_yield_values(1, rb_str_new2(vxstr));
+    tcfree(vxstr);
+    tcfree(kxstr);
   }
   return vrv;
 }
@@ -210,6 +215,8 @@ static VALUE cDB_values(VALUE vself){
   while((kxstr = tcrdbiternext2(db)) != NULL){
     vxstr = tcrdbget2(db, kxstr);
     rb_ary_push(vary, rb_str_new2(vxstr));
+    tcfree(vxstr);
+    tcfree(kxstr);
   }
   return vary;
 }

data/ext/tokyo_tyrant_query.c

@@ -138,12 +138,14 @@ void init_query(){
 
   rb_define_private_method(cQuery, "initialize", cQuery_initialize, 1);
   rb_define_method(cQuery, "addcond", cQuery_addcond, 3);
+  rb_define_alias(cQuery, "add_condition", "addcond");
   rb_define_alias(cQuery, "condition", "addcond");
   rb_define_method(cQuery, "setorder", cQuery_setorder, 2);
   rb_define_alias(cQuery, "order_by", "setorder");
   rb_define_method(cQuery, "setmax", cQuery_setmax, 1);
   rb_define_alias(cQuery, "limit", "setmax");
   rb_define_method(cQuery, "search", cQuery_search, 0);
+  rb_define_alias(cQuery, "run", "search");
   rb_define_method(cQuery, "searchout", cQuery_searchout, 0);
   rb_define_method(cQuery, "get", cQuery_get, 0);
 }

data/ext/tokyo_tyrant_table.c

@@ -44,7 +44,7 @@ static VALUE cTable_mput(VALUE vself, VALUE vhash){
   int i, num, j;
   VALUE vary, vkeys, vkey, vval;
   TCRDB *db;
-  TCLIST *list;
+  TCLIST *list, *result;
   Data_Get_Struct(rb_iv_get(vself, RDBVNDATA), TCRDB, db);
 
   vkeys = rb_funcall(vhash, rb_intern("keys"), 0);
@@ -67,11 +67,13 @@ static VALUE cTable_mput(VALUE vself, VALUE vhash){
       tcxstrcat(xstr, rbuf, rsiz);
     }
     tclistpush(list, tcxstrptr(xstr), tcxstrsize(xstr));
+    tclistdel(cols);
     tcxstrdel(xstr);
   }
-  list = tcrdbmisc(db, "putlist", 0, list);
-  vary = listtovary(list);
+  result = tcrdbmisc(db, "putlist", 0, list);
   tclistdel(list);
+  vary = listtovary(result);
+  tclistdel(result);
   return vary;
 }
 
@@ -138,6 +140,7 @@ static VALUE cTable_mget(int argc, VALUE *argv, VALUE vself){
     vbuf = tcmapiterval(kbuf, &vsiz);
     cols = tcstrsplit4(vbuf, vsiz);
     vcols = maptovhashsym(cols);
+    tcmapdel(cols);
     rb_hash_aset(vhash, rb_str_new(kbuf, ksiz), vcols);
   }
   tcmapdel(recs);
@@ -230,12 +233,37 @@ static VALUE cTable_values(VALUE vself){
     cols = tcrdbtblget(db, kxstr, ksiz);
     rb_ary_push(vary, maptovhashsym(cols));
     tcmapdel(cols);
+    tcfree(kxstr);
   }
   return vary;
 }
 
+// Probably should dry these up
+static VALUE cTable_prepare_query(VALUE vself){
+  VALUE vqry;
+  vqry = rb_class_new_instance(1, &vself, rb_path2class("TokyoTyrant::Query"));
+  if(rb_block_given_p()) rb_yield_values(1, vqry);
+  return vqry;
+}
+
 static VALUE cTable_query(VALUE vself){
-  return rb_class_new_instance(1, &vself, rb_path2class("TokyoTyrant::Query"));
+  VALUE vqry, vary;
+  vqry = rb_class_new_instance(1, &vself, rb_path2class("TokyoTyrant::Query"));
+  if(rb_block_given_p()) {
+    rb_yield_values(1, vqry);
+    vary = rb_funcall(vqry, rb_intern("run"), 0);
+    return vary;
+  } else {
+    return vqry;
+  }
+}
+
+static VALUE cTable_find(VALUE vself){
+  VALUE vqry, vary;
+  vqry = rb_class_new_instance(1, &vself, rb_path2class("TokyoTyrant::Query"));
+  if(rb_block_given_p()) rb_yield_values(1, vqry);
+  vary = rb_funcall(vqry, rb_intern("get"), 0);
+  return vary;
 }
 
 void init_table(){
@@ -250,10 +278,13 @@ void init_table(){
   rb_define_alias(cTable, "[]", "get");
   rb_define_method(cTable, "setindex", cTable_setindex, 2);
   rb_define_method(cTable, "genuid", cTable_genuid, 0);
+  rb_define_alias(cTable, "generate_unique_id", "genuid");
   rb_define_method(cTable, "fetch", cTable_fetch, -1);
   rb_define_method(cTable, "each", cTable_each, 0);
   rb_define_alias(cTable, "each_pair", "each");
   rb_define_method(cTable, "each_value", cTable_each_value, 0);
   rb_define_method(cTable, "values", cTable_values, 0);
+  rb_define_method(cTable, "prepare_query", cTable_prepare_query, 0);
   rb_define_method(cTable, "query", cTable_query, 0);
+  rb_define_method(cTable, "find", cTable_find, 0);
 }

data/spec/tokyo_tyrant_query_spec.rb

@@ -4,7 +4,7 @@ require Pathname(__FILE__).dirname.join('spec_base') unless $root
 describe TokyoTyrant::Query, "with an open database" do
   @db = TokyoTyrant::Table.new('127.0.0.1', 45001)
   @db.clear
-  load('plu_db.rb')
+  load('spec/plu_db.rb')
   @db.mput($codes)
 
   it "should get a query object" do
@@ -68,4 +68,24 @@ describe TokyoTyrant::Query, "with an open database" do
     res = @db.query.condition(:type, :streq, 'Cucumber').order_by(:variety, :strdesc).limit(3).search
     res.should == ["4596", "4595", "4594"]
   end
+
+  it "should query with a block" do
+    res = @db.query do |q|
+      q.condition(:type, :streq, 'Cucumber')
+      q.order_by(:variety, :strdesc)
+      q.limit(3)
+    end
+    res.should == ["4596", "4595", "4594"]
+  end
+
+  it "should find with a block" do
+    res = @db.find do |q|
+      q.condition(:type, :streq, 'Cucumber')
+      q.order_by(:variety, :strdesc)
+      q.limit(3)
+    end
+    res.should == [{:type=>"Cucumber", :variety=>"Pickling / Gherkin", :__id=>"4596", :code=>"4596"},
+                   {:type=>"Cucumber", :variety=>"Lemon", :__id=>"4595", :code=>"4595"},
+                   {:type=>"Cucumber", :variety=>"Japanese / White", :__id=>"4594", :code=>"4594"}]
+  end
 end

metadata

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