Use a batch interface for gitrepo cat file

Author: lunny

modules/git/batch.go

@@ -10,8 +10,8 @@ import (
 
 type Batch struct {
 	cancel context.CancelFunc
-	Reader *bufio.Reader
-	Writer WriteCloserError
+	reader *bufio.Reader
+	writer WriteCloserError
 }
 
 // NewBatch creates a new batch for the given repository, the Close must be invoked before release the batch
@@ -22,7 +22,7 @@ func NewBatch(ctx context.Context, repoPath string) (*Batch, error) {
 	}
 
 	var batch Batch
-	batch.Writer, batch.Reader, batch.cancel = catFileBatch(ctx, repoPath)
+	batch.writer, batch.reader, batch.cancel = catFileBatch(ctx, repoPath)
 	return &batch, nil
 }
 
@@ -33,15 +33,23 @@ func NewBatchCheck(ctx context.Context, repoPath string) (*Batch, error) {
 	}
 
 	var check Batch
-	check.Writer, check.Reader, check.cancel = catFileBatchCheck(ctx, repoPath)
+	check.writer, check.reader, check.cancel = catFileBatchCheck(ctx, repoPath)
 	return &check, nil
 }
 
+func (b *Batch) Reader() *bufio.Reader {
+	return b.reader
+}
+
+func (b *Batch) Writer() WriteCloserError {
+	return b.writer
+}
+
 func (b *Batch) Close() {
 	if b.cancel != nil {
 		b.cancel()
-		b.Reader = nil
-		b.Writer = nil
+		b.reader = nil
+		b.writer = nil
 		b.cancel = nil
 	}
 }

modules/git/repo_base_nogogit.go

@@ -68,7 +68,7 @@ func (repo *Repository) CatFileBatch(ctx context.Context) (WriteCloserError, *bu
 
 	if !repo.batchInUse {
 		repo.batchInUse = true
-		return repo.batch.Writer, repo.batch.Reader, func() {
+		return repo.batch.writer, repo.batch.reader, func() {
 			repo.batchInUse = false
 		}, nil
 	}
@@ -78,7 +78,7 @@ func (repo *Repository) CatFileBatch(ctx context.Context) (WriteCloserError, *bu
 	if err != nil {
 		return nil, nil, nil, err
 	}
-	return tempBatch.Writer, tempBatch.Reader, tempBatch.Close, nil
+	return tempBatch.writer, tempBatch.reader, tempBatch.Close, nil
 }
 
 // CatFileBatchCheck obtains a CatFileBatchCheck for this repository
@@ -93,7 +93,7 @@ func (repo *Repository) CatFileBatchCheck(ctx context.Context) (WriteCloserError
 
 	if !repo.checkInUse {
 		repo.checkInUse = true
-		return repo.check.Writer, repo.check.Reader, func() {
+		return repo.check.writer, repo.check.reader, func() {
 			repo.checkInUse = false
 		}, nil
 	}
@@ -103,7 +103,7 @@ func (repo *Repository) CatFileBatchCheck(ctx context.Context) (WriteCloserError
 	if err != nil {
 		return nil, nil, nil, err
 	}
-	return tempBatchCheck.Writer, tempBatchCheck.Reader, tempBatchCheck.Close, nil
+	return tempBatchCheck.writer, tempBatchCheck.reader, tempBatchCheck.Close, nil
 }
 
 func (repo *Repository) Close() error {

modules/gitrepo/cat_file.go

@@ -4,11 +4,18 @@
 package gitrepo
 
 import (
+	"bufio"
 	"context"
 
 	"code.gitea.io/gitea/modules/git"
 )
 
-func NewBatch(ctx context.Context, repo Repository) (*git.Batch, error) {
+type Batch interface {
+	Reader() *bufio.Reader
+	Writer() git.WriteCloserError
+	Close()
+}
+
+func NewBatch(ctx context.Context, repo Repository) (Batch, error) {
 	return git.NewBatch(ctx, repoPath(repo))
 }

modules/indexer/code/bleve/bleve.go

@@ -225,7 +225,7 @@ func (b *Indexer) Index(ctx context.Context, repo *repo_model.Repository, sha st
 		defer gitBatch.Close()
 
 		for _, update := range changes.Updates {
-			if err := b.addUpdate(ctx, gitBatch.Writer, gitBatch.Reader, sha, update, repo, batch); err != nil {
+			if err := b.addUpdate(ctx, gitBatch.Writer(), gitBatch.Reader(), sha, update, repo, batch); err != nil {
 				return err
 			}
 		}

modules/indexer/code/elasticsearch/elasticsearch.go

@@ -217,7 +217,7 @@ func (b *Indexer) Index(ctx context.Context, repo *repo_model.Repository, sha st
 		defer batch.Close()
 
 		for _, update := range changes.Updates {
-			updateReqs, err := b.addUpdate(ctx, batch.Writer, batch.Reader, sha, update, repo)
+			updateReqs, err := b.addUpdate(ctx, batch.Writer(), batch.Reader(), sha, update, repo)
 			if err != nil {
 				return err
 			}