Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
hanoi2005
redis
提交
6d4371d4
R
redis
项目概览
hanoi2005
/
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,发现更多精彩内容 >>
提交
6d4371d4
编写于
5月 20, 2009
作者:
A
antirez
浏览文件
操作
浏览文件
下载
差异文件
Merge
git://github.com/tmm1/redis
上级
5f5b9840
0150db36
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
30 addition
and
20 deletion
+30
-20
redis.c
redis.c
+19
-19
redis.conf
redis.conf
+1
-1
test-redis.tcl
test-redis.tcl
+10
-0
未找到文件。
redis.c
浏览文件 @
6d4371d4
...
...
@@ -721,7 +721,7 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {
}
/* Close connections of timedout clients */
if
(
!
(
loops
%
10
))
if
(
server
.
maxidletime
&&
!
(
loops
%
10
))
closeTimedoutClients
();
/* Check if a background saving in progress terminated */
...
...
@@ -960,7 +960,7 @@ static void loadServerConfig(char *filename) {
/* Execute config directives */
if
(
!
strcasecmp
(
argv
[
0
],
"timeout"
)
&&
argc
==
2
)
{
server
.
maxidletime
=
atoi
(
argv
[
1
]);
if
(
server
.
maxidletime
<
1
)
{
if
(
server
.
maxidletime
<
0
)
{
err
=
"Invalid timeout value"
;
goto
loaderr
;
}
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"port"
)
&&
argc
==
2
)
{
...
...
@@ -3014,9 +3014,6 @@ static void sinterGenericCommand(redisClient *c, robj **setskeys, int setsnum, r
/* If we have a target key where to store the resulting set
* create this key with an empty set inside */
dstset
=
createSetObject
();
deleteKey
(
c
->
db
,
dstkey
);
dictAdd
(
c
->
db
->
dict
,
dstkey
,
dstset
);
incrRefCount
(
dstkey
);
}
/* Iterate all the elements of the first (smallest) set, and test
...
...
@@ -3045,6 +3042,13 @@ static void sinterGenericCommand(redisClient *c, robj **setskeys, int setsnum, r
}
dictReleaseIterator
(
di
);
if
(
dstkey
)
{
/* Store the resulting set into the target */
deleteKey
(
c
->
db
,
dstkey
);
dictAdd
(
c
->
db
->
dict
,
dstkey
,
dstset
);
incrRefCount
(
dstkey
);
}
if
(
!
dstkey
)
{
lenobj
->
ptr
=
sdscatprintf
(
sdsempty
(),
"*%d
\r\n
"
,
cardinality
);
}
else
{
...
...
@@ -3096,23 +3100,10 @@ static void sunionDiffGenericCommand(redisClient *c, robj **setskeys, int setsnu
* this set object will be the resulting object to set into the target key*/
dstset
=
createSetObject
();
/* The first thing we should output is the total number of elements...
* since this is a multi-bulk write, but at this stage we don't know
* the intersection set size, so we use a trick, append an empty object
* to the output list and save the pointer to later modify it with the
* right length */
if
(
dstkey
)
{
/* If we have a target key where to store the resulting set
* create this key with an empty set inside */
deleteKey
(
c
->
db
,
dstkey
);
dictAdd
(
c
->
db
->
dict
,
dstkey
,
dstset
);
incrRefCount
(
dstkey
);
server
.
dirty
++
;
}
/* Iterate all the elements of all the sets, add every element a single
* time to the result set */
for
(
j
=
0
;
j
<
setsnum
;
j
++
)
{
if
(
op
==
REDIS_OP_DIFF
&&
j
==
0
&&
!
dv
[
j
])
break
;
/* result set is empty */
if
(
!
dv
[
j
])
continue
;
/* non existing keys are like empty sets */
di
=
dictGetIterator
(
dv
[
j
]);
...
...
@@ -3135,6 +3126,8 @@ static void sunionDiffGenericCommand(redisClient *c, robj **setskeys, int setsnu
}
}
dictReleaseIterator
(
di
);
if
(
op
==
REDIS_OP_DIFF
&&
cardinality
==
0
)
break
;
/* result set is empty */
}
/* Output the content of the resulting set, if not in STORE mode */
...
...
@@ -3152,6 +3145,13 @@ static void sunionDiffGenericCommand(redisClient *c, robj **setskeys, int setsnu
addReply
(
c
,
shared
.
crlf
);
}
dictReleaseIterator
(
di
);
}
else
{
/* If we have a target key where to store the resulting set
* create this key with the result set inside */
deleteKey
(
c
->
db
,
dstkey
);
dictAdd
(
c
->
db
->
dict
,
dstkey
,
dstset
);
incrRefCount
(
dstkey
);
server
.
dirty
++
;
}
/* Cleanup */
...
...
redis.conf
浏览文件 @
6d4371d4
...
...
@@ -16,7 +16,7 @@ port 6379
#
# bind 127.0.0.1
# Close the connection after a client is idle for N seconds
# Close the connection after a client is idle for N seconds
(0 to disable)
timeout
300
# Save the DB on disk:
...
...
test-redis.tcl
浏览文件 @
6d4371d4
...
...
@@ -481,6 +481,11 @@ proc main {server port} {
lsort
[
$r
smembers setres
]
}
[
lsort -uniq
"
[
$r
smembers set1
]
[
$r
smembers set2
]
"
]
test
{
SUNIONSTORE with same src and dest
}
{
$r sunionstore set1 set1 set1
$r scard set1
}
{
1000
}
test
{
SINTER against three sets
}
{
$r sadd set3 999
$r sadd set3 995
...
...
@@ -494,6 +499,11 @@ proc main {server port} {
lsort
[
$r
smembers setres
]
}
{
995 999
}
test
{
SINTERSTORE with same src and dest
}
{
$r sinterstore set1 set1 set1
$r scard set1
}
{
1000
}
test
{
SUNION with non existing keys
}
{
lsort
[
$r
sunion nokey1 set1 set2 nokey2
]
}
[
lsort -uniq
"
[
$r
smembers set1
]
[
$r
smembers set2
]
"
]
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录