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
bad67913
Unverified
Commit
bad67913
authored
Mar 22, 2018
by
Salvatore Sanfilippo
Committed by
GitHub
Mar 22, 2018
Browse files
Merge pull request #4679 from youjiali1995/fix-lru
Some commands will udpate lfu-counter many times in one call.
parents
44f2cfa6
aacecbc9
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/db.c
View file @
bad67913
...
...
@@ -187,9 +187,6 @@ void dbOverwrite(redisDb *db, robj *key, robj *val) {
int
saved_lru
=
old
->
lru
;
dictReplace
(
db
->
dict
,
key
->
ptr
,
val
);
val
->
lru
=
saved_lru
;
/* LFU should be not only copied but also updated
* when a key is overwritten. */
updateLFU
(
val
);
}
else
{
dictReplace
(
db
->
dict
,
key
->
ptr
,
val
);
}
...
...
@@ -1359,7 +1356,7 @@ int *georadiusGetKeys(struct redisCommand *cmd, robj **argv, int argc, int *numk
for
(
i
=
5
;
i
<
argc
;
i
++
)
{
char
*
arg
=
argv
[
i
]
->
ptr
;
/* For the case when user specifies both "store" and "storedist" options, the
* second key specified would override the first key. This behavior is kept
* second key specified would override the first key. This behavior is kept
* the same as in georadiusCommand method.
*/
if
((
!
strcasecmp
(
arg
,
"store"
)
||
!
strcasecmp
(
arg
,
"storedist"
))
&&
((
i
+
1
)
<
argc
))
{
...
...
@@ -1380,7 +1377,7 @@ int *georadiusGetKeys(struct redisCommand *cmd, robj **argv, int argc, int *numk
if
(
num
>
1
)
{
keys
[
1
]
=
stored_key
;
}
*
numkeys
=
num
;
*
numkeys
=
num
;
return
keys
;
}
...
...
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