Removing old code path for search_files_by_content

In 11.8, we added a fix for the SearchFilesByContent RPC in gitaly to
send back the response in chunks. However, we kept in the old code path
for backwards compatibility. Now that the change is fully deployed, we
can remove that old codepath.
This commit is contained in:
John Cai 2019-02-27 13:37:33 -08:00
parent 5c9aa45489
commit 87adc799eb
3 changed files with 7 additions and 24 deletions

View File

@ -1 +1 @@
1.21.0 1.23.0

View File

@ -324,8 +324,8 @@ module Gitlab
GitalyClient.call(@storage, :repository_service, :search_files_by_name, request, timeout: GitalyClient.fast_timeout).flat_map(&:files) GitalyClient.call(@storage, :repository_service, :search_files_by_name, request, timeout: GitalyClient.fast_timeout).flat_map(&:files)
end end
def search_files_by_content(ref, query, chunked_response: true) def search_files_by_content(ref, query)
request = Gitaly::SearchFilesByContentRequest.new(repository: @gitaly_repo, ref: ref, query: query, chunked_response: chunked_response) request = Gitaly::SearchFilesByContentRequest.new(repository: @gitaly_repo, ref: ref, query: query)
response = GitalyClient.call(@storage, :repository_service, :search_files_by_content, request) response = GitalyClient.call(@storage, :repository_service, :search_files_by_content, request)
search_results_from_response(response) search_results_from_response(response)
@ -340,18 +340,11 @@ module Gitlab
gitaly_response.each do |message| gitaly_response.each do |message|
next if message.nil? next if message.nil?
# Old client will ignore :chunked_response flag current_match << message.match_data
# and return messages with `matches` key.
# This code path will be removed post 12.0 release
if message.matches.any?
matches += message.matches
else
current_match << message.match_data
if message.end_of_match if message.end_of_match
matches << current_match matches << current_match
current_match = +"" current_match = +""
end
end end
end end

View File

@ -619,16 +619,6 @@ describe Gitlab::Git::Repository, :seed_helper do
repository.search_files_by_content('search-files-by-content', 'search-files-by-content-branch') repository.search_files_by_content('search-files-by-content', 'search-files-by-content-branch')
end end
end end
it_should_behave_like 'search files by content' do
let(:search_results) do
repository.gitaly_repository_client.search_files_by_content(
'search-files-by-content-branch',
'search-files-by-content',
chunked_response: false
)
end
end
end end
describe '#find_remote_root_ref' do describe '#find_remote_root_ref' do