reduce indentation level in Get functions

go-pkgz · May 11, 2020 · f7a20de · f7a20de
1 parent 791f17b
commit f7a20de
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 23 deletions.
diff --git a/expirable_cache.go b/expirable_cache.go
@@ -68,17 +68,20 @@ func (c *ExpirableCache) Get(key string, fn func() (Value, error)) (data Value,
 	}
 	atomic.AddInt64(&c.Misses, 1)
 
-	if c.allowed(key, data) {
-		if s, ok := data.(Sizer); ok {
-			if c.maxCacheSize > 0 && atomic.LoadInt64(&c.currentSize)+int64(s.Size()) >= c.maxCacheSize {
-				c.backend.DeleteExpired()
-				return data, nil
-			}
-			atomic.AddInt64(&c.currentSize, int64(s.Size()))
+	if !c.allowed(key, data) {
+		return data, nil
+	}
+
+	if s, ok := data.(Sizer); ok {
+		if c.maxCacheSize > 0 && atomic.LoadInt64(&c.currentSize)+int64(s.Size()) >= c.maxCacheSize {
+			c.backend.DeleteExpired()
+			return data, nil
 		}
-		c.backend.Set(key, data)
+		atomic.AddInt64(&c.currentSize, int64(s.Size()))
 	}
 
+	c.backend.Set(key, data)
+
 	return data, nil
 }
 

diff --git a/lru_cache.go b/lru_cache.go
@@ -62,18 +62,21 @@ func (c *LruCache) Get(key string, fn func() (Value, error)) (data Value, err er
 
 	atomic.AddInt64(&c.Misses, 1)
 
-	if c.allowed(key, data) {
-		c.backend.Add(key, data)
-
-		if s, ok := data.(Sizer); ok {
-			atomic.AddInt64(&c.currentSize, int64(s.Size()))
-			if c.maxCacheSize > 0 && atomic.LoadInt64(&c.currentSize) > c.maxCacheSize {
-				for atomic.LoadInt64(&c.currentSize) > c.maxCacheSize {
-					c.backend.RemoveOldest()
-				}
+	if !c.allowed(key, data) {
+		return data, nil
+	}
+
+	c.backend.Add(key, data)
+
+	if s, ok := data.(Sizer); ok {
+		atomic.AddInt64(&c.currentSize, int64(s.Size()))
+		if c.maxCacheSize > 0 && atomic.LoadInt64(&c.currentSize) > c.maxCacheSize {
+			for atomic.LoadInt64(&c.currentSize) > c.maxCacheSize {
+				c.backend.RemoveOldest()
 			}
 		}
 	}
+
 	return data, nil
 }
 

diff --git a/redis_cache.go b/redis_cache.go
@@ -61,13 +61,16 @@ func (c *RedisCache) Get(key string, fn func() (Value, error)) (data Value, err
 	}
 	atomic.AddInt64(&c.Misses, 1)
 
-	if c.allowed(key, data) {
-		_, setErr := c.backend.Set(key, data, c.ttl).Result()
-		if setErr != nil {
-			atomic.AddInt64(&c.Errors, 1)
-			return data, setErr
-		}
+	if !c.allowed(key, data) {
+		return data, nil
+	}
+
+	_, setErr := c.backend.Set(key, data, c.ttl).Result()
+	if setErr != nil {
+		atomic.AddInt64(&c.Errors, 1)
+		return data, setErr
 	}
+
 	return data, nil
 }