activetokyocabinet 0.1.7 → 0.1.8

data/README

@@ -22,67 +22,127 @@ see http://gemcutter.org/gems/activetokyocabinet
 
 == Example
 === database.yml
+
     # TokyoCabinet
     development:
-      adapter: tokyocabinet
-      database: path_of_database_directory
-                               # ~~~~~~~~~
+      adapter:  tokyocabinet
+      database: db/casket/
+                # save to `$RAILS_ROOT/db/casket/*.tct'.
+
     # TokyoTyrant
     development:
       adapter: tokyotyrant
       database:
-        hellos: { host: localhost, port: 1978 }
-        tests: { host: localhost, port: 1979 }
+        emps:  { host: localhost, port: 1978 }
+        depts: { host: localhost, port: 1979 }
 
 === Model
 
-    class Hello < ActiveRecord::Base
+    class Emp < ActiveRecord::Base
       include ActiveTokyoCabinet::TDB
     
       # define schema information.
       # (string, int, float)
-      string :name
+      string :ename
       int    :age
+      string :job
+      float  :sal
+      string :hiredate
     end
 
-=== Example Controller
+=== ActiveRecord API
 
-    class HelloController < ApplicationController
-      def index
-        hello_id = nil
+    # see http://api.rubyonrails.org/classes/ActiveRecord/Base.html
+    
+    emp = Emp.find(:first, 
+            :conditions => ["ename = ? and age > ?", "yamada", 25],
+            :order => 'age desc', :limit => 5, :offset => 3)
+    
+    emp.ename = 'yamamoto'
+    emp.age   = 30
+    emp.save
+    
+    emp_list = Emp.find(101, 102, 103)
     
-        (20..35).each do |i|
-          hello = Hello.new
-          hello.name = 'yamada'
-          hello.age  = i
-          hello.save!
-          hello_id = hello.id
-        end
+    emp_list.each do |i|
+      i.destroy if i.age > 20
+    end
+    
+    new_emp = Emp.new
+    new_emp.ename = 'suzuki'
+    new_emp.age   = 27
+    new_emp.save!
+    
+    # not available:
+    # - :include, :group
+    # - `OR'
+    # - Subquery
+    # - Include `ID' in search condition
+    # see http://activetokyocabi.rubyforge.org/svn/trunk/lib/active_tokyocabinet/sqlparser.y
+
+== Expanded operator
+
+    # see http://1978th.net/tokyotyrant/rubydoc/classes/TokyoTyrant/RDBQRY.html
     
-        p Hello.find(:all, 
-                     :conditions => ["name = ? and age > ?", "yamada", 25],
-                     :order => 'age desc', :limit => 5, :offset => 3)
+    # query condition: string begins with
+    emp = Emp.find(:all, :conditions => ['ename bw ?', 'J'])
     
-        hello = Hello.find(hello_id)
-        hello.name = 'yamashita'
-        hello.save!
+    # query condition: string ends with
+    emp = Emp.find(:all, :conditions => ['ename ew ?', 'ES'])
     
-        p Hello.find(:first, :conditions => ["name = ?", "yamashita"])
+    # query condition: string is included in
+    emp = Emp.find(:all, :conditions => ['ename inc ?', 'LA'])
     
-        hello = Hello.find(hello_id)
-        hello.destroy
+    # query condition: string includes all tokens i 
+    emp = Emp.find(:all, :conditions => ['job incall (?)', ['ANALYST', 'MANAGER']])
     
-        p Hello.find(:first, :conditions => ["name = ?", "yamashita"])
+    # query condition: string includes at least one token in
+    emp = Emp.find(:all, :conditions => ['job incany (?)', ['ANALYST', 'MANAGER']])
     
-        p Hello.find(:all)
+    # query condition: string is equal to at least one token in
+    emp = Emp.find(:all, :conditions => ['job in (?)', ['ANALYST', 'MANAGER']])
+    emp = Emp.find(:all, :conditions => ['job anyone (?)', ['ANALYST', 'MANAGER']])
     
-        Hello.delete_all(["name = ? and age <= ?", "yamada", 30])
+    # query condition: string matches regular expressions of
+    emp = Emp.find(:all, :conditions => ['ename regexp ?', '^J[AO].+$'])
     
