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
199e704a
Unverified
Commit
199e704a
authored
Jun 22, 2018
by
Salvatore Sanfilippo
Committed by
GitHub
Jun 22, 2018
Browse files
Merge pull request #5050 from shenlongxing/fix-typo
fix typo
parents
a16aa03a
ec55df11
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/db.c
View file @
199e704a
...
...
@@ -90,7 +90,7 @@ robj *lookupKey(redisDb *db, robj *key, int flags) {
* LOOKUP_NONE (or zero): no special flags are passed.
* LOOKUP_NOTOUCH: don't alter the last access time of the key.
*
* Note: this function also returns NULL i
s
the key is logically expired
* Note: this function also returns NULL i
f
the key is logically expired
* but still existing, in case this is a slave, since this API is called only
* for read operations. Even if the key expiry is master-driven, we can
* correctly report a key is expired on slaves even if the master is lagging
...
...
src/expire.c
View file @
199e704a
...
...
@@ -112,7 +112,7 @@ void activeExpireCycle(int type) {
if
(
type
==
ACTIVE_EXPIRE_CYCLE_FAST
)
{
/* Don't start a fast cycle if the previous cycle did not exit
* for time limt. Also don't repeat a fast cycle for the same period
* for time lim
i
t. Also don't repeat a fast cycle for the same period
* as the fast cycle total duration itself. */
if
(
!
timelimit_exit
)
return
;
if
(
start
<
last_fast_cycle
+
ACTIVE_EXPIRE_CYCLE_FAST_DURATION
*
2
)
return
;
...
...
src/module.c
View file @
199e704a
...
...
@@ -3399,7 +3399,7 @@ void RM_LogRaw(RedisModule *module, const char *levelstr, const char *fmt, va_li
*
* If the specified log level is invalid, verbose is used by default.
* There is a fixed limit to the length of the log line this function is able
* to emit, this lim
t
i is not specified but is guaranteed to be more than
* to emit, this limi
t
is not specified but is guaranteed to be more than
* a few lines of text.
*/
void
RM_Log
(
RedisModuleCtx
*
ctx
,
const
char
*
levelstr
,
const
char
*
fmt
,
...)
{
...
...
tests/unit/expire.tcl
View file @
199e704a
...
...
@@ -121,7 +121,7 @@ start_server {tags {"expire"}} {
list $a $b
}
{
somevalue
{}}
test
{
TTL returns ti
e
m to live in seconds
}
{
test
{
TTL returns tim
e
to live in seconds
}
{
r del x
r setex x 10 somevalue
set ttl
[
r ttl x
]
...
...
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