actsasflinn-ruby-tokyotyrant 0.1.9 → 0.2.0

data/README.rdoc

@@ -4,7 +4,7 @@ This is a c extension for Ruby to access TokyoTyrant databases.  It currently su
 
 == Install
 
-  # install tokyocabinet (1.4.29) and tokyotyrant (requires 1.1.31)
+  # install tokyocabinet (1.4.30) and tokyotyrant (requires 1.1.33)
   # 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
@@ -135,15 +135,32 @@ This is not in production but the initial benchmarks are very interesting. Resul
 
   # 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"]
+  # => ["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", "... lots more ..."]
 
   # 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"]
+  # => ["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", "... lots more ..."]
 
   # 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"]
+  # => ["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", "... lots more ..."]
+
+==== Meta Search (Multi Query)
+
+  query1 = t.prepare_query{ |q| q.condition(:paragraph, :fts, 'rebirth') }
+  query2 = t.prepare_query{ |q| q.condition(:paragraph, :fts, 'logos') }
+
+  # Get the union of two query sets (OR)
+  t.search(:union, query1, query2)
+  # => ["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", "... lots more ..."]
+
+  # Get the intersection of two query sets (AND)
+  t.search(:intersection, query1, query2)
+  # => ["chapter:13:paragraph:5", "chapter:13:paragraph:44", "chapter:13:paragraph:69"]
+
+  # Get the difference of two query sets (ANDNOT)
+  t.search(:diff, query1, query2)
+  # => ["chapter:13:paragraph:4", "chapter:13:paragraph:7", "chapter:13:paragraph:19", "chapter:13:paragraph:27", "chapter:13:paragraph:57", "chapter:13:paragraph:125"]
 
 === Lua Extension
 
@@ -159,3 +176,4 @@ This is not in production but the initial benchmarks are very interesting. Resul
 * Flinn Mueller (actsasflinn) author/maintainer
 * Justin Reagor (cheapRoc) specs
 * Seth Yates (sethyates) run method (lua ext)
+* John Mettraux (jmettraux) inspiration (rufus-tokyo)

data/Rakefile

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

data/ext/tokyo_tyrant_query.c

@@ -143,6 +143,14 @@ static VALUE cQuery_set_pkey(VALUE vself, VALUE vpkey) {
   return rb_iv_set(vself, "@pkey", vpkey);
 }
 
+static VALUE cQuery_hint(VALUE vself){
+  VALUE vqry;
+  RDBQRY *qry;
+  vqry = rb_iv_get(vself, RDBQRYVNDATA);
+  Data_Get_Struct(vqry, RDBQRY, qry);
+  return rb_str_new2(tcrdbqryhint(qry));
+}
+
 void init_query(){
   rb_define_const(cQuery, "CSTREQ", INT2NUM(RDBQCSTREQ));
   rb_define_const(cQuery, "CSTRINC", INT2NUM(RDBQCSTRINC));
@@ -185,4 +193,5 @@ void init_query(){
   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");
+  rb_define_method(cQuery, "hint", cQuery_hint, 0);
 }

data/ext/tokyo_tyrant_table.c

@@ -267,6 +267,48 @@ static VALUE cTable_find(VALUE vself){
   return vary;
 }
 
+static VALUE cTable_search(int argc, VALUE *argv, VALUE vself){
+  VALUE vqrys, vkeys, vtype, vhash, vcols;
+  TCMAP *recs, *cols;
+  int qsiz, type, j;
+  const char *kbuf;
+  int ksiz, vsiz;
+  TCRDB *db = mTokyoTyrant_getdb(vself);
+
+//  rb_scan_args(argc, argv, "*", &vargs);
+  rb_scan_args(argc, argv, "1*", &vtype, &vqrys);
+
+//  vtype = rb_ary_pop(vargs);
+  qsiz = argc - 1;
+  RDBQRY *qrys[qsiz];
+
+  vtype = StringValueEx(vtype);
+  type = tctdbstrtometasearcytype(RSTRING_PTR(vtype));
+
+  for(j = 0; j < qsiz; j++){
+    VALUE vqry = rb_iv_get(rb_ary_entry(vqrys, j), RDBQRYVNDATA);
+    Data_Get_Struct(vqry, RDBQRY, qrys[j]);
+  }
+  TCLIST *res = tcrdbmetasearch(qrys, qsiz, type);
+  vkeys = listtovary(res);
+  tclistdel(res);
+
+  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);
+  }
+  tcmapdel(recs);
+
+  return vkeys;
+}
+
 void init_table(){
   rb_define_method(cTable, "mput", cTable_mput, 1);
   rb_define_alias(cTable, "lput", "mput");                    // Rufus Compat
@@ -291,4 +333,5 @@ void init_table(){
   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);
+  rb_define_method(cTable, "search", cTable_search, -1);
 }

data/spec/tokyo_tyrant_query_spec.rb

@@ -120,4 +120,14 @@ describe TokyoTyrant::Query, "with an open database" do
                      {'type'=>"Cucumber", 'code'=>"4595", :pk=>"4595", 'variety'=>"Lemon"},
                      {'type'=>"Cucumber", 'code'=>"4596", :pk=>"4596", 'variety'=>"Pickling / Gherkin"}]
   end
+
+  it "should return a query hint" do
+    @db.set_index(:type, :lexical)
+    q = @db.query
+    q.condition(:type, :streq, 'Cucumber')
+    q.order_by(:code)
+    q.limit(3)
+    q.run
+    q.hint.should == "\nusing an index: \"type\" asc (STREQ)\nresult set size: 5\nsorting the result set: \"code\"\n"
+  end
 end

data/spec/tokyo_tyrant_table_spec.rb

@@ -267,4 +267,24 @@ describe TokyoTyrant::Table, "with an open database" do
   it "should run lua extensions" do
     @db.ext('echo', 'hello', 'world').should == "hello\tworld"
   end
+
+  it "should perform meta search with multiple query objects" do
+    keys = %w[falafel humus couscous tabbouleh tzatziki peanutbutter]
+    values = [{ 'ingredient' => 'chickpeas' },
+              { 'ingredient' => 'chickpeas' },
+              { 'ingredient' => 'semolina' },
+              { 'ingredient' => 'bulgar' },
+              { 'ingredient' => 'yogurt' },
+              { 'ingredient' => 'peanuts'}]
+
+    keys.each_with_index{ |k,i| @db[k] = values[i] }
+
+    query1 = @db.prepare_query{ |q| q.condition('ingredient', :streq, 'yogurt').order_by('ingredient') }
+    query2 = @db.prepare_query{ |q| q.condition('ingredient', :streq, 'chickpeas').order_by('ingredient') }
+    query3 = @db.prepare_query{ |q| q.condition('ingredient', :ftsex, 'pea').order_by('ingredient') }
+
+    @db.search(:union, query1, query2).should == ["falafel", "humus", "tzatziki"]
+    @db.search(:diff, query1, query2).should == ["tzatziki"]
+    @db.search(:intersection, query2, query3).should == ["falafel", "humus"]
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: actsasflinn-ruby-tokyotyrant
 version: !ruby/object:Gem::Version 
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors: 
 - Flinn