Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Performance: freeze cached rows instead of duping

  • Loading branch information...
commit cd8e653d5b18e6d3c3acc9930832f8e23945e392 1 parent 7fbe226
@jeremy jeremy authored
View
2  activerecord/lib/active_record/base.rb
@@ -612,7 +612,7 @@ def all(*args)
# 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
View
17 activerecord/lib/active_record/connection_adapters/abstract/query_cache.rb
@@ -72,21 +72,12 @@ def columns_with_query_cache(*args)
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
Please sign in to comment.
Something went wrong with that request. Please try again.