From 3daedb3877580e5952d8189bc7a762ff0c426171 Mon Sep 17 00:00:00 2001 From: Lauris BH Date: Mon, 6 Jul 2020 11:51:45 +0300 Subject: [PATCH] Use hash of repo path, ref and entrypath as cache key (#12151) (#12161) --- modules/cache/last_commit.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/cache/last_commit.go b/modules/cache/last_commit.go index 4f17cd8fa5..660a9250d6 100644 --- a/modules/cache/last_commit.go +++ b/modules/cache/last_commit.go @@ -5,6 +5,7 @@ package cache import ( + "crypto/sha256" "fmt" "code.gitea.io/gitea/modules/git" @@ -34,9 +35,14 @@ func NewLastCommitCache(repoPath string, gitRepo *git.Repository, ttl int64) *La } } +func (c LastCommitCache) getCacheKey(repoPath, ref, entryPath string) string { + hashBytes := sha256.Sum256([]byte(fmt.Sprintf("%s:%s:%s", repoPath, ref, entryPath))) + return fmt.Sprintf("last_commit:%x", hashBytes) +} + // Get get the last commit information by commit id and entry path func (c LastCommitCache) Get(ref, entryPath string) (*object.Commit, error) { - v := c.Cache.Get(fmt.Sprintf("last_commit:%s:%s:%s", c.repoPath, ref, entryPath)) + v := c.Cache.Get(c.getCacheKey(c.repoPath, ref, entryPath)) if vs, ok := v.(string); ok { log.Trace("LastCommitCache hit level 1: [%s:%s:%s]", ref, entryPath, vs) if commit, ok := c.commitCache[vs]; ok { @@ -60,5 +66,5 @@ func (c LastCommitCache) Get(ref, entryPath string) (*object.Commit, error) { // Put put the last commit id with commit and entry path func (c LastCommitCache) Put(ref, entryPath, commitID string) error { log.Trace("LastCommitCache save: [%s:%s:%s]", ref, entryPath, commitID) - return c.Cache.Put(fmt.Sprintf("last_commit:%s:%s:%s", c.repoPath, ref, entryPath), commitID, c.ttl) + return c.Cache.Put(c.getCacheKey(c.repoPath, ref, entryPath), commitID, c.ttl) }