diff options
author | Ryuta Kamizono <kamipo@gmail.com> | 2018-04-24 07:07:41 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-24 07:07:41 +0900 |
commit | 7391ab45684fca1fa46e5b56569a595e73285c55 (patch) | |
tree | 9fd87dec742c255c48e6f9ea2330579cd430ebbf | |
parent | e4c51864286e790ba1cdec1e05fe8fadfb42330b (diff) | |
parent | f2a906337355e3ddd5f42182711075e9404f7096 (diff) | |
download | rails-7391ab45684fca1fa46e5b56569a595e73285c55.tar.gz rails-7391ab45684fca1fa46e5b56569a595e73285c55.tar.bz2 rails-7391ab45684fca1fa46e5b56569a595e73285c55.zip |
Merge pull request #32704 from eugeneius/mysql_statement_pool_hash
Save a hash allocation in MySQL statement pool
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb | 2 | ||||
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb index 477b09944f..07acb5425e 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -44,7 +44,7 @@ module ActiveRecord class StatementPool < ConnectionAdapters::StatementPool # :nodoc: private def dealloc(stmt) - stmt[:stmt].close + stmt.close end end diff --git a/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb b/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb index 458c9bfd70..4106ce01be 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb @@ -71,10 +71,7 @@ module ActiveRecord log(sql, name, binds, type_casted_binds) do if cache_stmt - cache = @statements[sql] ||= { - stmt: @connection.prepare(sql) - } - stmt = cache[:stmt] + stmt = @statements[sql] ||= @connection.prepare(sql) else stmt = @connection.prepare(sql) end |