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
83b1092c
Commit
83b1092c
authored
May 01, 2012
by
Salvatore Sanfilippo
Browse files
Merge pull request #488 from pietern/2.6-safekeys
Use safe dictionary iterator from KEYS (fixes #487)
parents
8f984bef
9311d2b5
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/db.c
View file @
83b1092c
...
@@ -255,7 +255,7 @@ void keysCommand(redisClient *c) {
...
@@ -255,7 +255,7 @@ void keysCommand(redisClient *c) {
unsigned
long
numkeys
=
0
;
unsigned
long
numkeys
=
0
;
void
*
replylen
=
addDeferredMultiBulkLength
(
c
);
void
*
replylen
=
addDeferredMultiBulkLength
(
c
);
di
=
dictGetIterator
(
c
->
db
->
dict
);
di
=
dictGet
Safe
Iterator
(
c
->
db
->
dict
);
allkeys
=
(
pattern
[
0
]
==
'*'
&&
pattern
[
1
]
==
'\0'
);
allkeys
=
(
pattern
[
0
]
==
'*'
&&
pattern
[
1
]
==
'\0'
);
while
((
de
=
dictNext
(
di
))
!=
NULL
)
{
while
((
de
=
dictNext
(
di
))
!=
NULL
)
{
sds
key
=
dictGetKey
(
de
);
sds
key
=
dictGetKey
(
de
);
...
...
tests/unit/expire.tcl
View file @
83b1092c
...
@@ -141,4 +141,15 @@ start_server {tags {"expire"}} {
...
@@ -141,4 +141,15 @@ start_server {tags {"expire"}} {
set size2
[
r dbsize
]
set size2
[
r dbsize
]
list $size1 $size2
list $size1 $size2
}
{
3 0
}
}
{
3 0
}
test
{
5 keys in, 5 keys out
}
{
r flushdb
r set a c
r expire a 5
r set t c
r set e c
r set s c
r set foo b
lsort
[
r keys *
]
}
{
a e foo s t
}
}
}
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