github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Performance: freeze cached rows instead of duping

Browse Source
This commit is contained in:
Jeremy Kemper
2008-08-11 10:25:57 -07:00
parent 7fbe226de5
commit cd8e653d5b
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
activerecord/lib/active_record/base.rb
View File

@@ -612,7 +612,7 @@ module ActiveRecord #:nodoc:
# Post.find_by_sql ["SELECT title FROM posts WHERE author = ? AND created > ?", author_id, start_date]
# > [#<Post:0x36bff9c @attributes={"first_name"=>"The Cheap Man Buys Twice"}>, ...]
def find_by_sql(sql)
connection.select_all(sanitize_sql(sql), "#{name} Load").collect! { |record| instantiate(record) }
connection.select_all(sanitize_sql(sql), "#{name} Load").map { |record| instantiate(record) }
end
# Checks whether a record exists in the database that matches conditions given. These conditions

17
activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
View File

@@ -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