clean up

rsql/rcache.go

@@ -22,16 +22,12 @@ type rcache struct {
 	limit  int
 }
 
-// enabled is the source of truth whether the rcache is enabled or not.
-var enabled bool
-
-func init() {
-	enabled = true
-}
+// cacheDisabled is the source of truth whether the rcache is disabled or not.
+var cacheDisabled bool
 
 // DisableCache results in all loading going straight through to the underlying loader.
 func DisableCache() {
-	enabled = false
+	cacheDisabled = true
 }
 
 // newRCache returns a new read-through cache.
@@ -75,7 +71,7 @@ func (c *rcache) Load(ctx context.Context, dbc *sql.DB,
 	prev int64, lag time.Duration,
 ) ([]*reflex.Event, error) {
 	res, ok := c.maybeHit(prev+1, lag)
-	if enabled && ok {
+	if !cacheDisabled && ok {
 		rcacheHitsCounter.WithLabelValues(c.name).Inc()
 		return res, nil
 	}
@@ -126,7 +122,7 @@ func (c *rcache) readThrough(ctx context.Context, dbc *sql.DB,
 
 	// Recheck cache after waiting for lock
 	res, ok := c.maybeHitUnsafe(prev+1, lag)
-	if enabled && ok {
+	if !cacheDisabled && ok {
 		return res, nil
 	}
 

rsql/rcache_test.go

@@ -180,7 +180,7 @@ func TestRCache(t *testing.T) {
 			if test.disabled {
 				DisableCache()
 				t.Cleanup(func() {
-					enabled = true
+					cacheDisabled = false
 				})
 			}
 			q := newQ()