Pull request: netutil: add ipmap method clear

Merge in DNS/golibs from add-ipmap-clear to master Squashed commit of the following: commit 9eb5f40 Author: Ainar Garipov <[email protected]> Date: Tue Oct 12 18:41:58 2021 +0300 netutil: add ipmap method clear
AdguardTeam · Oct 12, 2021 · 6c781c8 · 6c781c8
1 parent 3307441
commit 6c781c8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/netutil/ipmap.go b/netutil/ipmap.go
@@ -39,6 +39,20 @@ func NewIPMap(hint int) (m *IPMap) {
 	}
 }
 
+// Clear clears the map but retains its allocated storage.  Calling Clear on
+// a nil *IPMap has no effect, just like calling delete in a loop on an empty
+// map doesn't.
+func (m *IPMap) Clear() {
+	if m == nil {
+		return
+	}
+
+	// This is optimized, see https://github.com/golang/go/issues/20138.
+	for k := range m.m {
+		delete(m.m, k)
+	}
+}
+
 // Del deletes ip from the map.  Calling Del on a nil *IPMap has no effect, just
 // like delete on an empty map doesn't.
 func (m *IPMap) Del(ip net.IP) {

diff --git a/netutil/ipmap_test.go b/netutil/ipmap_test.go
@@ -53,6 +53,10 @@ func TestIPMap(t *testing.T) {
 	t.Run("nil", func(t *testing.T) {
 		var m *netutil.IPMap
 
+		assert.NotPanics(t, func() {
+			m.Clear()
+		})
+
 		assert.NotPanics(t, func() {
 			m.Del(ip4)
 			m.Del(ip6)