Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
5394be37
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
5394be37
编写于
6月 30, 2018
作者:
J
Jason Lee
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix Cache :redis_store increment/decrement ttl check and add more tests.
上级
a9692941
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
22 addition
and
6 deletion
+22
-6
activesupport/lib/active_support/cache/redis_cache_store.rb
activesupport/lib/active_support/cache/redis_cache_store.rb
+2
-2
activesupport/test/cache/stores/redis_cache_store_test.rb
activesupport/test/cache/stores/redis_cache_store_test.rb
+20
-4
未找到文件。
activesupport/lib/active_support/cache/redis_cache_store.rb
浏览文件 @
5394be37
...
...
@@ -264,7 +264,7 @@ def increment(name, amount = 1, options = nil)
failsafe
:increment
do
redis
.
with
do
|
c
|
val
=
c
.
incrby
key
,
amount
if
expires_in
>
0
&&
c
.
ttl
(
key
)
==
-
2
if
expires_in
>
0
&&
c
.
ttl
(
key
)
<
0
c
.
expire
key
,
expires_in
end
val
...
...
@@ -290,7 +290,7 @@ def decrement(name, amount = 1, options = nil)
failsafe
:decrement
do
redis
.
with
do
|
c
|
val
=
c
.
decrby
key
,
amount
if
expires_in
>
0
&&
c
.
ttl
(
key
)
==
-
2
if
expires_in
>
0
&&
c
.
ttl
(
key
)
<
0
c
.
expire
key
,
expires_in
end
val
...
...
activesupport/test/cache/stores/redis_cache_store_test.rb
浏览文件 @
5394be37
...
...
@@ -145,24 +145,40 @@ def test_fetch_multi_uses_redis_mget
def
test_increment_expires_in
assert_called_with
@cache
.
redis
,
:incrby
,
[
"
#{
@namespace
}
:foo"
,
1
]
do
assert_called_with
@cache
.
redis
,
:expire
,
[
"
#{
@namespace
}
:foo"
,
60
]
do
@cache
.
increment
(
"foo"
,
1
,
expires_in:
60
)
@cache
.
increment
"foo"
,
1
,
expires_in:
60
end
end
# key and ttl exist
@cache
.
redis
.
setex
"
#{
@namespace
}
:bar"
,
120
,
1
assert_not_called
@cache
.
redis
,
:expire
do
@cache
.
decrement
(
"foo"
,
1
,
expires_in:
60
)
@cache
.
increment
"bar"
,
1
,
expires_in:
120
end
# key exist but not have expire
@cache
.
redis
.
set
"
#{
@namespace
}
:dar"
,
10
assert_called_with
@cache
.
redis
,
:expire
,
[
"
#{
@namespace
}
:dar"
,
60
]
do
@cache
.
increment
"dar"
,
1
,
expires_in:
60
end
end
def
test_decrement_expires_in
assert_called_with
@cache
.
redis
,
:decrby
,
[
"
#{
@namespace
}
:foo"
,
1
]
do
assert_called_with
@cache
.
redis
,
:expire
,
[
"
#{
@namespace
}
:foo"
,
60
]
do
@cache
.
decrement
(
"foo"
,
1
,
expires_in:
60
)
@cache
.
decrement
"foo"
,
1
,
expires_in:
60
end
end
# key and ttl exist
@cache
.
redis
.
setex
"
#{
@namespace
}
:bar"
,
120
,
1
assert_not_called
@cache
.
redis
,
:expire
do
@cache
.
decrement
(
"foo"
,
1
,
expires_in:
60
)
@cache
.
decrement
"bar"
,
1
,
expires_in:
120
end
# key exist but not have expire
@cache
.
redis
.
set
"
#{
@namespace
}
:dar"
,
10
assert_called_with
@cache
.
redis
,
:expire
,
[
"
#{
@namespace
}
:dar"
,
60
]
do
@cache
.
decrement
"dar"
,
1
,
expires_in:
60
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录