lint and modernize

Author: Thomas Stromberg

.golangci.yml

@@ -186,8 +186,10 @@ linters:
           arguments: [10]
         - name: flag-parameter # fixes are difficult
           disabled: true
-        - name: confusing-naming # false positives
+        - name: bare-return
           disabled: true
+        - name: confusing-naming
+          disabled: true # cache libraries naturally use same method names (Get/Set) across types
 
     rowserrcheck:
       # database/sql is always checked.

.yamllint

@@ -0,0 +1,16 @@
+---
+extends: default
+
+rules:
+  braces:
+    max-spaces-inside: 1
+  brackets:
+    max-spaces-inside: 1
+  comments: disable
+  comments-indentation: disable
+  document-start: disable
+  line-length:
+    level: warning
+    max: 160
+    allow-non-breakable-inline-mappings: true
+  truthy: disable

Makefile

@@ -98,7 +98,7 @@ LINTERS :=
 FIXERS :=
 
 GOLANGCI_LINT_CONFIG := $(LINT_ROOT)/.golangci.yml
-GOLANGCI_LINT_VERSION ?= v2.5.0
+GOLANGCI_LINT_VERSION ?= v2.7.2
 GOLANGCI_LINT_BIN := $(LINT_ROOT)/out/linters/golangci-lint-$(GOLANGCI_LINT_VERSION)-$(LINT_ARCH)
 $(GOLANGCI_LINT_BIN):
 	mkdir -p $(LINT_ROOT)/out/linters
@@ -114,6 +114,19 @@ FIXERS += golangci-lint-fix
 golangci-lint-fix: $(GOLANGCI_LINT_BIN)
 	find . -name go.mod -execdir "$(GOLANGCI_LINT_BIN)" run -c "$(GOLANGCI_LINT_CONFIG)" --fix \;
 
+YAMLLINT_VERSION ?= 1.37.1
+YAMLLINT_ROOT := $(LINT_ROOT)/out/linters/yamllint-$(YAMLLINT_VERSION)
+YAMLLINT_BIN := $(YAMLLINT_ROOT)/dist/bin/yamllint
+$(YAMLLINT_BIN):
+	mkdir -p $(LINT_ROOT)/out/linters
+	rm -rf $(LINT_ROOT)/out/linters/yamllint-*
+	curl -sSfL https://github.com/adrienverge/yamllint/archive/refs/tags/v$(YAMLLINT_VERSION).tar.gz | tar -C $(LINT_ROOT)/out/linters -zxf -
+	cd $(YAMLLINT_ROOT) && pip3 install --target dist . || pip install --target dist .
+
+LINTERS += yamllint-lint
+yamllint-lint: $(YAMLLINT_BIN)
+	PYTHONPATH=$(YAMLLINT_ROOT)/dist $(YAMLLINT_ROOT)/dist/bin/yamllint .
+
 .PHONY: _lint $(LINTERS)
 _lint:
 	@exit_code=0; \

benchmarks/benchmark_test.go

