Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
fc96409f
Commit
fc96409f
authored
Dec 20, 2011
by
antirez
Browse files
Merge remote-tracking branch 'origin/unstable' into aof-fixes
parents
087f4140
0e59a947
Changes
7
Hide whitespace changes
Inline
Side-by-side
src/ae.c
View file @
fc96409f
...
...
@@ -86,6 +86,8 @@ aeEventLoop *aeCreateEventLoop(int setsize) {
void
aeDeleteEventLoop
(
aeEventLoop
*
eventLoop
)
{
aeApiFree
(
eventLoop
);
zfree
(
eventLoop
->
events
);
zfree
(
eventLoop
->
fired
);
zfree
(
eventLoop
);
}
...
...
src/ae_epoll.c
View file @
fc96409f
...
...
@@ -13,7 +13,7 @@ static int aeApiCreate(aeEventLoop *eventLoop) {
aeApiState
*
state
=
zmalloc
(
sizeof
(
aeApiState
));
if
(
!
state
)
return
-
1
;
state
->
events
=
zmalloc
(
sizeof
(
epoll_event
)
*
eventLoop
->
setsize
);
state
->
events
=
zmalloc
(
sizeof
(
struct
epoll_event
)
*
eventLoop
->
setsize
);
if
(
!
state
->
events
)
{
zfree
(
state
);
return
-
1
;
...
...
src/networking.c
View file @
fc96409f
...
...
@@ -997,8 +997,12 @@ sds getAllClientsInfoString(void) {
listRewind
(
server
.
clients
,
&
li
);
while
((
ln
=
listNext
(
&
li
))
!=
NULL
)
{
sds
cs
;
client
=
listNodeValue
(
ln
);
o
=
sdscatsds
(
o
,
getClientInfoString
(
client
));
cs
=
getClientInfoString
(
client
);
o
=
sdscatsds
(
o
,
cs
);
sdsfree
(
cs
);
o
=
sdscatlen
(
o
,
"
\n
"
,
1
);
}
return
o
;
...
...
src/t_zset.c
View file @
fc96409f
...
...
@@ -76,6 +76,7 @@ zskiplistNode *zslInsert(zskiplist *zsl, double score, robj *obj) {
unsigned
int
rank
[
ZSKIPLIST_MAXLEVEL
];
int
i
,
level
;
redisAssert
(
!
isnan
(
score
));
x
=
zsl
->
header
;
for
(
i
=
zsl
->
level
-
1
;
i
>=
0
;
i
--
)
{
/* store rank that is crossed to reach the insert position */
...
...
src/version.h
View file @
fc96409f
#define REDIS_VERSION "2.9.
1
"
#define REDIS_VERSION "2.9.
2
"
tests/test_helper.tcl
View file @
fc96409f
...
...
@@ -34,6 +34,7 @@ set ::all_tests {
unit/slowlog
unit/scripting
unit/maxmemory
unit/introspection
}
# Index to the next test to run in the ::all_tests list.
set ::next_test 0
...
...
tests/unit/introspection.tcl
0 → 100644
View file @
fc96409f
start_server
{
tags
{
"introspection"
}}
{
test
{
CLIENT LIST
}
{
r client list
}
{
*addr=*:* fd=* idle=* flags=N db=9 sub=0 psub=0 qbuf=0 obl=0 oll=0 events=r cmd=client*
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment