From b1bc641105405b8b0f13de3f825be6ba7172929a Mon Sep 17 00:00:00 2001
From: Name <1911860538@qq.com>
Date: Tue, 1 Apr 2025 23:28:06 +0800
Subject: [PATCH] chore(all): replace map key deletion loop with clear()
 (#21082)

---
 cmd/bucket-metadata-sys.go      | 4 +---
 cmd/tier.go                     | 8 ++------
 cmd/xl-storage.go               | 4 +---
 internal/grid/types.go          | 4 +---
 internal/s3select/csv/record.go | 4 +---
 5 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/cmd/bucket-metadata-sys.go b/cmd/bucket-metadata-sys.go
index 06972606b..e4465ea1a 100644
--- a/cmd/bucket-metadata-sys.go
+++ b/cmd/bucket-metadata-sys.go
@@ -647,9 +647,7 @@ func (sys *BucketMetadataSys) init(ctx context.Context, buckets []string) {
 // Reset the state of the BucketMetadataSys.
 func (sys *BucketMetadataSys) Reset() {
 	sys.Lock()
-	for k := range sys.metadataMap {
-		delete(sys.metadataMap, k)
-	}
+	clear(sys.metadataMap)
 	sys.Unlock()
 }
 
diff --git a/cmd/tier.go b/cmd/tier.go
index 317dd5061..0b304a4a0 100644
--- a/cmd/tier.go
+++ b/cmd/tier.go
@@ -491,13 +491,9 @@ func (config *TierConfigMgr) Reload(ctx context.Context, objAPI ObjectLayer) err
 	}
 
 	// Reset drivercache built using current config
-	for k := range config.drivercache {
-		delete(config.drivercache, k)
-	}
+	clear(config.drivercache)
 	// Remove existing tier configs
-	for k := range config.Tiers {
-		delete(config.Tiers, k)
-	}
+	clear(config.Tiers)
 	// Copy over the new tier configs
 	for tier, cfg := range newConfig.Tiers {
 		config.Tiers[tier] = cfg
diff --git a/cmd/xl-storage.go b/cmd/xl-storage.go
index a270d2ff5..3d5defe83 100644
--- a/cmd/xl-storage.go
+++ b/cmd/xl-storage.go
@@ -3373,9 +3373,7 @@ func (s *xlStorage) CleanAbandonedData(ctx context.Context, volume string, path
 	}
 
 	// Clear and repopulate
-	for k := range foundDirs {
-		delete(foundDirs, k)
-	}
+	clear(foundDirs)
 
 	// Populate into map
 	for _, k := range dirs {
diff --git a/internal/grid/types.go b/internal/grid/types.go
index b24de8bf3..41ea2d61d 100644
--- a/internal/grid/types.go
+++ b/internal/grid/types.go
@@ -132,9 +132,7 @@ func (m *MSS) Msgsize() int {
 // NewMSS returns a new MSS.
 func NewMSS() *MSS {
 	m := MSS(mssPool.Get())
-	for k := range m {
-		delete(m, k)
-	}
+	clear(m)
 	return &m
 }
 
diff --git a/internal/s3select/csv/record.go b/internal/s3select/csv/record.go
index 8c38f6767..159c63f4f 100644
--- a/internal/s3select/csv/record.go
+++ b/internal/s3select/csv/record.go
@@ -87,9 +87,7 @@ func (r *Record) Reset() {
 	if len(r.csvRecord) > 0 {
 		r.csvRecord = r.csvRecord[:0]
 	}
-	for k := range r.nameIndexMap {
-		delete(r.nameIndexMap, k)
-	}
+	clear(r.nameIndexMap)
 }
 
 // Clone the record.