Commit 00ce8756 authored by Kim "BKC" Carlbäcker's avatar Kim "BKC" Carlbäcker

Migrate GitLab::Git::Wiki.update_page to Gitaly

parent a845cf24
...@@ -48,11 +48,14 @@ module Gitlab ...@@ -48,11 +48,14 @@ module Gitlab
end end
def update_page(page_path, title, format, content, commit_details) def update_page(page_path, title, format, content, commit_details)
assert_type!(format, Symbol) @repository.gitaly_migrate(:wiki_update_page) do |is_enabled|
assert_type!(commit_details, CommitDetails) if is_enabled
gitaly_update_page(page_path, title, format, content, commit_details)
gollum_wiki.update_page(gollum_page_by_path(page_path), title, format, content, commit_details.to_h) gollum_wiki.clear_cache
nil else
gollum_update_page(page_path, title, format, content, commit_details)
end
end
end end
def pages def pages
...@@ -149,6 +152,14 @@ module Gitlab ...@@ -149,6 +152,14 @@ module Gitlab
nil nil
end end
def gollum_update_page(page_path, title, format, content, commit_details)
assert_type!(format, Symbol)
assert_type!(commit_details, CommitDetails)
gollum_wiki.update_page(gollum_page_by_path(page_path), title, format, content, commit_details.to_h)
nil
end
def gollum_find_page(title:, version: nil, dir: nil) def gollum_find_page(title:, version: nil, dir: nil)
if version if version
version = Gitlab::Git::Commit.find(@repository, version).id version = Gitlab::Git::Commit.find(@repository, version).id
...@@ -172,6 +183,10 @@ module Gitlab ...@@ -172,6 +183,10 @@ module Gitlab
gitaly_wiki_client.write_page(name, format, content, commit_details) gitaly_wiki_client.write_page(name, format, content, commit_details)
end end
def gitaly_update_page(page_path, title, format, content, commit_details)
gitaly_wiki_client.update_page(page_path, title, format, content, commit_details)
end
def gitaly_delete_page(page_path, commit_details) def gitaly_delete_page(page_path, commit_details)
gitaly_wiki_client.delete_page(page_path, commit_details) gitaly_wiki_client.delete_page(page_path, commit_details)
end end
......
...@@ -37,6 +37,31 @@ module Gitlab ...@@ -37,6 +37,31 @@ module Gitlab
end end
end end
def update_page(page_path, title, format, content, commit_details)
request = Gitaly::WikiUpdatePageRequest.new(
repository: @gitaly_repo,
page_path: GitalyClient.encode(page_path),
title: GitalyClient.encode(title),
format: format.to_s,
commit_details: gitaly_commit_details(commit_details)
)
strio = StringIO.new(content)
enum = Enumerator.new do |y|
until strio.eof?
chunk = strio.read(MAX_MSG_SIZE)
request.content = GitalyClient.encode(chunk)
y.yield request
request = Gitaly::WikiUpdatePageRequest.new
end
end
GitalyClient.call(@repository.storage, :wiki_service, :wiki_update_page, enum)
end
def delete_page(page_path, commit_details) def delete_page(page_path, commit_details)
request = Gitaly::WikiDeletePageRequest.new( request = Gitaly::WikiDeletePageRequest.new(
repository: @gitaly_repo, repository: @gitaly_repo,
......
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