Merge pull request #283 from semihbkgr/hazelcast-tag-ttl

feat: add TTL support for tags in Hazelcast store

Author: eko

store/hazelcast/hazelcast.go

@@ -26,8 +26,6 @@ const (
 	HazelcastType = "hazelcast"
 	// HazelcastTagPattern represents the tag pattern to be used as a key in specified storage
 	HazelcastTagPattern = "gocache_tag_%s"
-
-	TagKeyExpiry = 720 * time.Hour
 )
 
 // HazelcastStore is a store for Hazelcast
@@ -76,12 +74,12 @@ func (s *HazelcastStore) Set(ctx context.Context, key any, value any, options ..
 		return err
 	}
 	if tags := opts.Tags; len(tags) > 0 {
-		s.setTags(ctx, s.hzMap, key, tags)
+		s.setTags(ctx, s.hzMap, key, tags, opts.TagsTTL)
 	}
 	return nil
 }
 
-func (s *HazelcastStore) setTags(ctx context.Context, hzMap HazelcastMapInterface, key any, tags []string) {
+func (s *HazelcastStore) setTags(ctx context.Context, hzMap HazelcastMapInterface, key any, tags []string, ttl time.Duration) {
 	group, ctx := errgroup.WithContext(ctx)
 	for _, tag := range tags {
 		currentTag := tag
@@ -91,18 +89,20 @@ func (s *HazelcastStore) setTags(ctx context.Context, hzMap HazelcastMapInterfac
 			if err != nil {
 				return err
 			}
-			if tagValue == nil {
-				return hzMap.SetWithTTL(ctx, tagKey, key.(string), TagKeyExpiry)
-			}
-			cacheKeys := strings.Split(tagValue.(string), ",")
-			for _, cacheKey := range cacheKeys {
-				if key == cacheKey {
-					return nil
+
+			newTagValue := key.(string)
+			if tagValue != nil {
+				cacheKeys := strings.Split(tagValue.(string), ",")
+				for _, cacheKey := range cacheKeys {
+					if key == cacheKey {
+						return nil
+					}
 				}
+				cacheKeys = append(cacheKeys, key.(string))
+				newTagValue = strings.Join(cacheKeys, ",")
 			}
-			cacheKeys = append(cacheKeys, key.(string))
-			newTagValue := strings.Join(cacheKeys, ",")
-			return hzMap.SetWithTTL(ctx, tagKey, newTagValue, TagKeyExpiry)
+
+			return hzMap.SetWithTTL(ctx, tagKey, newTagValue, ttl)
 		})
 	}
 	group.Wait()

store/hazelcast/hazelcast_test.go

@@ -98,7 +98,7 @@ func TestHazelcastSetWithTags(t *testing.T) {
 
 	hzMap := NewMockHazelcastMapInterface(ctrl)
 	hzMap.EXPECT().SetWithTTL(ctx, cacheKey, cacheValue, time.Duration(0)).Return(nil)
-	hzMap.EXPECT().SetWithTTL(gomock.Any(), "gocache_tag_tag1", cacheKey, TagKeyExpiry).Return(nil)
+	hzMap.EXPECT().SetWithTTL(gomock.Any(), "gocache_tag_tag1", cacheKey, time.Duration(0)).Return(nil)
 	hzMap.EXPECT().Get(gomock.Any(), "gocache_tag_tag1").Return(nil, nil)
 
 	store := NewHazelcast(hzMap)
@@ -110,6 +110,29 @@ func TestHazelcastSetWithTags(t *testing.T) {
 	assert.Nil(t, err)
 }
 
+func TestHazelcastSetWithTagsTTL(t *testing.T) {
+	// Given
+	ctrl := gomock.NewController(t)
+
+	ctx := context.Background()
+
+	cacheKey := "my-key"
+	cacheValue := "my-cache-value"
+
+	hzMap := NewMockHazelcastMapInterface(ctrl)
+	hzMap.EXPECT().SetWithTTL(ctx, cacheKey, cacheValue, time.Duration(0)).Return(nil)
+	hzMap.EXPECT().SetWithTTL(gomock.Any(), "gocache_tag_tag1", cacheKey, 10*time.Second).Return(nil)
+	hzMap.EXPECT().Get(gomock.Any(), "gocache_tag_tag1").Return(nil, nil)
+
+	store := NewHazelcast(hzMap)
+
+	// When
+	err := store.Set(ctx, cacheKey, cacheValue, lib_store.WithTags([]string{"tag1"}), lib_store.WithTagsTTL(10*time.Second))
+
+	// Then
+	assert.Nil(t, err)
+}
+
 func TestHazelcastDelete(t *testing.T) {
 	// Given
 	ctrl := gomock.NewController(t)