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
9714bba2
Commit
9714bba2
authored
Oct 04, 2018
by
Hamid Alaei
Committed by
antirez
Oct 15, 2018
Browse files
fix timer context selected database
parent
eb53f15a
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/module.c
View file @
9714bba2
...
@@ -4221,6 +4221,7 @@ typedef struct RedisModuleTimer {
...
@@ -4221,6 +4221,7 @@ typedef struct RedisModuleTimer {
RedisModule
*
module
;
/* Module reference. */
RedisModule
*
module
;
/* Module reference. */
RedisModuleTimerProc
callback
;
/* The callback to invoke on expire. */
RedisModuleTimerProc
callback
;
/* The callback to invoke on expire. */
void
*
data
;
/* Private data for the callback. */
void
*
data
;
/* Private data for the callback. */
int
dbid
;
/* Database number selected by the original client. */
}
RedisModuleTimer
;
}
RedisModuleTimer
;
/* This is the timer handler that is called by the main event loop. We schedule
/* This is the timer handler that is called by the main event loop. We schedule
...
@@ -4247,7 +4248,7 @@ int moduleTimerHandler(struct aeEventLoop *eventLoop, long long id, void *client
...
@@ -4247,7 +4248,7 @@ int moduleTimerHandler(struct aeEventLoop *eventLoop, long long id, void *client
ctx
.
module
=
timer
->
module
;
ctx
.
module
=
timer
->
module
;
ctx
.
client
=
moduleFreeContextReusedClient
;
ctx
.
client
=
moduleFreeContextReusedClient
;
selectDb
(
ctx
.
client
,
0
);
selectDb
(
ctx
.
client
,
timer
->
dbid
);
timer
->
callback
(
&
ctx
,
timer
->
data
);
timer
->
callback
(
&
ctx
,
timer
->
data
);
moduleFreeContext
(
&
ctx
);
moduleFreeContext
(
&
ctx
);
raxRemove
(
Timers
,(
unsigned
char
*
)
ri
.
key
,
ri
.
key_len
,
NULL
);
raxRemove
(
Timers
,(
unsigned
char
*
)
ri
.
key
,
ri
.
key_len
,
NULL
);
...
@@ -4272,6 +4273,7 @@ RedisModuleTimerID RM_CreateTimer(RedisModuleCtx *ctx, mstime_t period, RedisMod
...
@@ -4272,6 +4273,7 @@ RedisModuleTimerID RM_CreateTimer(RedisModuleCtx *ctx, mstime_t period, RedisMod
timer
->
module
=
ctx
->
module
;
timer
->
module
=
ctx
->
module
;
timer
->
callback
=
callback
;
timer
->
callback
=
callback
;
timer
->
data
=
data
;
timer
->
data
=
data
;
timer
->
dbid
=
ctx
->
client
->
db
->
id
;
uint64_t
expiretime
=
ustime
()
+
period
*
1000
;
uint64_t
expiretime
=
ustime
()
+
period
*
1000
;
uint64_t
key
;
uint64_t
key
;
...
...
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