-        p Hello.find(:all)
+    # query condition: number is between two tokens of
+    emp = Emp.find(:all, :conditions => ['age between ? and ?', 20, 30])
+    emp = Emp.find(:all, :conditions => ['age bt (?)', [20, 30]])
+    
+    # query condition: full-text search with the phrase of
+    emp = Emp.find(:all, :conditions => ['ename fts ?', 'MI'])
+    
+    # query condition: full-text search with all tokens in
+    emp = Emp.find(:all, :conditions => ['ename ftsand ?', 'HATSUNE MIKU'])
+    emp = Emp.find(:all, :conditions => ['ename ftsand (?)', ['HATSUNE', 'MIKU']])
+    
+    # query condition: full-text search with at least one token in
+    emp = Emp.find(:all, :conditions => ['hiredate ftsor ?', '1983 DEC'])
+    emp = Emp.find(:all, :conditions => ['hiredate ftsor (?)', ['1983', 'DEC']])
+    
+    # query condition: full-text search with the compound expression of
+    emp = Emp.find(:all, :conditions => ['ename ftsex ?', 'MIKU || RIN'])
+    emp = Emp.find(:all, :conditions => ['ename ftsex ?', 'HATSUNE && MIKU'])
+
+== Low layer API
 
-        render :text => 'hello'
-      end
+    Emp.tdbopen do |tdb|
+      pkey = tdb.genuid
+      cols = {"ename" => "tanaka", "age" => "30"}
+      tdb.put(pkey, cols)
+    }
+    
+    Emp.proc(:all, :conditions => ['name = ?', 'sugawara'], :limit => 10) do |tdb, pkey, cols|
+      puts "#{pkey}: #{cols.inspect}
     end
+    # proc method return empty array.
+
+== Set index
+
+    # see http://1978th.net/tokyotyrant/rubydoc/classes/TokyoTyrant/RDBTBL.html#M000007
+    
+    Emp.setindex(:age, :decimal)
 
 == Related article
 * http://d.hatena.ne.jp/winebarrel/20100106/p1

data/lib/active_record/connection_adapters/abstract_tokyocabinet_adapter.rb

@@ -1,7 +1,44 @@
+require 'active_record/base'
 require 'active_record/connection_adapters/abstract_adapter'
 require 'active_tokyocabinet/tdb'
 require 'active_tokyocabinet/sqlparser.tab'
 
+module ActiveRecord
+  class Base
+    class << self
+      def find_by_sql_with_activetokyocabinet(args)
+        retval = nil
+
+        if self.include?(ActiveTokyoCabinet::TDB) and args.kind_of?(Array)
+          sql, proc = args
+          connection.select(sanitize_sql(sql), "#{name} Load", &proc)
+          retval = []
+        else
+          retval = find_by_sql_without_activetokyocabinet(args)
+        end
+
+        return retval
+      end
+      alias_method_chain :find_by_sql, :activetokyocabinet
+
+      def construct_finder_sql_with_activetokyocabinet(options)
+        sql = construct_finder_sql_without_activetokyocabinet(options)
+
+        if self.include?(ActiveTokyoCabinet::TDB) and (proc = options[:activetokyocabinet_proc])
+          sql = [sql, proc]
+        end
+
+        return sql
+      end
+      alias_method_chain :construct_finder_sql, :activetokyocabinet
+
+      unless VALID_FIND_OPTIONS.include?(:activetokyocabinet_proc)
+        VALID_FIND_OPTIONS << :activetokyocabinet_proc
+      end
+    end
+  end
+end
+
 module ActiveRecord
   module ConnectionAdapters
     class AbstractTokyoCabinetAdapter < AbstractAdapter
@@ -20,9 +57,13 @@ module ActiveRecord
         log(sql, name) do
           parsed_sql = ActiveTokyoCabinet::SQLParser.new(sql).parse
 
-          tdbopen(parsed_sql) do |tdb|
+          tdbopen(parsed_sql[:table], true) do |tdb|
             if (count = parsed_sql[:count])
               rows = [{count => rnum(tdb, parsed_sql)}]
+            elsif block_given?
+              rows = search(tdb, parsed_sql) do |_tdb, rkey, rcols|
+                yield([_tdb, rkey, rcols])
+              end
             else
               rows = search(tdb, parsed_sql)
             end
@@ -38,7 +79,7 @@ module ActiveRecord
         log(sql, name) do
           parsed_sql = ActiveTokyoCabinet::SQLParser.new(sql).parse
 
