diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
commit | a09983ae35713f5a2bbb100981116d31ce99826e (patch) | |
tree | 2ee2af7bd104d57086db360a7e6d8c9d5d43667a /lib/gitlab/gitaly_client/blob_service.rb | |
parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'lib/gitlab/gitaly_client/blob_service.rb')
-rw-r--r-- | lib/gitlab/gitaly_client/blob_service.rb | 52 |
1 files changed, 25 insertions, 27 deletions
diff --git a/lib/gitlab/gitaly_client/blob_service.rb b/lib/gitlab/gitaly_client/blob_service.rb index 8c704c2ceea..c66b3335d89 100644 --- a/lib/gitlab/gitaly_client/blob_service.rb +++ b/lib/gitlab/gitaly_client/blob_service.rb @@ -16,27 +16,7 @@ module Gitlab limit: limit ) response = GitalyClient.call(@gitaly_repo.storage_name, :blob_service, :get_blob, request, timeout: GitalyClient.fast_timeout) - - data = [] - blob = nil - response.each do |msg| - if blob.nil? - blob = msg - end - - data << msg.data - end - - return if blob.oid.blank? - - data = data.join - - Gitlab::Git::Blob.new( - id: blob.oid, - size: blob.size, - data: data, - binary: Gitlab::Git::Blob.binary?(data) - ) + consume_blob_response(response) end def batch_lfs_pointers(blob_ids) @@ -48,7 +28,6 @@ module Gitlab ) response = GitalyClient.call(@gitaly_repo.storage_name, :blob_service, :get_lfs_pointers, request, timeout: GitalyClient.medium_timeout) - map_lfs_pointers(response) end @@ -70,8 +49,7 @@ module Gitlab :blob_service, :get_blobs, request, - timeout: GitalyClient.fast_timeout - ) + timeout: GitalyClient.fast_timeout) GitalyClient::BlobsStitcher.new(response) end @@ -96,7 +74,6 @@ module Gitlab request, timeout: GitalyClient.fast_timeout ) - map_blob_types(response) end @@ -127,7 +104,6 @@ module Gitlab request, timeout: timeout ) - map_lfs_pointers(response) end @@ -137,12 +113,34 @@ module Gitlab ) response = GitalyClient.call(@gitaly_repo.storage_name, :blob_service, :get_all_lfs_pointers, request, timeout: GitalyClient.medium_timeout) - map_lfs_pointers(response) end private + def consume_blob_response(response) + data = [] + blob = nil + response.each do |msg| + if blob.nil? + blob = msg + end + + data << msg.data + end + + return if blob.oid.blank? + + data = data.join + + Gitlab::Git::Blob.new( + id: blob.oid, + size: blob.size, + data: data, + binary: Gitlab::Git::Blob.binary?(data) + ) + end + def map_lfs_pointers(response) response.flat_map do |message| message.lfs_pointers.map do |lfs_pointer| |