Merge pull request #37 from mgtv-tech/fix_refresh

Fix refresh

Author: daoshenzzg

cache.go

@@ -483,7 +483,9 @@ func (c *jetCache) externalLoad(ctx context.Context, task *refreshTask, now time
 		return
 	}
 
-	ok, err := c.remote.SetNX(ctx, lockKey, strconv.FormatInt(now.Unix(), 10), c.refreshDuration)
+	// issues: https://github.com/mgtv-tech/jetcache-go/issues/36
+	lockTimeout := c.refreshDuration - 10*time.Millisecond
+	ok, err := c.remote.SetNX(ctx, lockKey, strconv.FormatInt(now.Unix(), 10), lockTimeout)
 	if err != nil {
 		logger.Error("externalLoad#c.remote.setNX(%s) error(%v)", lockKey, err)
 		return

cache_test.go

@@ -481,8 +481,6 @@ var _ = Describe("Cache", func() {
 				err = cache.Get(ctx, key, &value)
 				Expect(err).NotTo(HaveOccurred())
 				Expect(value).To(Equal("V2"))
-
-				time.Sleep(2 * refreshDuration)
 			})
 
 			It("refresh err", func() {

cacheopt.go

@@ -18,6 +18,7 @@ const (
 	defaultCodec              = msgpack.Name
 	defaultRandSourceIdLen    = 16
 	defaultEventChBufSize     = 100
+	minEffectRefreshDuration  = time.Second
 	maxOffset                 = 10 * time.Second
 )
 
@@ -90,6 +91,9 @@ func newOptions(opts ...Option) Options {
 	if o.refreshConcurrency <= 0 {
 		o.refreshConcurrency = defaultRefreshConcurrency
 	}
+	if o.refreshDuration > 0 && o.refreshDuration < minEffectRefreshDuration {
+		o.refreshDuration = minEffectRefreshDuration
+	}
 	if o.stopRefreshAfterLastAccess <= 0 {
 		o.stopRefreshAfterLastAccess = o.refreshDuration + time.Second
 	}

cacheopt_test.go

@@ -56,14 +56,19 @@ func TestCacheOptions(t *testing.T) {
 		assert.Equal(t, maxOffset, o.offset)
 	})
 
+	t.Run("with refresh duration", func(t *testing.T) {
+		o := newOptions(WithRefreshDuration(time.Second))
+		assert.Equal(t, time.Second, o.refreshDuration)
+	})
+
 	t.Run("with refresh concurrency", func(t *testing.T) {
 		o := newOptions(WithRefreshConcurrency(16))
 		assert.Equal(t, defaultNotFoundExpiry, o.notFoundExpiry)
 		assert.Equal(t, 16, o.refreshConcurrency)
 		assert.Equal(t, defaultCodec, o.codec)
 	})
 
-	t.Run("with mockDecode", func(t *testing.T) {
+	t.Run("with mock decode", func(t *testing.T) {
 		o := newOptions(WithCodec(json.Name))
 		assert.Equal(t, defaultNotFoundExpiry, o.notFoundExpiry)
 		assert.Equal(t, defaultRefreshConcurrency, o.refreshConcurrency)
@@ -103,3 +108,28 @@ func TestCacheOptions(t *testing.T) {
 		assert.NotNil(t, o.eventHandler)
 	})
 }
+
+func TestCacheOptionsRefreshDuration(t *testing.T) {
+	tests := []struct {
+		input  time.Duration
+		expect time.Duration
+	}{
+		{
+			input:  0,
+			expect: 0,
+		},
+		{
+			input:  time.Millisecond,
+			expect: minEffectRefreshDuration,
+		},
+		{
+			input:  time.Minute,
+			expect: time.Minute,
+		},
+	}
+
+	for _, v := range tests {
+		o := newOptions(WithRefreshDuration(v.input))
+		assert.Equal(t, v.expect, o.refreshDuration)
+	}
+}