restart from scratch

Author: wxiaoguang

modules/git/batch.go

@@ -6,8 +6,6 @@
 package git
 
 import (
-	"bufio"
-	"bytes"
 	"io"
 
 	"code.gitea.io/gitea/modules/log"
@@ -25,35 +23,27 @@ type Blob struct {
 
 // DataAsync gets a ReadCloser for the contents of a blob without reading it all.
 // Calling the Close function on the result will discard all unread output.
-func (b *Blob) DataAsync() (io.ReadCloser, error) {
-	wr, rd, cancel, err := b.repo.CatFileBatch(b.repo.Ctx)
+func (b *Blob) DataAsync() (_ io.ReadCloser, retErr error) {
+	batch, cancel, err := b.repo.CatFileBatch(b.repo.Ctx)
 	if err != nil {
 		return nil, err
 	}
+	defer func() {
+		if retErr != nil {
+			cancel()
+		}
+	}()
 
-	_, err = wr.Write([]byte(b.ID.String() + "\n"))
+	rd, err := batch.QueryContent(b.ID.String())
 	if err != nil {
-		cancel()
 		return nil, err
 	}
 	_, _, size, err := ReadBatchLine(rd)
 	if err != nil {
-		cancel()
 		return nil, err
 	}
 	b.gotSize = true
 	b.size = size
-
-	if size < 4096 {
-		bs, err := io.ReadAll(io.LimitReader(rd, size))
-		defer cancel()
-		if err != nil {
-			return nil, err
-		}
-		_, err = rd.Discard(1)
-		return io.NopCloser(bytes.NewReader(bs)), err
-	}
-
 	return &blobReader{
 		rd:     rd,
 		n:      size,
@@ -67,13 +57,13 @@ func (b *Blob) Size() int64 {
 		return b.size
 	}
 
-	wr, rd, cancel, err := b.repo.CatFileBatchCheck(b.repo.Ctx)
+	batch, cancel, err := b.repo.CatFileBatch(b.repo.Ctx)
 	if err != nil {
 		log.Debug("error whilst reading size for %s in %s. Error: %v", b.ID.String(), b.repo.Path, err)
 		return 0
 	}
 	defer cancel()
-	_, err = wr.Write([]byte(b.ID.String() + "\n"))
+	rd, err := batch.QueryInfo(b.ID.String())
 	if err != nil {
 		log.Debug("error whilst reading size for %s in %s. Error: %v", b.ID.String(), b.repo.Path, err)
 		return 0
@@ -85,12 +75,11 @@ func (b *Blob) Size() int64 {
 	}
 
 	b.gotSize = true
-
 	return b.size
 }
 
 type blobReader struct {
-	rd     *bufio.Reader
+	rd     BufferedReader
 	n      int64
 	cancel func()
 }

modules/git/blob_nogogit.go

@@ -0,0 +1,41 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package git
+
+import (
+	"context"
+	"io"
+)
+
+type BufferedReader interface {
+	io.Reader
+	Buffered() int
+	Peek(n int) ([]byte, error)
+	Discard(n int) (int, error)
+	ReadString(sep byte) (string, error)
+	ReadSlice(sep byte) ([]byte, error)
+	ReadBytes(sep byte) ([]byte, error)
+}
+
+type CatFileBatchContent interface {
+	QueryContent(obj string) (BufferedReader, error)
+}
+
+type CatFileBatchInfo interface {
+	QueryInfo(obj string) (BufferedReader, error)
+}
+
+type CatFileBatch interface {
+	CatFileBatchInfo
+	CatFileBatchContent
+}
+
+type CatFileBatchCloser interface {
+	CatFileBatch
+	Close()
+}
+
+func NewBatch(ctx context.Context, repoPath string) (CatFileBatchCloser, error) {
+	return newCatFileBatchLegacy(ctx, repoPath)
+}

modules/git/catfile_batch.go

@@ -0,0 +1,82 @@
+// Copyright 2024 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package git
+
+import (
+	"bufio"
+	"context"
+	"io"
+
+	"code.gitea.io/gitea/modules/git/gitcmd"
+)
+
+// catFileBatchLegacy implements the CatFileBatch interface using the "cat-file --batch" command and "cat-file --batch-check" command
+// for git version < 2.36
+// to align with "--batch-command", it creates the two commands for querying object contents and object info separately
+// ref: https://git-scm.com/docs/git-cat-file#Documentation/git-cat-file.txt---batch
+type catFileBatchLegacy struct {
+	ctx          context.Context
+	repoPath     string
+	batchContent *catFileBatchCommunicator
+	batchCheck   *catFileBatchCommunicator
+}
+
+var _ CatFileBatchCloser = (*catFileBatchLegacy)(nil)
+
+// newCatFileBatchLegacy creates a new batch and a new batch check for the given repository, the Close must be invoked before release the batch
+func newCatFileBatchLegacy(ctx context.Context, repoPath string) (*catFileBatchLegacy, error) {
+	if err := ensureValidGitRepository(ctx, repoPath); err != nil {
+		return nil, err
+	}
+
+	return &catFileBatchLegacy{
+		ctx:      ctx,
+		repoPath: repoPath,
+	}, nil
+}
+
+func (b *catFileBatchLegacy) getBatchContent() *catFileBatchCommunicator {
+	if b.batchContent != nil {
+		return b.batchContent
+	}
+	b.batchContent = newCatFileBatch(b.ctx, b.repoPath, gitcmd.NewCommand("cat-file", "--batch"))
+	return b.batchContent
+}
+
+func (b *catFileBatchLegacy) getBatchCheck() *catFileBatchCommunicator {
+	if b.batchCheck != nil {
+		return b.batchCheck
+	}
+	b.batchCheck = newCatFileBatch(b.ctx, b.repoPath, gitcmd.NewCommand("cat-file", "--batch-check"))
+	return b.batchCheck
+}
+
+func (b *catFileBatchLegacy) QueryContent(obj string) (BufferedReader, error) {
+	_, err := io.WriteString(b.getBatchContent().writer, obj+"\n")
+	return b.getBatchContent().reader, err
+}
+
+func (b *catFileBatchLegacy) ContentReader() *bufio.Reader {
+	return b.getBatchContent().reader
+}
+
+func (b *catFileBatchLegacy) QueryInfo(obj string) (BufferedReader, error) {
+	_, err := io.WriteString(b.getBatchCheck().writer, obj+"\n")
+	return b.getBatchCheck().reader, err
+}
+
+func (b *catFileBatchLegacy) InfoReader() *bufio.Reader {
+	return b.getBatchCheck().reader
+}
+
+func (b *catFileBatchLegacy) Close() {
+	if b.batchContent != nil {
+		b.batchContent.Close()
+		b.batchContent = nil
+	}
+	if b.batchCheck != nil {
+		b.batchCheck.Close()
+		b.batchCheck = nil
+	}
+}