Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Fargher <jfargher@gitlab.com>2023-07-13 00:23:15 +0300
committerJames Fargher <jfargher@gitlab.com>2023-07-13 00:25:55 +0300
commit6bf497fc3f962f392638fedb10f36d8170cf0e83 (patch)
treeade66fc821164e830439c9dac1dd427686bb5713
parentaccf7121bc9c2da9a2ebd9876c5697dead38c8ee (diff)
backup: Move createBundleFromRefListSender type
This type is used to send refs to the CreateBundleFromRefList RPC. Now that backup.Repository is extracted it should be moved closer to where it is used.
-rw-r--r--internal/backup/backup.go23
-rw-r--r--internal/backup/repository.go23
2 files changed, 23 insertions, 23 deletions
diff --git a/internal/backup/backup.go b/internal/backup/backup.go
index c06a17110..35321ef1c 100644
--- a/internal/backup/backup.go
+++ b/internal/backup/backup.go
@@ -14,7 +14,6 @@ import (
"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage"
"gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/transaction"
"gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"
- "google.golang.org/protobuf/proto"
)
var (
@@ -437,28 +436,6 @@ func (mgr *Manager) negatedKnownRefs(ctx context.Context, step *Step) (io.ReadCl
return r, nil
}
-type createBundleFromRefListSender struct {
- stream gitalypb.RepositoryService_CreateBundleFromRefListClient
- chunk gitalypb.CreateBundleFromRefListRequest
-}
-
-// Reset should create a fresh response message.
-func (s *createBundleFromRefListSender) Reset() {
- s.chunk = gitalypb.CreateBundleFromRefListRequest{}
-}
-
-// Append should append the given item to the slice in the current response message
-func (s *createBundleFromRefListSender) Append(msg proto.Message) {
- req := msg.(*gitalypb.CreateBundleFromRefListRequest)
- s.chunk.Repository = req.GetRepository()
- s.chunk.Patterns = append(s.chunk.Patterns, req.Patterns...)
-}
-
-// Send should send the current response message
-func (s *createBundleFromRefListSender) Send() error {
- return s.stream.Send(&s.chunk)
-}
-
func (mgr *Manager) restoreBundle(ctx context.Context, repo Repository, path string) error {
reader, err := mgr.sink.GetReader(ctx, path)
if err != nil {
diff --git a/internal/backup/repository.go b/internal/backup/repository.go
index 6732edb21..942e5b5dd 100644
--- a/internal/backup/repository.go
+++ b/internal/backup/repository.go
@@ -20,6 +20,7 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
+ "google.golang.org/protobuf/proto"
)
// remoteRepository implements git repository access over GRPC
@@ -149,6 +150,28 @@ func (rr *remoteRepository) CreateBundle(ctx context.Context, out io.Writer, pat
return nil
}
+type createBundleFromRefListSender struct {
+ stream gitalypb.RepositoryService_CreateBundleFromRefListClient
+ chunk gitalypb.CreateBundleFromRefListRequest
+}
+
+// Reset should create a fresh response message.
+func (s *createBundleFromRefListSender) Reset() {
+ s.chunk = gitalypb.CreateBundleFromRefListRequest{}
+}
+
+// Append should append the given item to the slice in the current response message
+func (s *createBundleFromRefListSender) Append(msg proto.Message) {
+ req := msg.(*gitalypb.CreateBundleFromRefListRequest)
+ s.chunk.Repository = req.GetRepository()
+ s.chunk.Patterns = append(s.chunk.Patterns, req.Patterns...)
+}
+
+// Send should send the current response message
+func (s *createBundleFromRefListSender) Send() error {
+ return s.stream.Send(&s.chunk)
+}
+
// Remove removes the repository. Does not return an error if the repository
// cannot be found.
func (rr *remoteRepository) Remove(ctx context.Context) error {