activerecord-simpledb-adapter 0.3.0 → 0.4.0

data/README.md

@@ -28,6 +28,7 @@ for creating domain:
 	rake db:create
 
 model example:
+
     Person < ActiveRecord::Base
 	  columns_definition do |t|
 	    t.string :login
@@ -41,10 +42,20 @@ model example:
 	  end
 	end
 
+using batches:
+
+	#default batch type is update
+	Person.batch do
+	  Person.create(some_valid_params)
+	end
+	#or for delete
+	Person.batch(:delete) do
+	  person_item.destroy
+	end
+
 # TODO
 
 - Add some howtos to wiki
-- Rewrite rails model generator
 
 # LICENSE
 

data/activerecord-simpledb-adapter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{activerecord-simpledb-adapter}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ilia Ablamonov", "Alex Gorkunov", "Cloud Castle Inc."]
-  s.date = %q{2011-04-21}
+  s.date = %q{2011-04-22}
   s.email = %q{ilia@flamefork.ru}
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -47,6 +47,7 @@ Gem::Specification.new do |s|
     "spec/active_record/core_actions_spec.rb",
     "spec/active_record/defaults_spec.rb",
     "spec/active_record/locking_spec.rb",
+    "spec/active_record/offset_spec.rb",
     "spec/active_record/record_attributes_spec.rb",
     "spec/active_record/validates_spec.rb",
     "spec/active_record/where_spec.rb",

data/lib/active_record/connection_adapters/simpledb_adapter/adapter.rb

@@ -59,41 +59,45 @@ module ActiveRecord
       end
       #=======================================
       #======== BATCHES ==========
-      def begin_batch type
+      def begin_batch
         raise ActiveRecord::ActiveRecordError.new("Batch already started. Finish it before start new batch") \
-          if defined?(@batch_type) && !@batch_type.nil?
+          if batch_started
 
-        @batch_type = type
+        @batch_started = true
       end
 
-      def commit_batch
-        log({:type => @batch_type, :count => batch_pool.count }.inspect, "SimpleDB Batch Operation") do
-          case @batch_type
-          when :update
-            @connection.batch_put_attributes domain_name, batch_pool
-          when :delete
-            @connection.batch_delete_attributes domain_name, batch_pool
-          end
-          clear_batch
-        end
-      end
+      def commit_batch type = nil
+        count = batch_pool.inject(0) {|sum, (key, value)| sum += value.count }
+        log({:count => count }.inspect, "SimpleDB Batch Operation") do
+          pool = batch_pool[:update]
+          @connection.batch_put_attributes(domain_name, pool) \
+            if pool && (type.nil? || type == :update)
+
+          pool = batch_pool[:delete]
+          @connection.batch_delete_attributes(domain_name, pool) \
+            if pool && (type.nil? || type == :delete)
 
-      def clear_batch
-        batch_pool.clear
-        @batch_type = nil
+          clear_batch type
+        end
       end
 
-      def is_batch type
-        type = :update if type == :insert
-        defined?(@batch_type) && @batch_type == type
+      def clear_batch type = nil
+        if type.nil?
+          batch_pool.clear
+          @batch_started = false
+        else
+          batch_pool[type].clear
+        end
       end
 
       #===========================
       attr_reader :domain_name
+      attr_reader :batch_started
 
       def initialize(connection, logger, aws_key, aws_secret, domain_name, connection_parameters, config)
         super(connection, logger)
         @config = config
