optimize map cleanup, upgrade list package

mgnsk · Sep 5, 2023 · 3f31702 · 3f31702
1 parent dc002c5
commit 3f31702
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/backend.go b/backend.go
@@ -130,7 +130,8 @@ func (b *backend[K, V]) runGC(now int64) {
 
 	var overflowed map[*list.Element[record[V]]]bool
 
-	if n := b.overflow(); n > 0 {
+	n := b.overflow()
+	if n > 0 {
 		overflowed = make(map[*list.Element[record[V]]]bool, n)
 
 		elem := b.list.Front()
@@ -146,7 +147,7 @@ func (b *backend[K, V]) runGC(now int64) {
 
 	b.xmap.Range(func(key K, elem *list.Element[record[V]]) bool {
 		if elem.Value.initialized.Load() {
-			if len(overflowed) > 0 && overflowed[elem] || elem.Value.deadline > 0 && elem.Value.deadline < now {
+			if n > 0 && overflowed[elem] || elem.Value.deadline > 0 && elem.Value.deadline < now {
 				b.xmap.Delete(key)
 				b.list.Remove(elem)
 			} else if elem.Value.deadline > 0 && (earliest == 0 || elem.Value.deadline < earliest) {

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/mgnsk/evcache/v3
 go 1.19
 
 require (
-	github.com/mgnsk/list v0.0.0-20230904181733-917e3f68e934
+	github.com/mgnsk/list v0.0.0-20230905200616-4e51b4f6fef2
 	github.com/onsi/gomega v1.27.10
 )
 

diff --git a/go.sum b/go.sum
@@ -8,8 +8,8 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/mgnsk/list v0.0.0-20230904181733-917e3f68e934 h1:7tzTvlzBPoj8GaIS7PX8D9rxJllOxkOn7Aj9kl76L8Y=
-github.com/mgnsk/list v0.0.0-20230904181733-917e3f68e934/go.mod h1:NSeUCVwmqTJGeKJW1DFe0En63T065/tLyj5HPwwBZd0=
+github.com/mgnsk/list v0.0.0-20230905200616-4e51b4f6fef2 h1:EeW6xjhmmdN6MYbhGFQaDQPAx9LnbkUUHMgo58a94G0=
+github.com/mgnsk/list v0.0.0-20230905200616-4e51b4f6fef2/go.mod h1:NSeUCVwmqTJGeKJW1DFe0En63T065/tLyj5HPwwBZd0=
 github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU=
 github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
 github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M=