mirror of
				https://codeberg.org/forgejo/forgejo.git
				synced 2025-11-04 08:21:11 +00:00 
			
		
		
		
	- In Go 1.21 the crypto/sha256 [got a massive improvement](https://go.dev/doc/go1.21#crypto/sha256) by utilizing the SHA instructions for AMD64 CPUs, which sha256-simd already was doing. The performance is now on par and I think it's preferable to use the standard library rather than a package when possible. ``` cpu: AMD Ryzen 5 3600X 6-Core Processor │ simd.txt │ go.txt │ │ sec/op │ sec/op vs base │ Hash/8Bytes-12 63.25n ± 1% 73.38n ± 1% +16.02% (p=0.002 n=6) Hash/64Bytes-12 98.73n ± 1% 105.30n ± 1% +6.65% (p=0.002 n=6) Hash/1K-12 567.2n ± 1% 572.8n ± 1% +0.99% (p=0.002 n=6) Hash/8K-12 4.062µ ± 1% 4.062µ ± 1% ~ (p=0.396 n=6) Hash/1M-12 512.1µ ± 0% 510.6µ ± 1% ~ (p=0.485 n=6) Hash/5M-12 2.556m ± 1% 2.564m ± 0% ~ (p=0.093 n=6) Hash/10M-12 5.112m ± 0% 5.127m ± 0% ~ (p=0.093 n=6) geomean 13.82µ 14.27µ +3.28% │ simd.txt │ go.txt │ │ B/s │ B/s vs base │ Hash/8Bytes-12 120.6Mi ± 1% 104.0Mi ± 1% -13.81% (p=0.002 n=6) Hash/64Bytes-12 618.2Mi ± 1% 579.8Mi ± 1% -6.22% (p=0.002 n=6) Hash/1K-12 1.682Gi ± 1% 1.665Gi ± 1% -0.98% (p=0.002 n=6) Hash/8K-12 1.878Gi ± 1% 1.878Gi ± 1% ~ (p=0.310 n=6) Hash/1M-12 1.907Gi ± 0% 1.913Gi ± 1% ~ (p=0.485 n=6) Hash/5M-12 1.911Gi ± 1% 1.904Gi ± 0% ~ (p=0.093 n=6) Hash/10M-12 1.910Gi ± 0% 1.905Gi ± 0% ~ (p=0.093 n=6) geomean 1.066Gi 1.032Gi -3.18% ``` (cherry picked from commitabd94ff5b5) (cherry picked from commit15e81637ab) Conflicts: go.mod https://codeberg.org/forgejo/forgejo/pulls/1581 (cherry picked from commit 5caea2d75aeac78fb306f58a3cf7809d5b70c7f2) (cherry picked from commit08da542cce) (cherry picked from commitd71a8cc9fb)
		
			
				
	
	
		
			114 lines
		
	
	
	
		
			3.1 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			114 lines
		
	
	
	
		
			3.1 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
// Copyright 2020 The Gitea Authors. All rights reserved.
 | 
						|
// SPDX-License-Identifier: MIT
 | 
						|
 | 
						|
package git
 | 
						|
 | 
						|
import (
 | 
						|
	"crypto/sha256"
 | 
						|
	"fmt"
 | 
						|
 | 
						|
	"code.gitea.io/gitea/modules/log"
 | 
						|
	"code.gitea.io/gitea/modules/setting"
 | 
						|
)
 | 
						|
 | 
						|
// Cache represents a caching interface
 | 
						|
type Cache interface {
 | 
						|
	// Put puts value into cache with key and expire time.
 | 
						|
	Put(key string, val any, timeout int64) error
 | 
						|
	// Get gets cached value by given key.
 | 
						|
	Get(key string) any
 | 
						|
}
 | 
						|
 | 
						|
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)
 | 
						|
}
 | 
						|
 | 
						|
// LastCommitCache represents a cache to store last commit
 | 
						|