-          tdbopen(parsed_sql) do |tdb|
+          tdbopen(parsed_sql[:table]) do |tdb|
             pkey = tdb.genuid
             keys = parsed_sql[:column_list]
             vals = parsed_sql[:value_list]
@@ -64,7 +105,7 @@ module ActiveRecord
         log(sql, name) do
           parsed_sql = ActiveTokyoCabinet::SQLParser.new(sql).parse
 
-          tdbopen(parsed_sql) do |tdb|
+          tdbopen(parsed_sql[:table]) do |tdb|
             set_clause_list = parsed_sql[:set_clause_list]
 
             rkeys(tdb, parsed_sql).each do |rkey|
@@ -92,7 +133,7 @@ module ActiveRecord
         log(sql, name) do
           parsed_sql = ActiveTokyoCabinet::SQLParser.new(sql).parse
 
-          tdbopen(parsed_sql) do |tdb|
+          tdbopen(parsed_sql[:table]) do |tdb|
             unless query(tdb, parsed_sql).searchout
               ecode = tdb.ecode
               raise '%s: %s' % [tdb.errmsg(ecode), sql]
@@ -110,6 +151,12 @@ module ActiveRecord
 
         rkeys(tdb, parsed_sql).each do |rkey|
           rcols = tdb.get(rkey)
+
+          if block_given?
+            yield(tdb, rkey.to_i, rcols)
+            next
+          end
+
           next if rcols.nil?
   
           unless select_list.nil? or select_list.empty?

data/lib/active_record/connection_adapters/tokyocabinet_adapter.rb

@@ -28,11 +28,10 @@ module ActiveRecord
         File.exist?(path)
       end
 
-      def tdbopen(parsed_sql)
-        table_name = parsed_sql[:table]
+      def tdbopen(table_name, readonly = false)
         path = tdbpath(table_name)
 
-        if File.exist?(path) and parsed_sql[:command] == :select
+        if File.exist?(path) and readonly
           omode = TokyoCabinet::TDB::OREADER
         else
           omode = TokyoCabinet::TDB::OWRITER | TokyoCabinet::TDB::OCREAT
@@ -54,7 +53,6 @@ module ActiveRecord
           end
         end
       end
-      private :tdbopen
 
       def tdbpath(table_name)
         File.join(@config[:database], table_name + ".tct")

data/lib/active_record/connection_adapters/tokyotyrant_adapter.rb

@@ -45,9 +45,7 @@ module ActiveRecord
         end
       end
 
-      def tdbopen(parsed_sql)
-        table_name = parsed_sql[:table]
-
+      def tdbopen(table_name, readonly = false)
         unless table_exists?(table_name)
           raise "Table does not exist: #{table_name}"
         end
@@ -65,7 +63,6 @@ module ActiveRecord
         yield(tdb)
         @connection[table_name] = tdb
       end
-      private :tdbopen
 
       def search(tdb, parsed_sql)
         condition = parsed_sql[:condition] || []
@@ -82,7 +79,14 @@ module ActiveRecord
           end
 
           rows = query(tdb, parsed_sql).searchget
-          rows.each {|i| i['id'] = i[""].to_i }
+
+          if block_given?
+            rows.each do |i|
+              yield(tdb, i[""].to_i, i)
+            end
+          else
+            rows.each {|i| i['id'] = i[""].to_i }
+          end
 
           return rows
         end

data/lib/active_tokyocabinet/tdb.rb

@@ -14,9 +14,21 @@ module ActiveTokyoCabinet
             class_eval "def \#{name}; v = self[:\#{name}]; (v.nil? || v.empty?) ? nil : v.#{conv}; end"
           end
 
+          def tdbopen(readonly = false)
+            self.connection.tdbopen(self.table_name, readonly) {|tdb| yield(tdb) }
+          end
+
           def setindex(name, type)
             self.connection.setindex(self.table_name, name, type)
           end
+
+          def proc(*args, &block)
+            if block and (options = args.last) and options.kind_of?(Hash)
+              options[:activetokyocabinet_proc] = block
+            end
+
+            self.find(*args)
+          end
         }
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activetokyocabinet
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors: 
 - winebarrel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-12 00:00:00 +09:00
+date: 2010-01-17 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency