diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-07-22 12:51:36 -0300 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-07-22 12:51:36 -0300 |
| commit | 68bbbd470dd9439c03411e3b83ad4361d5e82730 (patch) | |
| tree | be561634645c7bc3c1dbe4d20740819dd1131a21 | |
| parent | 4e211d3faca5e62a4a580c8b756c7479b62d0781 (diff) | |
| download | rails-68bbbd470dd9439c03411e3b83ad4361d5e82730.tar.gz rails-68bbbd470dd9439c03411e3b83ad4361d5e82730.tar.bz2 rails-68bbbd470dd9439c03411e3b83ad4361d5e82730.zip | |
Move #11546 changelog to the top [ci skip]
| -rw-r--r-- | activesupport/CHANGELOG.md | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 918a43bf36..40e73ae77f 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,3 +1,16 @@ +* Improve `ActiveSupport::Cache::MemoryStore` cache size calculation. + The memory used by a key/entry pair is calculated via `#cached_size`: + + def cached_size(key, entry) + key.to_s.bytesize + entry.size + PER_ENTRY_OVERHEAD + end + + The value of `PER_ENTRY_OVERHEAD` is 240 bytes based on an [empirical + estimation](https://gist.github.com/ssimeonov/6047200) for 64-bit MRI on + 1.9.3 and 2.0. GH#11512 + + *Simeon Simeonov* + * Only raise `Module::DelegationError` if it's the source of the exception. Fixes #10559 @@ -143,17 +156,4 @@ *Daniel Schierbeck* -* Improve `ActiveSupport::Cache::MemoryStore` cache size calculation. - The memory used by a key/entry pair is calculated via `#cached_size`: - - def cached_size(key, entry) - key.to_s.bytesize + entry.size + PER_ENTRY_OVERHEAD - end - - The value of `PER_ENTRY_OVERHEAD` is 240 bytes based on an [empirical - estimation](https://gist.github.com/ssimeonov/6047200) for 64-bit MRI on - 1.9.3 and 2.0. GH#11512 - - *Simeon Simeonov* - Please check [4-0-stable](https://github.com/rails/rails/blob/4-0-stable/activesupport/CHANGELOG.md) for previous changes. |