diff options
author | Stan Hu <stanhu@gmail.com> | 2019-04-29 17:07:42 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-04-29 21:29:25 -0700 |
commit | 25818bd7ae765422c934d0a32efb4ba353d11183 (patch) | |
tree | bbef891f40c54ee59e79fa04f538562bc11c1afb /spec/uploaders | |
parent | 7ae2107d9ebca0adecc8a21cacd1bfb6e89ee3ab (diff) | |
download | gitlab-ce-25818bd7ae765422c934d0a32efb4ba353d11183.tar.gz |
Disable method replacement in avatar loading
We've seen a significant performance penalty when using
`BatchLoader#__replace_with!`. This defines methods on the batch loader
that proxy to the 'real' object using send. The alternative is
`method_missing`, which is slower. However, we've noticed that
`method_missing` can be faster if:
1. The objects being loaded have a large interface.
2. We don't call too many methods on the loaded object.
Avatar uploads meet both criteria above, so let's use the newly-released
feature in https://github.com/exAspArk/batch-loader/pull/45.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60903
Diffstat (limited to 'spec/uploaders')
-rw-r--r-- | spec/uploaders/object_storage_spec.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/spec/uploaders/object_storage_spec.rb b/spec/uploaders/object_storage_spec.rb index 9ce9a353913..a62830c35f1 100644 --- a/spec/uploaders/object_storage_spec.rb +++ b/spec/uploaders/object_storage_spec.rb @@ -771,6 +771,14 @@ describe ObjectStorage do expect { avatars }.not_to exceed_query_limit(1) end + it 'does not attempt to replace methods' do + models.each do |model| + expect(model.avatar.upload).to receive(:method_missing).and_call_original + + model.avatar.upload.path + end + end + it 'fetches a unique upload for each model' do expect(avatars.map(&:url).uniq).to eq(avatars.map(&:url)) expect(avatars.map(&:upload).uniq).to eq(avatars.map(&:upload)) |