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
265a7e7e
Unverified
Commit
265a7e7e
authored
Jun 08, 2020
by
Salvatore Sanfilippo
Committed by
GitHub
Jun 08, 2020
Browse files
Merge pull request #7357 from soloestoy/bugfix-aof-keepttl
AOF: append origin SET if no expire option
parents
cfffda83
5d0774d6
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/aof.c
View file @
265a7e7e
...
...
@@ -611,19 +611,24 @@ void feedAppendOnlyFile(struct redisCommand *cmd, int dictid, robj **argv, int a
}
else
if
(
cmd
->
proc
==
setCommand
&&
argc
>
3
)
{
int
i
;
robj
*
exarg
=
NULL
,
*
pxarg
=
NULL
;
/* Translate SET [EX seconds][PX milliseconds] to SET and PEXPIREAT */
buf
=
catAppendOnlyGenericCommand
(
buf
,
3
,
argv
);
for
(
i
=
3
;
i
<
argc
;
i
++
)
{
if
(
!
strcasecmp
(
argv
[
i
]
->
ptr
,
"ex"
))
exarg
=
argv
[
i
+
1
];
if
(
!
strcasecmp
(
argv
[
i
]
->
ptr
,
"px"
))
pxarg
=
argv
[
i
+
1
];
}
serverAssert
(
!
(
exarg
&&
pxarg
));
if
(
exarg
)
buf
=
catAppendOnlyExpireAtCommand
(
buf
,
server
.
expireCommand
,
argv
[
1
],
exarg
);
if
(
pxarg
)
buf
=
catAppendOnlyExpireAtCommand
(
buf
,
server
.
pexpireCommand
,
argv
[
1
],
pxarg
);
if
(
exarg
||
pxarg
)
{
/* Translate SET [EX seconds][PX milliseconds] to SET and PEXPIREAT */
buf
=
catAppendOnlyGenericCommand
(
buf
,
3
,
argv
);
if
(
exarg
)
buf
=
catAppendOnlyExpireAtCommand
(
buf
,
server
.
expireCommand
,
argv
[
1
],
exarg
);
if
(
pxarg
)
buf
=
catAppendOnlyExpireAtCommand
(
buf
,
server
.
pexpireCommand
,
argv
[
1
],
pxarg
);
}
else
{
buf
=
catAppendOnlyGenericCommand
(
buf
,
argc
,
argv
);
}
}
else
{
/* All the other commands don't need translation or need the
* same translation already operated in the command vector
...
...
tests/unit/expire.tcl
View file @
265a7e7e
...
...
@@ -232,4 +232,14 @@ start_server {tags {"expire"}} {
set ttl
[
r ttl foo
]
assert
{
$ttl
<= 100 && $ttl > 90
}
}
test
{
SET - use KEEPTTL option, TTL should not be removed after loadaof
}
{
r config set appendonly yes
r set foo bar EX 100
r set foo bar2 KEEPTTL
after 2000
r debug loadaof
set ttl
[
r ttl foo
]
assert
{
$ttl
<= 98 && $ttl > 90
}
}
}
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