Commit 8f9b658e authored by Robert Speicher's avatar Robert Speicher

Merge branch 'feature/migrate-count-commits-to-gitaly' into 'master'

Migrate Gitlab::Git::Repository#count_commits to Gitaly

Closes gitaly#415

See merge request !13121
parents 2a73be51 215e0911
...@@ -391,7 +391,7 @@ gem 'vmstat', '~> 2.3.0' ...@@ -391,7 +391,7 @@ gem 'vmstat', '~> 2.3.0'
gem 'sys-filesystem', '~> 1.1.6' gem 'sys-filesystem', '~> 1.1.6'
# Gitaly GRPC client # Gitaly GRPC client
gem 'gitaly', '~> 0.21.0' gem 'gitaly', '~> 0.23.0'
gem 'toml-rb', '~> 0.3.15', require: false gem 'toml-rb', '~> 0.3.15', require: false
......
...@@ -269,7 +269,7 @@ GEM ...@@ -269,7 +269,7 @@ GEM
po_to_json (>= 1.0.0) po_to_json (>= 1.0.0)
rails (>= 3.2.0) rails (>= 3.2.0)
gherkin-ruby (0.3.2) gherkin-ruby (0.3.2)
gitaly (0.21.0) gitaly (0.23.0)
google-protobuf (~> 3.1) google-protobuf (~> 3.1)
grpc (~> 1.0) grpc (~> 1.0)
github-linguist (4.7.6) github-linguist (4.7.6)
...@@ -978,7 +978,7 @@ DEPENDENCIES ...@@ -978,7 +978,7 @@ DEPENDENCIES
gettext (~> 3.2.2) gettext (~> 3.2.2)
gettext_i18n_rails (~> 1.8.0) gettext_i18n_rails (~> 1.8.0)
gettext_i18n_rails_js (~> 1.2.0) gettext_i18n_rails_js (~> 1.2.0)
gitaly (~> 0.21.0) gitaly (~> 0.23.0)
github-linguist (~> 4.7.0) github-linguist (~> 4.7.0)
gitlab-flowdock-git-hook (~> 1.0.1) gitlab-flowdock-git-hook (~> 1.0.1)
gitlab-markup (~> 1.5.1) gitlab-markup (~> 1.5.1)
......
...@@ -300,17 +300,14 @@ module Gitlab ...@@ -300,17 +300,14 @@ module Gitlab
raw_log(options).map { |c| Commit.decorate(c) } raw_log(options).map { |c| Commit.decorate(c) }
end end
# Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/382
def count_commits(options) def count_commits(options)
cmd = %W[#{Gitlab.config.git.bin_path} --git-dir=#{path} rev-list] gitaly_migrate(:count_commits) do |is_enabled|
cmd << "--after=#{options[:after].iso8601}" if options[:after] if is_enabled
cmd << "--before=#{options[:before].iso8601}" if options[:before] count_commits_by_gitaly(options)
cmd += %W[--count #{options[:ref]}] else
cmd += %W[-- #{options[:path]}] if options[:path].present? count_commits_by_shelling_out(options)
end
raw_output = IO.popen(cmd) { |io| io.read } end
raw_output.to_i
end end
def sha_from_ref(ref) def sha_from_ref(ref)
...@@ -1005,6 +1002,22 @@ module Gitlab ...@@ -1005,6 +1002,22 @@ module Gitlab
gitaly_ref_client.tags gitaly_ref_client.tags
end end
def count_commits_by_gitaly(options)
gitaly_commit_client.commit_count(options[:ref], options)
end
def count_commits_by_shelling_out(options)
cmd = %W[#{Gitlab.config.git.bin_path} --git-dir=#{path} rev-list]
cmd << "--after=#{options[:after].iso8601}" if options[:after]
cmd << "--before=#{options[:before].iso8601}" if options[:before]
cmd += %W[--count #{options[:ref]}]
cmd += %W[-- #{options[:path]}] if options[:path].present?
raw_output = IO.popen(cmd) { |io| io.read }
raw_output.to_i
end
def gitaly_migrate(method, &block) def gitaly_migrate(method, &block)
Gitlab::GitalyClient.migrate(method, &block) Gitlab::GitalyClient.migrate(method, &block)
rescue GRPC::NotFound => e rescue GRPC::NotFound => e
......
...@@ -85,11 +85,14 @@ module Gitlab ...@@ -85,11 +85,14 @@ module Gitlab
end end
end end
def commit_count(ref) def commit_count(ref, options = {})
request = Gitaly::CountCommitsRequest.new( request = Gitaly::CountCommitsRequest.new(
repository: @gitaly_repo, repository: @gitaly_repo,
revision: ref revision: ref
) )
request.after = Google::Protobuf::Timestamp.new(seconds: options[:after].to_i) if options[:after].present?
request.before = Google::Protobuf::Timestamp.new(seconds: options[:before].to_i) if options[:before].present?
request.path = options[:path] if options[:path].present?
GitalyClient.call(@repository.storage, :commit_service, :count_commits, request).count GitalyClient.call(@repository.storage, :commit_service, :count_commits, request).count
end end
......
...@@ -361,20 +361,20 @@ describe Gitlab::Git::Repository, seed_helper: true do ...@@ -361,20 +361,20 @@ describe Gitlab::Git::Repository, seed_helper: true do
end end
describe '#commit_count' do describe '#commit_count' do
shared_examples 'counting commits' do shared_examples 'simple commit counting' do
it { expect(repository.commit_count("master")).to eq(25) } it { expect(repository.commit_count("master")).to eq(25) }
it { expect(repository.commit_count("feature")).to eq(9) } it { expect(repository.commit_count("feature")).to eq(9) }
end end
context 'when Gitaly commit_count feature is enabled' do context 'when Gitaly commit_count feature is enabled' do
it_behaves_like 'counting commits' it_behaves_like 'simple commit counting'
it_behaves_like 'wrapping gRPC errors', Gitlab::GitalyClient::CommitService, :commit_count do it_behaves_like 'wrapping gRPC errors', Gitlab::GitalyClient::CommitService, :commit_count do
subject { repository.commit_count('master') } subject { repository.commit_count('master') }
end end
end end
context 'when Gitaly commit_count feature is disabled', skip_gitaly_mock: true do context 'when Gitaly commit_count feature is disabled', skip_gitaly_mock: true do
it_behaves_like 'counting commits' it_behaves_like 'simple commit counting'
end end
end end
...@@ -797,6 +797,7 @@ describe Gitlab::Git::Repository, seed_helper: true do ...@@ -797,6 +797,7 @@ describe Gitlab::Git::Repository, seed_helper: true do
end end
describe '#count_commits' do describe '#count_commits' do
shared_examples 'extended commit counting' do
context 'with after timestamp' do context 'with after timestamp' do
it 'returns the number of commits after timestamp' do it 'returns the number of commits after timestamp' do
options = { ref: 'master', limit: nil, after: Time.iso8601('2013-03-03T20:15:01+00:00') } options = { ref: 'master', limit: nil, after: Time.iso8601('2013-03-03T20:15:01+00:00') }
...@@ -806,7 +807,7 @@ describe Gitlab::Git::Repository, seed_helper: true do ...@@ -806,7 +807,7 @@ describe Gitlab::Git::Repository, seed_helper: true do
end end
context 'with before timestamp' do context 'with before timestamp' do
it 'returns the number of commits after timestamp' do it 'returns the number of commits before timestamp' do
options = { ref: 'feature', limit: nil, before: Time.iso8601('2015-03-03T20:15:01+00:00') } options = { ref: 'feature', limit: nil, before: Time.iso8601('2015-03-03T20:15:01+00:00') }
expect(repository.count_commits(options)).to eq(9) expect(repository.count_commits(options)).to eq(9)
...@@ -822,6 +823,15 @@ describe Gitlab::Git::Repository, seed_helper: true do ...@@ -822,6 +823,15 @@ describe Gitlab::Git::Repository, seed_helper: true do
end end
end end
context 'when Gitaly count_commits feature is enabled' do
it_behaves_like 'extended commit counting'
end
context 'when Gitaly count_commits feature is disabled', skip_gitaly_mock: true do
it_behaves_like 'extended commit counting'
end
end
describe "branch_names_contains" do describe "branch_names_contains" do
subject { repository.branch_names_contains(SeedRepo::LastCommit::ID) } subject { repository.branch_names_contains(SeedRepo::LastCommit::ID) }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment