Skip to content

Commit 438f54e

Browse files
committed
FFM-11660 Use set instead of set with limit
1 parent d7ab1c3 commit 438f54e

File tree

3 files changed

+8
-17
lines changed

3 files changed

+8
-17
lines changed

Diff for: analyticsservice/analytics.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ type SafeAnalyticsCache[K comparable, V any] interface {
4949
// SafeSeenTargetsCache extends SafeAnalyticsCache and adds behavior specific to seen targets
5050
type SafeSeenTargetsCache[K comparable, V any] interface {
5151
SafeAnalyticsCache[K, V]
52-
setWithLimit(key K, value V)
5352
isLimitExceeded() bool
5453
}
5554

@@ -170,7 +169,7 @@ func (as *AnalyticsService) listener() {
170169
}
171170

172171
// Update seen targets
173-
as.seenTargets.setWithLimit(ad.target.Identifier, true)
172+
as.seenTargets.set(ad.target.Identifier, true)
174173

175174
// Update target metrics
176175
if as.targetAnalytics.size() < maxTargetEntries {

Diff for: analyticsservice/safe_maps_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,15 @@ func TestSafeSeenTargets(t *testing.T) {
102102
}
103103

104104
// Add one more item to exceed the limit
105-
s.setWithLimit("target4", true)
105+
s.set("target4", true)
106106

107107
// Ensure limitExceeded is true after exceeding the limit
108108
if !s.isLimitExceeded() {
109109
t.Errorf("Limit should be exceeded after adding target4")
110110
}
111111

112112
// Ensure that new items are not added once the limit is exceeded
113-
s.setWithLimit("target5", true)
113+
s.set("target5", true)
114114
if _, exists := s.get("target5"); exists {
115115
t.Errorf("target5 should not have been added as the limit was exceeded")
116116
}
@@ -123,7 +123,7 @@ func TestSafeSeenTargets(t *testing.T) {
123123
}
124124

125125
// Add items again after clearing
126-
s.setWithLimit("target6", true)
126+
s.set("target6", true)
127127
if _, exists := s.get("target6"); !exists {
128128
t.Errorf("target6 should have been added after clearing the map")
129129
}
@@ -142,7 +142,7 @@ func TestSafeSeenTargets(t *testing.T) {
142142
go func(i int) {
143143
defer wg.Done()
144144
key := "target" + fmt.Sprint(i)
145-
s.setWithLimit(key, true)
145+
s.set(key, true)
146146
}(i)
147147
}
148148

@@ -172,5 +172,5 @@ func TestSafeSeenTargets(t *testing.T) {
172172
t.Errorf("Map size should be 0 after clearing, got %d", s.size())
173173
}
174174
})
175-
175+
176176
}

Diff for: analyticsservice/safe_seen_targets_map.go

+2-10
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,8 @@ func newSafeSeenTargets(maxSize int) SafeSeenTargetsCache[string, bool] {
2020
}
2121
}
2222

23-
func (s *safeSeenTargets) setWithLimit(key string, seen bool) {
24-
if s.limitExceeded.Load() {
25-
return
26-
}
27-
23+
// The regular set method just calls SetWithLimit
24+
func (s *safeSeenTargets) set(key string, seen bool) {
2825
s.Lock()
2926
defer s.Unlock()
3027

@@ -36,11 +33,6 @@ func (s *safeSeenTargets) setWithLimit(key string, seen bool) {
3633
s.data[key] = seen
3734
}
3835

39-
// The regular set method just calls SetWithLimit
40-
func (s *safeSeenTargets) set(key string, seen bool) {
41-
s.setWithLimit(key, seen)
42-
}
43-
4436
func (s *safeSeenTargets) get(key string) (bool, bool) {
4537
s.RLock()
4638
defer s.RUnlock()

0 commit comments

Comments
 (0)