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

Merge pull request #3464 from kennyj/avoid_to_call_twice

Browse Source 
avoided to call `Marshal.dump` twice
This commit is contained in:
Santiago Pastorino
2011-10-29 19:18:46 -07:00
parent 11f6795b23 3b546afd04
commit 75ee4d97ef
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
activesupport/lib/active_support/cache.rb
View File

@@ -559,7 +559,7 @@ module ActiveSupport
@value = nil
else
@value = Marshal.dump(value)
if should_compress?(value, options)
if should_compress?(@value, options)
@value = Zlib::Deflate.deflate(@value)
@compressed = true
end
@@ -613,13 +613,10 @@ module ActiveSupport
end
private
def should_compress?(value, options)
if options[:compress] && value
unless value.is_a?(Numeric)
compress_threshold = options[:compress_threshold] || DEFAULT_COMPRESS_LIMIT
serialized_value = value.is_a?(String) ? value : Marshal.dump(value)
return true if serialized_value.size >= compress_threshold
end
def should_compress?(serialized_value, options)
if options[:compress]
compress_threshold = options[:compress_threshold] || DEFAULT_COMPRESS_LIMIT
return true if serialized_value.size >= compress_threshold
end
false
end