@@ -292,10 +292,7 @@ func hitRateTinyLFU(keys []int, cacheSize int) float64 {
 }
 
 func hitRateFreecache(keys []int, cacheSize int) float64 {
-	cacheBytes := cacheSize * 24
-	if cacheBytes < 512*1024 {
-		cacheBytes = 512 * 1024
-	}
+	cacheBytes := max(cacheSize*24, 512*1024)
 	cache := freecache.NewCache(cacheBytes)
 	// Pre-compute keys and values to avoid conversion overhead affecting hit rate measurement
 	precomputedKeys := make([][]byte, hitRateKeySpace)
@@ -755,9 +752,7 @@ func measureZipfQPS(cacheName string, threads int, keys []int) float64 {
 			cache.Set(i, i)
 		}
 		for range threads {
-			wg.Add(1)
-			go func() {
-				defer wg.Done()
+			wg.Go(func() {
 				for i := 0; ; {
 					for range opsBatchSize {
 						key := keys[i%workloadLen]
@@ -773,7 +768,7 @@ func measureZipfQPS(cacheName string, threads int, keys []int) float64 {
 						return
 					}
 				}
-			}()
+			})
 		}
 
 	case "otter":
@@ -782,9 +777,7 @@ func measureZipfQPS(cacheName string, threads int, keys []int) float64 {
 			cache.Set(i, i)
 		}
 		for range threads {
-			wg.Add(1)
-			go func() {
-				defer wg.Done()
+			wg.Go(func() {
 				for i := 0; ; {
 					for range opsBatchSize {
 						key := keys[i%workloadLen]
@@ -800,7 +793,7 @@ func measureZipfQPS(cacheName string, threads int, keys []int) float64 {
 						return
 					}
 				}
-			}()
+			})
 		}
 
 	case "ristretto":
@@ -814,9 +807,7 @@ func measureZipfQPS(cacheName string, threads int, keys []int) float64 {
 		}
 		ristrettoCache.Wait()
 		for range threads {
-			wg.Add(1)
-			go func() {
-				defer wg.Done()
+			wg.Go(func() {
 				for i := 0; ; {
 					for range opsBatchSize {
 						key := keys[i%workloadLen]
@@ -832,7 +823,7 @@ func measureZipfQPS(cacheName string, threads int, keys []int) float64 {
 						return
 					}
 				}
-			}()
+			})
 		}
 
 	case "lru":
@@ -841,9 +832,7 @@ func measureZipfQPS(cacheName string, threads int, keys []int) float64 {
 			cache.Add(i, i)
 		}
 		for range threads {
-			wg.Add(1)
-			go func() {
-				defer wg.Done()
+			wg.Go(func() {
 				for i := 0; ; {
 					for range opsBatchSize {
 						key := keys[i%workloadLen]
@@ -859,7 +848,7 @@ func measureZipfQPS(cacheName string, threads int, keys []int) float64 {
 						return
 					}
 				}
-			}()
+			})
 		}
 
 	case "tinylfu":
@@ -870,9 +859,7 @@ func measureZipfQPS(cacheName string, threads int, keys []int) float64 {
 			cache.Set(&tinylfu.Item{Key: keysAsStrings[i], Value: i})
 		}
 		for range threads {
-			wg.Add(1)
-			go func() {
-				defer wg.Done()
+			wg.Go(func() {
 				for i := 0; ; {
 					for range opsBatchSize {
 						key := keys[i%workloadLen]
@@ -888,7 +875,7 @@ func measureZipfQPS(cacheName string, threads int, keys []int) float64 {
 						return
 					}
 				}
-			}()
+			})
 		}
 
 	case "freecache":
@@ -902,9 +889,7 @@ func measureZipfQPS(cacheName string, threads int, keys []int) float64 {
 			cache.Set(keysAsBytes[i], vals[i], 0)
 		}
 		for range threads {
-			wg.Add(1)
-			go func() {
-				defer wg.Done()
+			wg.Go(func() {
 				for i := 0; ; {
 					for range opsBatchSize {
 						key := keys[i%workloadLen]
@@ -920,7 +905,7 @@ func measureZipfQPS(cacheName string, threads int, keys []int) float64 {
 						return
 					}
 				}
-			}()
+			})
 		}
 	}
 

benchmarks/meta_trace_test.go

@@ -319,10 +319,7 @@ func runMetaTraceTinyLFU(ops []traceOp, cacheSize int) float64 {
 
 func runMetaTraceFreecache(ops []traceOp, cacheSize int) float64 {
 	// freecache uses bytes, estimate ~32 bytes per entry (key + value + overhead)
-	cacheBytes := cacheSize * 32
-	if cacheBytes < 512*1024 {
-		cacheBytes = 512 * 1024 // minimum 512KB
-	}
+	cacheBytes := max(cacheSize*32, 512*1024) // minimum 512KB
 	cache := freecache.NewCache(cacheBytes)
 
 	var hits, misses int64

bloom.go

@@ -26,20 +26,12 @@ func newBloomFilter(capacity int, fpRate float64) *bloomFilter {
 	m := float64(capacity) * -math.Log(fpRate) / (ln2 * ln2)
 
 	// Round m up to nearest power of 2 for fast modulo
-	mInt := nextPowerOf2(uint64(m))
-	if mInt < 64 {
-		mInt = 64
-	}
+	mInt := max(nextPowerOf2(uint64(m)), 64)
 
 	// Calculate k
 	// k = (m / n) * ln(2)
-	k := int(float64(mInt) / float64(capacity) * ln2)
-	if k < 1 {
-		k = 1
-	}
-	if k > 16 {
-		k = 16 // Cap k to avoid too many memory accesses
-	}
+	// Clamp k between 1 and 16 (cap to avoid too many memory accesses)
+	k := min(max(int(float64(mInt)/float64(capacity)*ln2), 1), 16)
 
 	return &bloomFilter{
 		data: make([]uint64, mInt/64),

memory_test.go

@@ -103,13 +103,11 @@ func TestMemoryCache_Concurrent(t *testing.T) {
 
 	// Concurrent readers
 	for range 10 {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
+		wg.Go(func() {
 			for j := range 100 {
 				cache.Get(j)
 			}
-		}()
+		})
 	}
 
 	wg.Wait()
@@ -579,9 +577,7 @@ func TestMemoryCache_GetSet_IntKeys(t *testing.T) {
 	// Test thundering herd with int keys (uses different flightShard path)
 	var wg sync.WaitGroup
 	for i := range 50 {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
+		wg.Go(func() {
 			// All goroutines request the same key
 			val, err := cache.GetSet(123, loader)
 			if err != nil {
@@ -590,7 +586,7 @@ func TestMemoryCache_GetSet_IntKeys(t *testing.T) {
 			if val != 42 {
 				t.Errorf("GetSet value = %d; want 42", val)
 			}
-		}()
+		})
 		// Stagger slightly to ensure overlap
 		if i%10 == 0 {
 			time.Sleep(time.Millisecond)

persistent.go

@@ -64,7 +64,7 @@ func NewTiered[K comparable, V any](store Store[K, V], opts ...Option) (*TieredC
 // Get retrieves a value from the cache.
 // It first checks the memory cache, then falls back to persistence.
 //
-//nolint:gocritic // unnamedResult - public API signature is intentionally clear without named returns
+//nolint:gocritic // unnamedResult: public API signature is intentionally clear
 func (c *TieredCache[K, V]) Get(ctx context.Context, key K) (V, bool, error) {
 	// Check memory first
 	if val, ok := c.memory.get(key); ok {

persistent_test.go

@@ -783,13 +783,11 @@ func TestTieredCache_Concurrent(t *testing.T) {
 
 	// Concurrent readers
 	for range 10 {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
+		wg.Go(func() {
 			for j := range 100 {
 				_, _, _ = cache.Get(ctx, j) //nolint:errcheck // Test concurrent access
 			}
-		}()
+		})
 	}
 
 	wg.Wait()

pkg/store/null/null.go

@@ -24,7 +24,7 @@ func (*Store[K, V]) ValidateKey(_ K) error {
 
 // Get always returns not found.
 //
-//nolint:revive // function-result-limit - required by Store interface
+//nolint:revive // function-result-limit: required by Store interface
 func (*Store[K, V]) Get(_ context.Context, _ K) (value V, expiry time.Time, found bool, err error) {
 	var zero V
 	return zero, time.Time{}, false, nil