Skip to content

Commit

Permalink
Merge branch 'unstable' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
wsehjk committed Feb 18, 2024
2 parents d448e9d + e8c05a3 commit c29ac68
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion kvrocks.conf
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ max-bitmap-to-string-mb 16
# If enabled, the cursor will be unsigned 64-bit integers.
# If disabled, the cursor will be a string.
# Default: no
redis-cursor-compatible no
redis-cursor-compatible yes

# Whether to enable the RESP3 protocol.
# NOTICE: RESP3 is still under development, don't enable it in production environment.
Expand Down
2 changes: 1 addition & 1 deletion tests/gocase/unit/keyspace/keyspace_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ func TestKeyspace(t *testing.T) {
})

t.Run("Type a expired key", func(t *testing.T) {
expireTime := time.Second
expireTime := 2 * time.Second
key := "foo"
require.NoError(t, rdb.Del(ctx, key).Err())
require.Equal(t, "OK", rdb.SetEx(ctx, key, "bar", expireTime).Val())
Expand Down

0 comments on commit c29ac68

Please sign in to comment.