Simplify last commit cache

Author: lafriks

custom/conf/app.ini.sample

@@ -43,7 +43,7 @@ DEFAULT_CLOSE_ISSUES_VIA_COMMITS_IN_ANY_BRANCH = false
 ENABLE_PUSH_CREATE_USER = false
 ENABLE_PUSH_CREATE_ORG = false
 ; Comma separated list of globally disabled repo units. Allowed values: repo.issues, repo.ext_issues, repo.pulls, repo.wiki, repo.ext_wiki
-DISABLED_REPO_UNITS = 
+DISABLED_REPO_UNITS =
 ; Comma separated list of default repo units. Allowed values: repo.code, repo.releases, repo.issues, repo.pulls, repo.wiki.
 ; Note: Code and Releases can currently not be deactivated. If you specify default repo units you should still list them for future compatibility.
 ; External wiki and issue tracker can't be enabled by default as it requires additional settings.
@@ -632,8 +632,6 @@ SENDMAIL_PATH = sendmail
 SENDMAIL_ARGS =
 
 [cache]
-; if the cache enabled
-ENABLED = true
 ; Either "memory", "redis", or "memcache", default is "memory"
 ADAPTER = memory
 ; For "memory" only, GC interval in seconds, default is 60
@@ -648,18 +646,6 @@ ITEM_TTL = 16h
 
 ; Last commit cache
 [cache.last_commit]
-; if the cache enabled
-ENABLED = true
-; if use the default cache, by pass all the next options
-USE_SEPERATE_CACHE = false
-; Either "memory", "redis", or "memcache", default is "memory"
-ADAPTER = memory
-; For "memory" only, GC interval in seconds, default is 60
-INTERVAL = 60
-; For "redis" and "memcache", connection host address
-; redis: network=tcp,addr=:6379,password=macaron,db=0,pool_size=100,idle_timeout=180
-; memcache: `127.0.0.1:11211`
-HOST =
 ; Time to keep items in cache if not used, default is 16 hours.
 ; Setting it to 0 disables caching
 ITEM_TTL = 16h

docs/content/doc/advanced/config-cheat-sheet.en-us.md

@@ -383,7 +383,6 @@ relation to port exhaustion.
 
 ## Cache (`cache`)
 
-- `ENABLED`: **true**: Enable the cache.
 - `ADAPTER`: **memory**: Cache engine adapter, either `memory`, `redis`, or `memcache`.
 - `INTERVAL`: **60**: Garbage Collection interval (sec), for memory cache only.
 - `HOST`: **\<empty\>**: Connection string for `redis` and `memcache`.
@@ -393,13 +392,6 @@ relation to port exhaustion.
 
 ## Cache - LastCommitCache settings (`cache.last_commit`)
 
-- `ENABLED`: **true**: Enable the cache.
-- `USE_SEPERATE_CACHE`: **false** If use a seperate cache setting, `false` will bypass all the next options.
-- `ADAPTER`: **memory**: Cache engine adapter, either `memory`, `redis`, or `memcache`.
-- `INTERVAL`: **60**: Garbage Collection interval (sec), for memory cache only.
-- `HOST`: **\<empty\>**: Connection string for `redis` and `memcache`.
-   - Redis: `network=tcp,addr=127.0.0.1:6379,password=macaron,db=0,pool_size=100,idle_timeout=180`
-   - Memcache: `127.0.0.1:9090;127.0.0.1:9091`
 - `ITEM_TTL`: **16h**: Time to keep items in cache if not used, Setting it to 0 disables caching.
 - `COMMITS_COUNT`: **1000**: Only enable the cache when repository's commits count great than.
 

docs/content/doc/advanced/config-cheat-sheet.zh-cn.md

@@ -148,7 +148,6 @@ menu:
 
 ## Cache (`cache`)
 
-- `ENABLED`: **true**: 是否启用。
 - `ADAPTER`: **memory**: 缓存引擎，可以为 `memory`, `redis` 或 `memcache`。
 - `INTERVAL`: **60**: 只对内存缓存有效，GC间隔，单位秒。
 - `HOST`: **\<empty\>**: 针对redis和memcache有效，主机地址和端口。
@@ -158,13 +157,6 @@ menu:
 
 ## Cache - LastCommitCache settings (`cache.last_commit`)
 
-- `ENABLED`: **true**: 是否启用。
-- `USE_SEPERATE_CACHE`: **false** 是否启用独立的Cache设置，如果为否，则以下的Cache设置无效。
-- `ADAPTER`: **memory**: 缓存引擎，可以为 `memory`, `redis` 或 `memcache`。
-- `INTERVAL`: **60**: 只对内存缓存有效，GC间隔，单位秒。
-- `HOST`: **\<empty\>**: 针对redis和memcache有效，主机地址和端口。
-    - Redis: `network=tcp,addr=127.0.0.1:6379,password=macaron,db=0,pool_size=100,idle_timeout=180`
-    - Memache: `127.0.0.1:9090;127.0.0.1:9091`
 - `ITEM_TTL`: **86400h**: 缓存项目失效时间，设置为 0 则禁用缓存。
 - `COMMITS_COUNT`: **1000**: 仅当仓库的提交数大于时才启用缓存。
 

modules/cache/cache.go

