Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Deprecate allow_concurrency and make it have no effect

  • Loading branch information...
commit ca6d71753f3a2e8a0a29108b7c55ba3b7c8cd943 1 parent a96b7d4
Nick Sieger nicksieger authored
20 activerecord/lib/active_record/base.rb
View
@@ -452,13 +452,6 @@ def self.reset_subclasses #:nodoc:
cattr_accessor :default_timezone, :instance_writer => false
@@default_timezone = :local
- # Determines whether to use a connection for each thread, or a single shared connection for all threads.
- # Defaults to false. If you're writing a threaded application, set to true
- # and periodically call verify_active_connections! to clear out connections
- # assigned to stale threads.
- cattr_accessor :allow_concurrency, :instance_writer => false
- @@allow_concurrency = false
-
# Specifies the format to use when dumping the database schema with Rails'
# Rakefile. If :sql, the schema is dumped as (potentially database-
# specific) SQL statements. If :ruby, the schema is dumped as an
@@ -1943,22 +1936,11 @@ def scope(method, key = nil) #:nodoc:
end
end
- def thread_safe_scoped_methods #:nodoc:
+ def scoped_methods #:nodoc:
scoped_methods = (Thread.current[:scoped_methods] ||= {})
scoped_methods[self] ||= []
end
- def single_threaded_scoped_methods #:nodoc:
- @scoped_methods ||= []
- end
-
- # pick up the correct scoped_methods version from @@allow_concurrency
- if @@allow_concurrency
- alias_method :scoped_methods, :thread_safe_scoped_methods
- else
- alias_method :scoped_methods, :single_threaded_scoped_methods
- end
-
def current_scoped_methods #:nodoc:
scoped_methods.last
end
25 activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
View
@@ -154,7 +154,7 @@ def connections #:nodoc:
private
def new_connection
- config = spec.config.reverse_merge(:allow_concurrency => ActiveRecord::Base.allow_concurrency)
+ config = spec.config.reverse_merge(:allow_concurrency => true)
ActiveRecord::Base.send(spec.adapter_method, config)
end
@@ -285,9 +285,12 @@ def remove_connection(conn)
end
end
- module ConnectionHandlerMethods
+ class ConnectionHandler
+ attr_reader :connection_pools_lock
+
def initialize(pools = {})
@connection_pools = pools
+ @connection_pools_lock = Monitor.new
end
def connection_pools
@@ -361,24 +364,6 @@ def retrieve_connection_pool(klass)
klass = klass.superclass
end
end
- end
-
- # This connection handler is not thread-safe, as it does not protect access
- # to the underlying connection pools.
- class SingleThreadConnectionHandler
- include ConnectionHandlerMethods
- end
-
- # This connection handler is thread-safe. Each access or modification of a thread
- # pool is synchronized by an internal monitor.
- class MultipleThreadConnectionHandler
- attr_reader :connection_pools_lock
- include ConnectionHandlerMethods
-
- def initialize(pools = {})
- super
- @connection_pools_lock = Monitor.new
- end
# Apply monitor to all public methods that access the pool.
synchronize :establish_connection, :retrieve_connection,
30 activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
View
@@ -14,25 +14,7 @@ def initialize (config, adapter_method)
# The connection handler
cattr_accessor :connection_handler, :instance_writer => false
- @@connection_handler = ConnectionAdapters::SingleThreadConnectionHandler.new
-
- # Turning on allow_concurrency changes the single threaded connection handler
- # for a multiple threaded one, so that multi-threaded access of the
- # connection pools is synchronized.
- def self.allow_concurrency=(flag)
- if @@allow_concurrency != flag
- @@allow_concurrency = flag
- # When switching connection handlers, preserve the existing pools so that
- # #establish_connection doesn't need to be called again.
- if @@allow_concurrency
- self.connection_handler = ConnectionAdapters::MultipleThreadConnectionHandler.new(
- self.connection_handler.connection_pools)
- else
- self.connection_handler = ConnectionAdapters::SingleThreadConnectionHandler.new(
- self.connection_handler.connection_pools)
- end
- end
- end
+ @@connection_handler = ConnectionAdapters::ConnectionHandler.new
# Returns the connection currently associated with the class. This can
# also be used to "borrow" the connection to do database work that isn't
@@ -109,6 +91,16 @@ def self.establish_connection(spec = nil)
end
class << self
+ # Deprecated and no longer has any effect.
+ def allow_concurrency
+ ActiveSupport::Deprecation.warn("ActiveRecord::Base.allow_concurrency has been deprecated and no longer has any effect. Please remove all references to allow_concurrency.")
+ end
+
+ # Deprecated and no longer has any effect.
+ def allow_concurrency=(flag)
+ ActiveSupport::Deprecation.warn("ActiveRecord::Base.allow_concurrency= has been deprecated and no longer has any effect. Please remove all references to allow_concurrency=.")
+ end
+
# Returns the connection currently associated with the class. This can
# also be used to "borrow" the connection to do database work unrelated
# to any of the specific Active Records.
4 activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
View
@@ -109,7 +109,9 @@ def disconnect!
# ROLLBACK and swallows any exceptions which is probably not enough to
# ensure the connection is clean.
def reset!
- execute "ROLLBACK" rescue nil
+ silence_stderr do # postgres prints on stderr when you do this w/o a txn
+ execute "ROLLBACK" rescue nil
+ end
end
# Returns true if its safe to reload the connection between requests for development mode.
2  activerecord/test/cases/base_test.rb
View
@@ -880,7 +880,7 @@ def test_mass_assignment_protection
def test_mass_assignment_protection_against_class_attribute_writers
[:logger, :configurations, :primary_key_prefix_type, :table_name_prefix, :table_name_suffix, :pluralize_table_names, :colorize_logging,
- :default_timezone, :allow_concurrency, :schema_format, :verification_timeout, :lock_optimistically, :record_timestamps].each do |method|
+ :default_timezone, :schema_format, :verification_timeout, :lock_optimistically, :record_timestamps].each do |method|
assert Task.respond_to?(method)
assert Task.respond_to?("#{method}=")
assert Task.new.respond_to?(method)
7 activerecord/test/cases/locking_test.rb
View
@@ -210,13 +210,6 @@ class PessimisticLockingTest < ActiveRecord::TestCase
def setup
# Avoid introspection queries during tests.
Person.columns; Reader.columns
-
- @allow_concurrency = ActiveRecord::Base.allow_concurrency
- ActiveRecord::Base.allow_concurrency = true
- end
-
- def teardown
- ActiveRecord::Base.allow_concurrency = @allow_concurrency
end
# Test typical find.
42 activerecord/test/cases/threaded_connections_test.rb
View
@@ -4,53 +4,23 @@
unless %w(FrontBase).include? ActiveRecord::Base.connection.adapter_name
class ThreadedConnectionsTest < ActiveRecord::TestCase
- self.use_transactional_fixtures = false
-
- fixtures :topics
-
- def setup
- @connection = ActiveRecord::Base.remove_connection
- @connections = []
- @allow_concurrency = ActiveRecord::Base.allow_concurrency
- ActiveRecord::Base.allow_concurrency = true
- end
-
- def teardown
- # clear the connection cache
- ActiveRecord::Base.clear_active_connections!
- # set allow_concurrency to saved value
- ActiveRecord::Base.allow_concurrency = @allow_concurrency
- # reestablish old connection
- ActiveRecord::Base.establish_connection(@connection)
- end
-
- def gather_connections
- ActiveRecord::Base.establish_connection(@connection)
-
- 5.times do
- Thread.new do
- Topic.find :first
- @connections << ActiveRecord::Base.active_connections.values.first
- end.join
+ def test_allow_concurrency_is_deprecated
+ assert_deprecated('ActiveRecord::Base.allow_concurrency') do
+ ActiveRecord::Base.allow_concurrency
+ end
+ assert_deprecated('ActiveRecord::Base.allow_concurrency=') do
+ ActiveRecord::Base.allow_concurrency = true
end
- end
-
- def test_threaded_connections
- gather_connections
- assert_equal @connections.length, 5
end
end
class PooledConnectionsTest < ActiveRecord::TestCase
def setup
@connection = ActiveRecord::Base.remove_connection
- @allow_concurrency = ActiveRecord::Base.allow_concurrency
- ActiveRecord::Base.allow_concurrency = true
end
def teardown
ActiveRecord::Base.clear_all_connections!
- ActiveRecord::Base.allow_concurrency = @allow_concurrency
ActiveRecord::Base.establish_connection(@connection)
end
11 activerecord/test/cases/transactions_test.rb
View
@@ -283,17 +283,6 @@ def remove_exception_raising_after_create_callback_to_topic
if current_adapter?(:PostgreSQLAdapter)
class ConcurrentTransactionTest < TransactionTest
- def setup
- @allow_concurrency = ActiveRecord::Base.allow_concurrency
- ActiveRecord::Base.allow_concurrency = true
- super
- end
-
- def teardown
- super
- ActiveRecord::Base.allow_concurrency = @allow_concurrency
- end
-
# This will cause transactions to overlap and fail unless they are performed on
# separate database connections.
def test_transaction_per_thread
Please sign in to comment.
Something went wrong with that request. Please try again.