Performance: freeze cached rows instead of duping

2 files changed, 5 insertions, 14 deletions

diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 6eb4d42d51..5357255bad 100644
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -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
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