@@ -17,8 +17,7 @@ import (
 )
 
 var (
-	conn            mc.Cache
-	lastCommitCache mc.Cache
+	conn mc.Cache
 )
 
 func newCache(cacheConfig setting.Cache) (mc.Cache, error) {
@@ -33,18 +32,12 @@ func newCache(cacheConfig setting.Cache) (mc.Cache, error) {
 func NewContext() error {
 	var err error
 
-	if conn == nil && setting.CacheService.Enabled {
+	if conn == nil && setting.CacheService.TTL > 0 {
 		if conn, err = newCache(setting.CacheService.Cache); err != nil {
 			return err
 		}
 	}
 
-	if lastCommitCache == nil && setting.CacheService.LastCommit.Enabled {
-		if lastCommitCache, err = newCache(setting.CacheService.LastCommit.Cache); err != nil {
-			return err
-		}
-	}
-
 	return err
 }
 

modules/cache/last_commit.go

@@ -30,13 +30,13 @@ func NewLastCommitCache(repoPath string, gitRepo *git.Repository, ttl int64) *La
 		repo:        gitRepo,
 		commitCache: make(map[string]*object.Commit),
 		ttl:         ttl,
-		Cache:       lastCommitCache,
+		Cache:       conn,
 	}
 }
 
 // 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("%s:%s:%s", c.repoPath, ref, entryPath))
+	v := c.Cache.Get(fmt.Sprintf("lastcommit:%s:%s:%s", 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 +60,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("%s:%s:%s", c.repoPath, ref, entryPath), commitID, c.ttl)
+	return c.Cache.Put(fmt.Sprintf("lastcommit:%s:%s:%s", c.repoPath, ref, entryPath), commitID, c.ttl)
 }

modules/setting/cache.go

@@ -13,7 +13,6 @@ import (
 
 // Cache represents cache settings
 type Cache struct {
-	Enabled  bool
 	Adapter  string
 	Interval int
 	Conn     string
@@ -26,30 +25,21 @@ var (
 		Cache
 
 		LastCommit struct {
-			Cache
-			UseSeperateCache bool
-			CommitsCount     int64
+			TTL          time.Duration `ini:"ITEM_TTL"`
+			CommitsCount int64
 		} `ini:"cache.last_commit"`
 	}{
 		Cache: Cache{
-			Enabled:  true,
 			Adapter:  "memory",
 			Interval: 60,
 			TTL:      16 * time.Hour,
 		},
 		LastCommit: struct {
-			Cache
-			UseSeperateCache bool
-			CommitsCount     int64
+			TTL          time.Duration `ini:"ITEM_TTL"`
+			CommitsCount int64
 		}{
-			Cache: Cache{
-				Enabled:  true,
-				Adapter:  "memory",
-				Interval: 60,
-				TTL:      86400 * time.Hour,
-			},
-			UseSeperateCache: false,
-			CommitsCount:     1000,
+			TTL:          16 * time.Hour,
+			CommitsCount: 1000,
 		},
 	}
 )
@@ -66,34 +56,23 @@ func newCacheService() {
 	case "redis", "memcache":
 		CacheService.Conn = strings.Trim(sec.Key("HOST").String(), "\" ")
 	case "": // disable cache
-		CacheService.Enabled = false
+		CacheService.TTL = 0
 	default:
 		log.Fatal("Unknown cache adapter: %s", CacheService.Adapter)
 	}
 
-	if CacheService.Enabled {
+	if CacheService.TTL > 0 {
 		log.Info("Cache Service Enabled")
 	}
 
 	sec = Cfg.Section("cache.last_commit")
-	if !CacheService.LastCommit.UseSeperateCache {
-		CacheService.LastCommit.Cache = CacheService.Cache
-	} else {
-		CacheService.LastCommit.Adapter = sec.Key("ADAPTER").In("memory", []string{"memory", "redis", "memcache"})
-		switch CacheService.LastCommit.Adapter {
-		case "memory":
-		case "redis", "memcache":
-			CacheService.LastCommit.Conn = strings.Trim(sec.Key("HOST").String(), "\" ")
-		case "": // disable cache
-			CacheService.LastCommit.Enabled = false
-		default:
-			log.Fatal("Unknown cache.last_commit adapter: %s", CacheService.LastCommit.Adapter)
-		}
+	if CacheService.TTL == 0 {
+		CacheService.LastCommit.TTL = 0
 	}
 
 	CacheService.LastCommit.CommitsCount = sec.Key("COMMITS_COUNT").MustInt64(1000)
 
-	if CacheService.LastCommit.Enabled {
+	if CacheService.LastCommit.TTL > 0 {
 		log.Info("Last Commit Cache Service Enabled")
 	}
 }

routers/repo/view.go

@@ -51,7 +51,7 @@ func renderDirectory(ctx *context.Context, treeLink string) {
 	entries.CustomSort(base.NaturalSortLess)
 
 	var c git.LastCommitCache
-	if setting.CacheService.LastCommit.Enabled && ctx.Repo.CommitsCount >= setting.CacheService.LastCommit.CommitsCount {
+	if setting.CacheService.LastCommit.TTL > 0 && ctx.Repo.CommitsCount >= setting.CacheService.LastCommit.CommitsCount {
 		c = cache.NewLastCommitCache(ctx.Repo.Repository.FullName(), ctx.Repo.GitRepo, int64(setting.CacheService.LastCommit.TTL.Seconds()))
 	}