Add different key prefix for refs and commits

Author: lafriks

models/repo.go

@@ -259,8 +259,14 @@ func (repo *Repository) APIFormat(mode AccessMode) *api.Repository {
 }
 
 // GetCommitsCountCacheKey returns cache key used for commits count caching.
-func (repo *Repository) GetCommitsCountCacheKey(contextName string) string {
-	return fmt.Sprintf("commits-count-%d-%s", repo.ID, contextName)
+func (repo *Repository) GetCommitsCountCacheKey(contextName string, isRef bool) string {
+	var prefix string
+	if isRef {
+		prefix = "ref"
+	} else {
+		prefix = "commit"
+	}
+	return fmt.Sprintf("commits-count-%d-%s-%s", repo.ID, prefix, contextName)
 }
 
 func (repo *Repository) innerAPIFormat(mode AccessMode, isParent bool) *api.Repository {

models/update.go

@@ -213,7 +213,7 @@ func pushUpdate(opts PushUpdateOptions) (repo *Repository, err error) {
 			}
 		} else {
 			// Clear cache for tag commit count
-			cache.Remove(repo.GetCommitsCountCacheKey(tagName))
+			cache.Remove(repo.GetCommitsCountCacheKey(tagName, true))
 			err = pushUpdateAddTag(repo, gitRepo, tagName)
 			if err != nil {
 				return nil, fmt.Errorf("pushUpdateAddTag: %v", err)
@@ -223,7 +223,7 @@ func pushUpdate(opts PushUpdateOptions) (repo *Repository, err error) {
 		// If is branch reference
 
 		// Clear cache for branch commit count
-		cache.Remove(repo.GetCommitsCountCacheKey(opts.RefFullName[len(git.BranchPrefix):]))
+		cache.Remove(repo.GetCommitsCountCacheKey(opts.RefFullName[len(git.BranchPrefix):], true))
 
 		newCommit, err := gitRepo.GetCommit(opts.NewCommitID)
 		if err != nil {

modules/context/repo.go

@@ -112,7 +112,7 @@ func (r *Repository) GetCommitsCount() (int64, error) {
 	} else {
 		contextName = r.CommitID
 	}
-	return cache.GetInt64(r.Repository.GetCommitsCountCacheKey(contextName), func() (int64, error) {
+	return cache.GetInt64(r.Repository.GetCommitsCountCacheKey(contextName, r.IsViewBranch || r.IsViewTag), func() (int64, error) {
 		return r.Commit.CommitsCount()
 	})
 }