type LastCommitCache struct {
 | 
						|
	repoPath    string
 | 
						|
	ttl         func() int64
 | 
						|
	repo        *Repository
 | 
						|
	commitCache map[string]*Commit
 | 
						|
	cache       Cache
 | 
						|
}
 | 
						|
 | 
						|
// NewLastCommitCache creates a new last commit cache for repo
 | 
						|
func NewLastCommitCache(count int64, repoPath string, gitRepo *Repository, cache Cache) *LastCommitCache {
 | 
						|
	if cache == nil {
 | 
						|
		return nil
 | 
						|
	}
 | 
						|
	if !setting.CacheService.LastCommit.Enabled || count < setting.CacheService.LastCommit.CommitsCount {
 | 
						|
		return nil
 | 
						|
	}
 | 
						|
 | 
						|
	return &LastCommitCache{
 | 
						|
		repoPath: repoPath,
 | 
						|
		repo:     gitRepo,
 | 
						|
		ttl:      setting.LastCommitCacheTTLSeconds,
 | 
						|
		cache:    cache,
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
// Put put the last commit id with commit and entry path
 | 
						|
func (c *LastCommitCache) Put(ref, entryPath, commitID string) error {
 | 
						|
	if c == nil || c.cache == nil {
 | 
						|
		return nil
 | 
						|
	}
 | 
						|
	log.Debug("LastCommitCache save: [%s:%s:%s]", ref, entryPath, commitID)
 | 
						|
	return c.cache.Put(getCacheKey(c.repoPath, ref, entryPath), commitID, c.ttl())
 | 
						|
}
 | 
						|
 | 
						|
// Get gets the last commit information by commit id and entry path
 | 
						|
func (c *LastCommitCache) Get(ref, entryPath string) (*Commit, error) {
 | 
						|
	if c == nil || c.cache == nil {
 | 
						|
		return nil, nil
 | 
						|
	}
 | 
						|
 | 
						|
	commitID, ok := c.cache.Get(getCacheKey(c.repoPath, ref, entryPath)).(string)
 | 
						|
	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 {
 | 
						|
			log.Debug("LastCommitCache hit level 2: [%s:%s:%s]", ref, entryPath, commitID)
 | 
						|
			return commit, nil
 | 
						|
		}
 | 
						|
	}
 | 
						|
 | 
						|
	commit, err := c.repo.GetCommit(commitID)
 | 
						|
	if err != nil {
 | 
						|
		return nil, err
 | 
						|
	}
 | 
						|
	if c.commitCache == nil {
 | 
						|
		c.commitCache = make(map[string]*Commit)
 | 
						|
	}
 | 
						|
	c.commitCache[commitID] = commit
 | 
						|
	return commit, nil
 | 
						|
}
 | 
						|
 | 
						|
// GetCommitByPath gets the last commit for the entry in the provided commit
 | 
						|
func (c *LastCommitCache) GetCommitByPath(commitID, entryPath string) (*Commit, error) {
 | 
						|
	sha1, err := NewIDFromString(commitID)
 | 
						|
	if err != nil {
 | 
						|
		return nil, err
 | 
						|
	}
 | 
						|
 | 
						|
	lastCommit, err := c.Get(sha1.String(), entryPath)
 | 
						|
	if err != nil || lastCommit != nil {
 | 
						|
		return lastCommit, err
 | 
						|
	}
 | 
						|
 | 
						|
	lastCommit, err = c.repo.getCommitByPathWithID(sha1, entryPath)
 | 
						|
	if err != nil {
 | 
						|
		return nil, err
 | 
						|
	}
 | 
						|
 | 
						|
	if err := c.Put(commitID, entryPath, lastCommit.ID.String()); err != nil {
 | 
						|
		log.Error("Unable to cache %s as the last commit for %q in %s %s. Error %v", lastCommit.ID.String(), entryPath, commitID, c.repoPath, err)
 | 
						|
	}
 | 
						|
 | 
						|
	return lastCommit, nil
 | 
						|
}
 |