Removed Retry Deadlock Victim

Author: Anna

CHANGELOG

@@ -1,3 +1,6 @@
+* 4.0.0 *
+
+*Removed deadlock victim retry in favor of Isolation Level
 
 * 3.2.12 *
 

README.md

@@ -110,15 +110,6 @@ ActiveRecord::ConnectionAdapters::SQLServerAdapter.native_string_database_type =
 It is important to remember that unicode types in SQL Server have approximately half the storage capacity as their counter parts. So where a normal string would max out at (8000) a unicode string will top off at (4000).
 
 
-#### Deadlock Victim Retry
-
-In a config initializer, you can configure the adapter to retry deadlock victims' SQL. Note, this relies on us copying ActiveRecord's `#transaction` method and can be brittle when upgrading. If you think that our version of `#transaction` is out of sync with the version of rails in our gemspec, please open a ticket and let us know. Our custom transaction method can be found in `activerecord/connection_adapters/sqlserver/core_ext/database_statements.rb`.
-
-```ruby
-ActiveRecord::ConnectionAdapters::SQLServerAdapter.retry_deadlock_victim = true
-```
-
-
 #### Force Schema To Lowercase
 
 Although it is not necessary, the Ruby convention is to use lowercase method names. If your database schema is in upper or mixed case, we can force all table and column names during the schema reflection process to be lowercase. Add this to your config/initializers file for the adapter.

lib/active_record/connection_adapters/sqlserver/core_ext/database_statements.rb

@@ -3,8 +3,6 @@ module ConnectionAdapters
     module Sqlserver
       module DatabaseStatements
 
-        include CoreExt::DatabaseStatements
-        
         def select_rows(sql, name = nil)
           raw_select sql, name, [], :fetch => :rows
         end
@@ -49,14 +47,6 @@ def supports_statement_cache?
           true
         end
 
-        def transaction(options = {})
-          if retry_deadlock_victim?
-            block_given? ? transaction_with_retry_deadlock_victim(options) { yield } : transaction_with_retry_deadlock_victim(options)
-          else
-            block_given? ? super(options) { yield } : super(options)
-          end
-        end
-
         def begin_db_transaction
           do_execute "BEGIN TRANSACTION"
         end

lib/active_record/connection_adapters/sqlserver/database_statements.rb

@@ -6,7 +6,6 @@
 require 'active_support/core_ext/string'
 require 'active_record/connection_adapters/abstract_adapter'
 require 'active_record/connection_adapters/sqlserver/core_ext/active_record'
-require 'active_record/connection_adapters/sqlserver/core_ext/database_statements'
 require 'active_record/connection_adapters/sqlserver/core_ext/explain'
 require 'active_record/connection_adapters/sqlserver/core_ext/explain_subscriber'
 require 'active_record/connection_adapters/sqlserver/core_ext/relation'
@@ -186,9 +185,8 @@ class SQLServerAdapter < AbstractAdapter
       attr_reader :database_version, :database_year, :spid, :product_level, :product_version, :edition
 
       cattr_accessor :native_text_database_type, :native_binary_database_type, :native_string_database_type,
-                     :enable_default_unicode_types, :auto_connect, :retry_deadlock_victim,
-                     :cs_equality_operator, :lowercase_schema_reflection, :auto_connect_duration,
-                     :showplan_option
+                     :enable_default_unicode_types, :auto_connect, :cs_equality_operator, 
+                     :lowercase_schema_reflection, :auto_connect_duration, :showplan_option
 
       self.enable_default_unicode_types = true
 
@@ -359,11 +357,6 @@ def auto_connect_duration
         @@auto_connect_duration ||= 10
       end
 
-      def retry_deadlock_victim
-        @@retry_deadlock_victim.is_a?(FalseClass) ? false : true
-      end
-      alias :retry_deadlock_victim? :retry_deadlock_victim
-
       def native_string_database_type
         @@native_string_database_type || (enable_default_unicode_types ? 'nvarchar' : 'varchar')
       end
@@ -509,7 +502,6 @@ def with_sqlserver_error_handling
         rescue Exception => e
           case translate_exception(e,e.message)
             when LostConnection; retry if auto_reconnected?
-            when DeadlockVictim; retry if retry_deadlock_victim? && open_transactions == 0
           end
           raise
         end

lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -180,18 +180,7 @@ class ConnectionTestSqlserver < ActiveRecord::TestCase
           raw_conn.stubs(:execute).raises(deadlock_victim_exception(@query)).then.returns(stubbed_handle)
         end
 
-        teardown do
-          @connection.class.retry_deadlock_victim = nil
-        end
-
-        should 'retry by default' do
-          assert_nothing_raised do
-            assert_equal @expected, @connection.execute(@query)
-          end
-        end
-
-        should 'raise ActiveRecord::DeadlockVictim if retry is disabled' do
-          @connection.class.retry_deadlock_victim = false
+        should 'raise ActiveRecord::DeadlockVictim' do
           assert_raise(ActiveRecord::DeadlockVictim) do
             assert_equal @expected, @connection.execute(@query)
           end
@@ -228,21 +217,9 @@ def execute_with_deadlock_exception(sql, *args)
             remove_method :execute_without_deadlock_exception
           end
           @connection.send(:remove_instance_variable, :@raised_deadlock_exception)
-          @connection.class.retry_deadlock_victim = nil
-        end
-
-        should 'retry by default' do
-          skip "takes too long"
-          assert_nothing_raised do
-            ActiveRecord::Base.transaction do
-              assert_equal @expected, @connection.execute(@query)
-            end
-          end
         end
 
         should 'raise ActiveRecord::DeadlockVictim if retry disabled' do
-          skip  "takes too long"
-          @connection.class.retry_deadlock_victim = false
           assert_raise(ActiveRecord::DeadlockVictim) do
             ActiveRecord::Base.transaction do
               assert_equal @expected, @connection.execute(@query)