activetokyocabinet 0.1.6 → 0.1.7

data/lib/active_record/connection_adapters/abstract_tokyocabinet_adapter.rb

@@ -15,31 +15,16 @@ module ActiveRecord
       end
 
       def select(sql, name = nil)
-        rows = []
+        rows = nil
 
         log(sql, name) do
           parsed_sql = ActiveTokyoCabinet::SQLParser.new(sql).parse
 
           tdbopen(parsed_sql) do |tdb|
-            select_list = parsed_sql[:select_list]
-
             if (count = parsed_sql[:count])
-              rows = [{count => count_rkey(tdb, parsed_sql)}]
+              rows = [{count => rnum(tdb, parsed_sql)}]
             else
-              rkeys(tdb, parsed_sql).each do |rkey|
-                rcols = tdb.get(rkey)
-                next if rcols.nil?
-  
-                unless select_list.nil? or select_list.empty?
-                  rcols = select_list.each do |k|
-                    k = k.split('.').last
-                    r[k] = rcols[k]
-                  end
-                end
-  
-                rcols['id'] = rkey.to_i
-                rows << rcols
-              end
+              rows = search(tdb, parsed_sql)
             end
           end
         end
@@ -104,35 +89,59 @@ module ActiveRecord
       end
 
       def delete_sql(sql, name = nil)
-        rownum = 0
-
         log(sql, name) do
           parsed_sql = ActiveTokyoCabinet::SQLParser.new(sql).parse
 
           tdbopen(parsed_sql) do |tdb|
-            rkeys(tdb, parsed_sql).each do |rkey|
-              rownum += 1
+            unless query(tdb, parsed_sql).searchout
+              ecode = tdb.ecode
+              raise '%s: %s' % [tdb.errmsg(ecode), sql]
+            end
+          end
+        end
 
-              unless tdb.out(rkey)
-                ecode = tdb.ecode
-                raise '%s: %s' % [tdb.errmsg(ecode), sql]
-              end
+        # XXX:
+        return 1
+      end
+
+      def search(tdb, parsed_sql)
+        rows = []
+        select_list = parsed_sql[:select_list]
+
+        rkeys(tdb, parsed_sql).each do |rkey|
+          rcols = tdb.get(rkey)
+          next if rcols.nil?
+  
+          unless select_list.nil? or select_list.empty?
+            rcols = select_list.each do |k|
+              k = k.split('.').last
+              r[k] = rcols[k]
             end
           end
+
+          rcols['id'] = rkey.to_i
+          rows << rcols
         end
 
-        return rownum
+        return rows
+      end
+      private :search
+
+      def cond?(condition)
+        condition.kind_of?(Array) and condition.all? {|i| i.kind_of?(Hash) }
       end
+      private :cond?
 
       def rkeys(tdb, parsed_sql)
         condition = parsed_sql[:condition] || []
 
-        unless condition.kind_of?(Array) and condition.all? {|i| i.kind_of?(Hash) }
+        unless cond?(condition)
           return [condition].flatten
         end
 
         query(tdb, parsed_sql).search
       end
+      private :rkeys
 
       def query(tdb, parsed_sql)
         condition, order, limit, offset = parsed_sql.values_at(:condition, :order, :limit, :offset)

data/lib/active_record/connection_adapters/tokyocabinet_adapter.rb

@@ -61,14 +61,14 @@ module ActiveRecord
       end
       private :tdbpath
 
-      def count_rkey(tdb, parsed_sql)
+      def rnum(tdb, parsed_sql)
         if (parsed_sql[:condition] || []).empty?
           tdb.rnum
         else
           rkeys(tdb, parsed_sql).length
         end
       end
-      private :count_rkey
+      private :rnum
 
       def setindex(table_name, name, type)
         type = {

data/lib/active_record/connection_adapters/tokyotyrant_adapter.rb

@@ -67,14 +67,36 @@ module ActiveRecord
       end
       private :tdbopen
 
-      def count_rkey(tdb, parsed_sql)
+      def search(tdb, parsed_sql)
+        condition = parsed_sql[:condition] || []
+
+        unless cond?(condition)
+          super(tdb, parsed_sql)
+        else
+          select_list = parsed_sql[:select_list]
+
+          if select_list.nil? or select_list.empty?
+            names = nil
+          else
+            names = select_list.map {|i| i.split('.').last }
+          end
+
+          rows = query(tdb, parsed_sql).searchget
+          rows.each {|i| i['id'] = i[""].to_i }
+
+          return rows
+        end
+      end
+      private :search
+
+      def rnum(tdb, parsed_sql)
         if (parsed_sql[:condition] || []).empty?
           tdb.rnum
         else
           query(tdb, parsed_sql).searchcount
         end
       end
-      private :count_rkey
+      private :rnum
 
       def setindex(table_name, name, type)
         type = {

metadata

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