+        @batch_started = false
         @domain_name = domain_name
         @connection_parameters = [
             aws_key,
@@ -120,30 +124,30 @@ module ActiveRecord
       end
 
       def execute sql, name = nil, skip_logging = false
-        log_title = "SimpleDB"
-        log_title += "(batched)" if is_batch sql[:action]
+        log_title = "SimpleDB (#{sql[:action]})"
+        log_title += " *BATCHED*" if batch_started
         log sql.inspect, log_title do
           case sql[:action]
           when :insert
             item_name = get_id sql[:attrs]
             item_name = sql[:attrs][:id] = generate_id unless item_name
-            if is_batch :update
-              add_to_batch item_name, sql[:attrs], true
+            if batch_started
+              add_to_batch :update, item_name, sql[:attrs], true
             else
               @connection.put_attributes domain_name, item_name, sql[:attrs], true
             end
             @last_insert_id = item_name
           when :update
             item_name = get_id sql[:wheres], true
-            if is_batch :update
-              add_to_batch item_name, sql[:attrs], true
+            if batch_started
+              add_to_batch :update, item_name, sql[:attrs], true
             else
               @connection.put_attributes domain_name, item_name, sql[:attrs], true, sql[:wheres]
             end
           when :delete
             item_name = get_id sql[:wheres], true
-            if is_batch :delete
-              add_to_batch item_name
+            if batch_started
+              add_to_batch :delete, item_name
             else
               @connection.delete_attributes domain_name, item_name, nil, sql[:wheres]
             end
@@ -161,7 +165,18 @@ module ActiveRecord
       def select sql, name = nil
         log sql, "SimpleDB" do
           result = []
-          response = @connection.select(sql, nil, true)
+          response = nil
+          if sql.offset
+            first_query = sql.gsub(/LIMIT\s+\d+/, "LIMIT #{sql.offset}")
+            first_query.gsub!(/SELECT(.+?)FROM/, "SELECT COUNT(*) FROM")
+            log first_query, "SimpleDB (offset partial)" do
+              response = @connection.select(first_query, nil, false) #without consistent read
+            end
+            puts response[:request_id]
+            response = @connection.select(sql, response[:request_id], true)
+          else
+            response = @connection.select(sql, nil, true)
+          end
           collection_name = get_collection_column_and_name(sql)
           columns = columns_definition(collection_name)
 
@@ -241,15 +256,14 @@ module ActiveRecord
 
       MAX_BATCH_ITEM_COUNT = 25
       def batch_pool
-        @batch_pool ||=[]
+        @batch_pool ||= {}
       end
 
-      def add_to_batch item_name, attributes = nil, replace = nil
-        batch_pool << Aws::SdbInterface::Item.new(item_name, attributes, replace)
-        if batch_pool.count == MAX_BATCH_ITEM_COUNT
-          type = @batch_type
-          commit_batch
-          begin_batch type
+      def add_to_batch type, item_name, attributes = nil, replace = nil
+        type_batch_pool = (batch_pool[type] ||= [])
+        type_batch_pool << Aws::SdbInterface::Item.new(item_name, attributes, replace)
+        if type_batch_pool.count == MAX_BATCH_ITEM_COUNT
+          commit_batch type
         end
       end
     end

data/lib/active_record/connection_adapters/simpledb_adapter/base.rb

@@ -56,8 +56,8 @@ module ActiveRecord
       end
     end
 
-    def self.batch type = :update, &block
-      connection.begin_batch type
+    def self.batch &block
+      connection.begin_batch
       block.call
       connection.commit_batch
     end

data/lib/arel/visitors/simpledb.rb

@@ -42,7 +42,14 @@ module Arel
         collection = o.cores.first.froms.name
         o.cores.first.wheres << SqlLiteral.new("`#{@connection.collection_column_name(collection)}` = #{quote(collection)}")
         o.cores.first.froms = Table.new @connection.domain_name
-        super
+        query = super
+        query.offset = o.offset.expr if o.offset 
+        query.limit = o.limit.expr if o.limit 
+        query
+      end
+
+      def visit_Arel_Nodes_Offset o
+        nil
       end
 
       def visit_Arel_Nodes_Values o
@@ -69,7 +76,11 @@ module Arel
 
       def visit_Arel_Nodes_Equality o
         right = o.right ? hash_value_quote(o.right, o.left.column) : nil
+        begin
         left = o.left.column.name
+        rescue
+          puts $!.backtrace
+        end
         {left => right}.tap { |m|
           m.override_to_s "#{visit o.left} = #{quote(o.right, o.left.column)}"
         }
@@ -112,7 +123,10 @@ module Arel
     VISITORS['simpledb'] = Arel::Visitors::SimpleDB
   end
 end
-
+class String
+  attr_accessor :offset
+  attr_accessor :limit
+end
 class Object
   def override_to_s s
     @override_to_s = s

data/spec/active_record/batch_spec.rb

@@ -38,17 +38,41 @@ describe "SimpleDBAdapter ActiveRecord batches operation" do
     items.each { |item| item.is_valid? }
   end
 
+  it "should work with usual update statments" do
+    count = 5
+    items = []
+    count.times { items << Person.create_valid }
+    Person.batch do
+      items.each {|item| item.update_attributes({:login => 'test'}); item.save! }
+    end
+    items = Person.all
+    items.count.should == count
+    items.each { |item| item.login.should == 'test' }
+  end
   #this test doesn't work with fakesdb
   it "should work with usual destroy statments" do
     count = 5
     items = []
     count.times { items << Person.create_valid }
-    Person.batch(:delete) do
+    Person.batch do
       items.each {|item| item.destroy }
     end
     Person.count.should == 0
   end
   
+  it "should work with diferrent statments in one batch session" do
+    count = 5
+    items = []
+    count.times { items << Person.create_valid }
+    Person.batch do
+      items.each do |item| 
+        item.destroy
+        Person.create_valid
+      end
+    end
+    Person.count.should == count
+  end
+
   it "should auto split to several batches when count of items more than BATCH_MAX_ITEM_COUNT" do
     count = 35
     Person.batch do

data/spec/active_record/offset_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+#testes
+describe "SimpleDBAdapter ActiveRecord offset operation" do
+
+  before :each do
+    ActiveRecord::Base.logger = Logger.new(STDOUT)
+    ActiveRecord::Base.establish_connection($config)
+    ActiveRecord::Base.connection.create_domain($config[:domain_name])
+    50.times { |i| Person.create!({:login => "login#{i}"}) }
+  end
+
+  after :each do
+    ActiveRecord::Base.connection.delete_domain($config[:domain_name])
+  end
+
+  it "should work" do
+    Person.limit(10).offset(20).all.each_with_index do |person, i|
+      person.login.should == "login#{i + 20}"
+    end
+  end
+end 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-simpledb-adapter
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Ilia Ablamonov
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-21 00:00:00 +04:00
+date: 2011-04-22 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -298,6 +298,7 @@ files:
 - spec/active_record/core_actions_spec.rb
 - spec/active_record/defaults_spec.rb
 - spec/active_record/locking_spec.rb
+- spec/active_record/offset_spec.rb
 - spec/active_record/record_attributes_spec.rb
 - spec/active_record/validates_spec.rb
 - spec/active_record/where_spec.rb
@@ -345,6 +346,7 @@ test_files:
 - spec/active_record/core_actions_spec.rb
 - spec/active_record/defaults_spec.rb
 - spec/active_record/locking_spec.rb
+- spec/active_record/offset_spec.rb
 - spec/active_record/record_attributes_spec.rb
 - spec/active_record/validates_spec.rb
 - spec/active_record/where_spec.rb