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:
parent
5c9aa45489
commit
87adc799eb
|
@ -1 +1 @@
|
|||
1.21.0
|
||||
1.23.0
|
|
@ -324,8 +324,8 @@ module Gitlab
|
|||
GitalyClient.call(@storage, :repository_service, :search_files_by_name, request, timeout: GitalyClient.fast_timeout).flat_map(&:files)
|
||||
end
|
||||
|
||||
def search_files_by_content(ref, query, chunked_response: true)
|
||||
request = Gitaly::SearchFilesByContentRequest.new(repository: @gitaly_repo, ref: ref, query: query, chunked_response: chunked_response)
|
||||
def search_files_by_content(ref, query)
|
||||
request = Gitaly::SearchFilesByContentRequest.new(repository: @gitaly_repo, ref: ref, query: query)
|
||||
response = GitalyClient.call(@storage, :repository_service, :search_files_by_content, request)
|
||||
|
||||
search_results_from_response(response)
|
||||
|
@ -340,12 +340,6 @@ module Gitlab
|
|||
gitaly_response.each do |message|
|
||||
next if message.nil?
|
||||
|
||||
# Old client will ignore :chunked_response flag
|
||||
# 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
|
||||
|
@ -353,7 +347,6 @@ module Gitlab
|
|||
current_match = +""
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
matches
|
||||
end
|
||||
|
|
|
@ -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')
|
||||
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
|
||||
|
||||
describe '#find_remote_root_ref' do
|
||||
|
|
Loading…
Reference in New Issue