em-pg-client-helper 0.5.1 → 0.6.0

data/lib/em-pg-client-helper/transaction.rb

@@ -10,26 +10,51 @@ class PG::EM::Client::Helper::Transaction
 		# This can be `nil` if the txn is in progress, or it will be
 		# true or false to indicate success/failure of the txn
 		@committed  = nil
+		@retryable  = false
 
 		DeferrableGroup.new do |dg|
 			@dg = dg
 
 			trace_query("BEGIN")
-			@conn.exec_defer("BEGIN").callback do
+			@conn.exec_defer("BEGIN").tap do |df|
+				@dg.add(df)
+			end.callback do
 				begin
 					blk.call(self)
 				rescue StandardError => ex
 					rollback(ex)
 				end
-			end.errback { |ex| rollback(ex) }.tap { |df| @dg.add(df) }
+			end.errback do |ex|
+				rollback(ex)
+			end
 		end.callback do
 			rollback(RuntimeError.new("txn.commit was not called")) unless @committed
 			self.succeed
 		end.errback do |ex|
-			self.fail(ex)
+			if @retryable and [PG::TRSerializationFailure].include?(ex.class)
+				self.class.new(conn, opts, &blk).callback do
+					self.succeed
+				end.errback do |ex|
+					self.fail(ex)
+				end
+			else
+				self.fail(ex)
+			end
 		end
 	end
 
+	# Mark the transaction as requiring the serializable isolation level.
+	#
+	# @param retryable [TrueClass, FalseClass] Whether or not the transaction
+	#   should be retried if some sort of transaction-level failure occurs.
+	#   Be careful enabling this, as the entire block will be re-run, including
+	#   any code that creates side-effects elsewhere.
+	#
+	def serializable(retryable = false, &blk)
+		@retryable = retryable
+		exec("SET TRANSACTION ISOLATION LEVEL SERIALIZABLE", &blk)
+	end
+
 	# Signal the database to commit this transaction.  You must do this
 	# once you've completed your queries, it won't be called automatically
 	# for you.  Once you've committed the transaction, you cannot use it

data/spec/db_transaction_spec.rb

@@ -3,21 +3,22 @@ require_relative './spec_helper'
 describe "PG::EM::Client::Helper#db_transaction" do
 	let(:mock_conn) { double(PG::EM::Client) }
 
-	def expect_query_failure(q, args=nil, exec_time = 0.001)
-		expect_query(q, args, exec_time, :fail)
+	def expect_query_failure(q, args=nil, err=nil, exec_time = 0.001)
+		err ||= RuntimeError.new("Dummy failure")
+		expect_query(q, args, exec_time, :fail, err)
 	end
 
-	def expect_query(q, args=nil, exec_time = 0.001, disposition = :succeed)
+	def expect_query(q, args=nil, exec_time = 0.001, disposition = :succeed, *disp_opts)
 		df = EM::DefaultDeferrable.new
 
-		ex = expect(mock_conn).
-		  to receive(:exec_defer).
-		  with(*[q, args].compact).
-		  and_return(df).
-		  ordered
+		expect(mock_conn)
+		  .to receive(:exec_defer)
+		  .with(*[q, args].compact)
+		  .and_return(df)
+		  .ordered
 
 		EM.add_timer(exec_time) do
-			df.__send__(disposition)
+			df.__send__(disposition, *disp_opts)
 		end
 	end
 
@@ -158,4 +159,47 @@ describe "PG::EM::Client::Helper#db_transaction" do
 			end
 		end
 	end
+
+	it "retries if it gets an error during the transaction" do
+		in_em do
+			expect_query("BEGIN")
+			expect_query("SET TRANSACTION ISOLATION LEVEL SERIALIZABLE", [])
+			expect_query_failure('INSERT INTO "foo" ("bar") VALUES ($1)', ["baz"], PG::TRSerializationFailure.new("OMFG!"))
+			expect_query("ROLLBACK")
+			expect_query("BEGIN")
+			expect_query("SET TRANSACTION ISOLATION LEVEL SERIALIZABLE", [])
+			expect_query('INSERT INTO "foo" ("bar") VALUES ($1)', ["baz"])
+			expect_query("COMMIT")
+
+			in_transaction do |txn|
+				txn.serializable(true) do
+					txn.insert("foo", :bar => 'baz') do
+						txn.commit
+					end
+				end
+			end
+		end
+	end
+
+	it "retries if it gets an error on commit" do
+		in_em do
+			expect_query("BEGIN")
+			expect_query("SET TRANSACTION ISOLATION LEVEL SERIALIZABLE", [])
+			expect_query('INSERT INTO "foo" ("bar") VALUES ($1)', ["baz"])
+			expect_query_failure("COMMIT", nil, PG::TRSerializationFailure.new("OMFG!"))
+			expect_query("ROLLBACK")
+			expect_query("BEGIN")
+			expect_query("SET TRANSACTION ISOLATION LEVEL SERIALIZABLE", [])
+			expect_query('INSERT INTO "foo" ("bar") VALUES ($1)', ["baz"])
+			expect_query("COMMIT")
+
+			in_transaction do |txn|
+				txn.serializable(true) do
+					txn.insert("foo", :bar => 'baz') do
+						txn.commit
+					end
+				end
+			end
+		end
+	end
 end

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@ require 'spork'
 
 Spork.prefork do
 	require 'bundler'
-	Bundler.setup(:default, :test)
+	Bundler.setup(:default, :development, :test)
 	require 'rspec/core'
 	require 'rspec/mocks'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-pg-client-helper
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -261,7 +261,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4325502789198036899
+      hash: -3912850109456819706
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -270,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4325502789198036899
+      hash: -3912850109456819706
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23