update

Author: hiifong

modules/git/commit_reader.go

@@ -8,18 +8,31 @@ import (
 	"bytes"
 	"io"
 	"strings"
+	"sync"
 )
 
+var commitPool = sync.Pool{
+	New: func() any {
+		return &Commit{}
+	},
+}
+
 // CommitFromReader will generate a Commit from a provided reader
 // We need this to interpret commits from cat-file or cat-file --batch
 //
 // If used as part of a cat-file --batch stream you need to limit the reader to the correct size
 func CommitFromReader(gitRepo *Repository, objectID ObjectID, reader io.Reader) (*Commit, error) {
-	commit := &Commit{
-		ID:        objectID,
-		Author:    &Signature{},
-		Committer: &Signature{},
-	}
+	commit := commitPool.Get().(*Commit)
+	defer func() {
+		// Reset the commit for reuse
+		commit = commitPool.Get().(*Commit)
+		// Put it back in the pool
+		commitPool.Put(commit)
+	}()
+
+	commit.ID = objectID
+	commit.Author = &Signature{}
+	commit.Committer = &Signature{}
 
 	payloadSB := new(strings.Builder)
 	signatureSB := new(strings.Builder)

modules/git/last_commit_cache.go

@@ -6,19 +6,12 @@ package git
 import (
 	"crypto/sha256"
 	"fmt"
-	"sync"
 
 	"code.gitea.io/gitea/modules/cache"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 )
 
-var lastCommitPool = sync.Pool{
-	New: func() any {
-		return &Commit{}
-	},
-}
-
 func getCacheKey(repoPath, commitID, entryPath string) string {
 	hashBytes := sha256.Sum256([]byte(fmt.Sprintf("%s:%s:%s", repoPath, commitID, entryPath)))
 	return fmt.Sprintf("last_commit:%x", hashBytes)
@@ -65,25 +58,20 @@ func (c *LastCommitCache) Get(ref, entryPath string) (*Commit, error) {
 		return nil, nil
 	}
 
-	commit := lastCommitPool.Get().(*Commit)
-	defer lastCommitPool.Put(commit)
-	var err error
-	var ok bool
-
 	commitID, ok := c.cache.Get(getCacheKey(c.repoPath, ref, entryPath))
 	if !ok || commitID == "" {
 		return nil, nil
 	}
 
 	log.Debug("LastCommitCache hit level 1: [%s:%s:%s]", ref, entryPath, commitID)
 	if c.commitCache != nil {
-		if commit, ok = c.commitCache[commitID]; ok {
+		if commit, ok := c.commitCache[commitID]; ok {
 			log.Debug("LastCommitCache hit level 2: [%s:%s:%s]", ref, entryPath, commitID)
 			return commit, nil
 		}
 	}
 
-	commit, err = c.repo.GetCommit(commitID)
+	commit, err := c.repo.GetCommit(commitID)
 	if err != nil {
 		return nil, err
 	}