Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Turbo码先生
redis
提交
52d46855
R
redis
项目概览
Turbo码先生
/
redis
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
redis
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
52d46855
编写于
11月 09, 2011
作者:
A
antirez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
TTL, EXPIRE and EXPIREAT now support the milliseconds input/output form
上级
b0b74486
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
31 addition
and
7 deletion
+31
-7
src/db.c
src/db.c
+28
-4
src/redis.c
src/redis.c
+3
-3
未找到文件。
src/db.c
浏览文件 @
52d46855
...
...
@@ -514,6 +514,14 @@ int expireIfNeeded(redisDb *db, robj *key) {
* Expires Commands
*----------------------------------------------------------------------------*/
/* Given an string object return true if it contains exactly the "ms"
* or "MS" string. This is used in order to check if the last argument
* of EXPIRE, EXPIREAT or TTL is "ms" to switch into millisecond input/output */
int
stringObjectEqualsMs
(
robj
*
a
)
{
char
*
arg
=
a
->
ptr
;
return
tolower
(
arg
[
0
])
==
'm'
&&
tolower
(
arg
[
1
])
==
's'
&&
arg
[
2
]
==
'\0'
;
}
void
expireGenericCommand
(
redisClient
*
c
,
long
long
offset
)
{
dictEntry
*
de
;
robj
*
key
=
c
->
argv
[
1
],
*
param
=
c
->
argv
[
2
];
...
...
@@ -526,9 +534,7 @@ void expireGenericCommand(redisClient *c, long long offset) {
/* If no "ms" argument was passed the time is in second, so we need
* to multilpy it by 1000 */
if
(
c
->
argc
==
4
)
{
char
*
arg
=
c
->
argv
[
3
]
->
ptr
;
if
(
tolower
(
arg
[
0
])
!=
'm'
||
tolower
(
arg
[
1
])
!=
's'
||
arg
[
2
])
{
if
(
!
stringObjectEqualsMs
(
c
->
argv
[
3
]))
{
addReply
(
c
,
shared
.
syntaxerr
);
return
;
}
...
...
@@ -572,15 +578,33 @@ void expireGenericCommand(redisClient *c, long long offset) {
}
void
expireCommand
(
redisClient
*
c
)
{
if
(
c
->
argc
>
4
)
{
addReply
(
c
,
shared
.
syntaxerr
);
return
;
}
expireGenericCommand
(
c
,
0
);
}
void
expireatCommand
(
redisClient
*
c
)
{
if
(
c
->
argc
>
4
)
{
addReply
(
c
,
shared
.
syntaxerr
);
return
;
}
expireGenericCommand
(
c
,
mstime
());
}
void
ttlCommand
(
redisClient
*
c
)
{
long
long
expire
,
ttl
=
-
1
;
int
output_ms
=
0
;
if
(
c
->
argc
==
3
)
{
if
(
stringObjectEqualsMs
(
c
->
argv
[
2
]))
{
output_ms
=
1
;
}
else
{
addReply
(
c
,
shared
.
syntaxerr
);
return
;
}
}
expire
=
getExpire
(
c
->
db
,
c
->
argv
[
1
]);
if
(
expire
!=
-
1
)
{
...
...
@@ -590,7 +614,7 @@ void ttlCommand(redisClient *c) {
if
(
ttl
==
-
1
)
{
addReplyLongLong
(
c
,
-
1
);
}
else
{
addReplyLongLong
(
c
,
(
ttl
+
500
)
/
1000
);
addReplyLongLong
(
c
,
output_ms
?
ttl
:
((
ttl
+
500
)
/
1000
)
);
}
}
...
...
src/redis.c
浏览文件 @
52d46855
...
...
@@ -172,8 +172,8 @@ struct redisCommand redisCommandTable[] = {
{
"move"
,
moveCommand
,
3
,
"w"
,
0
,
NULL
,
1
,
1
,
1
,
0
,
0
},
{
"rename"
,
renameCommand
,
3
,
"w"
,
0
,
renameGetKeys
,
1
,
2
,
1
,
0
,
0
},
{
"renamenx"
,
renamenxCommand
,
3
,
"w"
,
0
,
renameGetKeys
,
1
,
2
,
1
,
0
,
0
},
{
"expire"
,
expireCommand
,
3
,
"w"
,
0
,
NULL
,
1
,
1
,
1
,
0
,
0
},
{
"expireat"
,
expireatCommand
,
3
,
"w"
,
0
,
NULL
,
1
,
1
,
1
,
0
,
0
},
{
"expire"
,
expireCommand
,
-
3
,
"w"
,
0
,
NULL
,
1
,
1
,
1
,
0
,
0
},
{
"expireat"
,
expireatCommand
,
-
3
,
"w"
,
0
,
NULL
,
1
,
1
,
1
,
0
,
0
},
{
"keys"
,
keysCommand
,
2
,
"r"
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
{
"dbsize"
,
dbsizeCommand
,
1
,
"r"
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
{
"auth"
,
authCommand
,
2
,
"r"
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
...
...
@@ -194,7 +194,7 @@ struct redisCommand redisCommandTable[] = {
{
"sort"
,
sortCommand
,
-
2
,
"wm"
,
0
,
NULL
,
1
,
1
,
1
,
0
,
0
},
{
"info"
,
infoCommand
,
-
1
,
"r"
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
{
"monitor"
,
monitorCommand
,
1
,
"ars"
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
{
"ttl"
,
ttlCommand
,
2
,
"r"
,
0
,
NULL
,
1
,
1
,
1
,
0
,
0
},
{
"ttl"
,
ttlCommand
,
-
2
,
"r"
,
0
,
NULL
,
1
,
1
,
1
,
0
,
0
},
{
"persist"
,
persistCommand
,
2
,
"w"
,
0
,
NULL
,
1
,
1
,
1
,
0
,
0
},
{
"slaveof"
,
slaveofCommand
,
3
,
"aws"
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
{
"debug"
,
debugCommand
,
-
2
,
"aw"
,
0
,
NULL
,
0
,
0
,
0
,
0
,
0
},
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录