activetokyocabinet 0.1.4 → 0.1.5

data/lib/active_record/connection_adapters/abstract_tokyocabinet_adapter.rb

@@ -23,25 +23,25 @@ module ActiveRecord
           tdbopen(parsed_sql) do |tdb|
             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]
+            if (count = parsed_sql[:count])
+              rows = [{count => count_rkey(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
-
-              rcols['id'] = rkey.to_i
-              rows << rcols
             end
           end
-
-          if (count = parsed_sql[:count])
-            rows = [{count => rows.length}]
-          end
         end
 
         return rows
@@ -125,13 +125,19 @@ module ActiveRecord
       end
 
       def rkeys(tdb, parsed_sql)
-        condition, order, limit, offset = parsed_sql.values_at(:condition, :order, :limit, :offset)
-        condition ||= []
+        condition = parsed_sql[:condition] || []
 
         unless condition.kind_of?(Array) and condition.all? {|i| i.kind_of?(Hash) }
-          return [parsed_sql[:condition]].flatten
+          return [condition].flatten
         end
 
+        query(tdb, parsed_sql).search
+      end
+
+      def query(tdb, parsed_sql)
+        condition, order, limit, offset = parsed_sql.values_at(:condition, :order, :limit, :offset)
+        condition ||= []
+
         qry = @query_klass::new(tdb)
 
         condition.each do |cond|
@@ -152,9 +158,9 @@ module ActiveRecord
           qry.setlimit(limit || 0, offset || 0)
         end
 
-        return qry.search
+        return qry
       end
-      private :rkeys
+      private :query
     end
   end
 end

data/lib/active_record/connection_adapters/tokyocabinet_adapter.rb

@@ -61,6 +61,11 @@ module ActiveRecord
       end
       private :tdbpath
 
+      def count_rkey(tdb, parsed_sql)
+        rkeys(tdb, parsed_sql).length
+      end
+      private :count_rkey
+
       def setindex(table_name, name, type)
         type = {
           :lexical => TokyoCabinet::TDB::ITLEXICAL,

data/lib/active_record/connection_adapters/tokyotyrant_adapter.rb

@@ -67,6 +67,11 @@ module ActiveRecord
       end
       private :tdbopen
 
+      def count_rkey(tdb, parsed_sql)
+        query(tdb, parsed_sql).searchcount
+      end
+      private :count_rkey
+
       def setindex(table_name, name, type)
         type = {
           :lexical => TokyoTyrant::RDBTBL::ITLEXICAL,

metadata

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