synced/dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly.git synced 2025-03-14 10:01:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: huge TTL in RESTORE cmd is rounded to kMaxExpireDeadlineMs (#4589)

Browse Source
This commit is contained in:
Borys
2025-02-11 14:11:38 +02:00
committed by GitHub
parent a56b129f69
commit a371609e83
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/generic_family.cc
View File

@ -106,9 +106,9 @@ class InMemSource : public ::io::Source {
class RestoreArgs {
private:
static constexpr time_t NO_EXPIRATION = 0;
static constexpr int64_t NO_EXPIRATION = 0;
time_t expiration_ = NO_EXPIRATION;
int64_t expiration_ = NO_EXPIRATION;
bool abs_time_ = false;
bool replace_ = false; // if true, over-ride existing key
bool sticky_ = false;
@ -116,7 +116,7 @@ class RestoreArgs {
public:
RestoreArgs() = default;
RestoreArgs(time_t expiration, bool abs_time, bool replace)
RestoreArgs(int64_t expiration, bool abs_time, bool replace)
: expiration_(expiration), abs_time_(abs_time), replace_(replace) {
}
@ -231,7 +231,7 @@ OpResult<DbSlice::AddOrFindResult> RdbRestoreValue::Add(string_view key, string_
if (HasExpiration()) {
int64_t ttl = abs_time_ ? expiration_ - now_msec : expiration_;
if (ttl > kMaxExpireDeadlineMs)
return false;
ttl = kMaxExpireDeadlineMs;
expiration_ = ttl < 0 ? -1 : ttl + now_msec;
}
@ -321,7 +321,7 @@ class Renamer {
struct SerializedValue {
std::string value;
std::optional<RdbVersion> version;
time_t expire_ts;
int64_t expire_ts;
bool sticky;
};

7
src/server/string_family_test.cc
View File

@ -528,6 +528,13 @@ TEST_F(StringFamilyTest, IncrByFloat) {
EXPECT_EQ(resp, "3.566");
}
TEST_F(StringFamilyTest, RestoreHighTTL) {
Run({"SET", "X", "1"});
auto buffer = Run({"DUMP", "X"}).GetBuf();
Run({"DEL", "X"});
EXPECT_EQ(Run({"RESTORE", "X", "5430186761345", ToSV(buffer)}), "OK");
}
TEST_F(StringFamilyTest, SetNx) {
// Make sure that we "screen out" invalid parameters for this command
// this is important as it uses similar path as the "normal" set