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

4 files changed, 44 insertions, 2 deletions

diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index 10ba29acbd1..616b075c087 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -386,7 +386,13 @@ module Gitlab
         options[:limit] ||= 0
         options[:offset] ||= 0
 
-        raw_log(options).map { |c| Commit.decorate(self, c) }
+        gitaly_migrate(:find_commits) do |is_enabled|
+          if is_enabled
+            gitaly_commit_client.find_commits(options)
+          else
+            raw_log(options).map { |c| Commit.decorate(self, c) }
+          end
+        end
       end
 
       # Used in gitaly-ruby
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb
index cbd9ff406de..955d2307f88 100644
--- a/lib/gitlab/gitaly_client.rb
+++ b/lib/gitlab/gitaly_client.rb
@@ -228,10 +228,18 @@ module Gitlab
       path.read.chomp
     end
 
+    def self.timestamp(t)
+      Google::Protobuf::Timestamp.new(seconds: t.to_i)
+    end
+
     def self.encode(s)
       s.dup.force_encoding(Encoding::ASCII_8BIT)
     end
 
+    def self.encode_repeated(a)
+      Google::Protobuf::RepeatedField.new(:bytes, a.map { |s| self.encode(s) } )
+    end
+
     # Count a stack. Used for n+1 detection
     def self.count_stack
       return unless RequestStore.active?
diff --git a/lib/gitlab/gitaly_client/commit_service.rb b/lib/gitlab/gitaly_client/commit_service.rb
index cf3a3554552..36da63fd586 100644
--- a/lib/gitlab/gitaly_client/commit_service.rb
+++ b/lib/gitlab/gitaly_client/commit_service.rb
@@ -230,6 +230,26 @@ module Gitlab
         GitalyClient.call(@repository.storage, :commit_service, :commit_stats, request)
       end
 
+      def find_commits(options)
+        request = Gitaly::FindCommitsRequest.new(
+          repository:   @gitaly_repo,
+          limit:        options[:limit],
+          offset:       options[:offset],
+          follow:       options[:follow],
+          skip_merges:  options[:skip_merges],
+          disable_walk: options[:disable_walk]
+        )
+        request.after    = GitalyClient.timestamp(options[:after]) if options[:after]
+        request.before   = GitalyClient.timestamp(options[:before]) if options[:before]
+        request.revision = GitalyClient.encode(options[:ref]) if options[:ref]
+
+        request.paths = GitalyClient.encode_repeated(Array(options[:path])) if options[:path].present?
+
+        response = GitalyClient.call(@repository.storage, :commit_service, :find_commits, request)
+
+        consume_commits_response(response)
+      end
+
       private
 
       def call_commit_diff(request_params, options = {})
diff --git a/spec/lib/gitlab/git/commit_spec.rb b/spec/lib/gitlab/git/commit_spec.rb
index 46e968cc398..a3dff6d0d4b 100644
--- a/spec/lib/gitlab/git/commit_spec.rb
+++ b/spec/lib/gitlab/git/commit_spec.rb
@@ -181,7 +181,7 @@ describe Gitlab::Git::Commit, seed_helper: true do
       end
     end
 
-    describe '.where' do
+    shared_examples '.where' do
       context 'path is empty string' do
         subject do
           commits = described_class.where(
@@ -279,6 +279,14 @@ describe Gitlab::Git::Commit, seed_helper: true do
       end
     end
 
+    describe '.where with gitaly' do
+      it_should_behave_like '.where'
+    end
+
+    describe '.where without gitaly', skip_gitaly_mock: true do
+      it_should_behave_like '.where'
+    end
+
     describe '.between' do
       subject do
         commits = described_class.between(repository, SeedRepo::Commit::PARENT_ID, SeedRepo::Commit::ID)