diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-08-11 10:25:57 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-08-18 17:34:38 -0700 |
| commit | cd8e653d5b18e6d3c3acc9930832f8e23945e392 (patch) | |
| tree | 6a0063580c0563ecace2216a45189c11065fe5bf /activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb | |
| parent | 7fbe226de5c63565fcca67d01687d83009ab9886 (diff) | |
| download | rails-cd8e653d5b18e6d3c3acc9930832f8e23945e392.tar.gz rails-cd8e653d5b18e6d3c3acc9930832f8e23945e392.tar.bz2 rails-cd8e653d5b18e6d3c3acc9930832f8e23945e392.zip | |
Performance: freeze cached rows instead of duping
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb b/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb index 2afd6064ad..81a2e56b34 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb @@ -72,21 +72,12 @@ module ActiveRecord private def cache_sql(sql) - result = - if @query_cache.has_key?(sql) - log_info(sql, "CACHE", 0.0) - @query_cache[sql] - else - @query_cache[sql] = yield - end - - if Array === result - result.collect { |row| row.dup } + if @query_cache.has_key?(sql) + log_info(sql, "CACHE", 0.0) + @query_cache[sql] else - result.duplicable? ? result.dup : result + @query_cache[sql] = yield.freeze end - rescue TypeError - result end end end |