Skip to content

fix(set_family): Transfer TTL flag from DenseLink object in delete #4947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 17, 2025
Merged

fix(set_family): Transfer TTL flag from DenseLink object in delete #4947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/core/dense_set.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,6 +648,8 @@ void DenseSet::Delete(DensePtr* prev, DensePtr* ptr) {

DenseLinkKey* plink = prev->AsLink();
DensePtr tmp = DensePtr::From(plink);
// Transfer TTL flag
tmp.SetTtl(prev->HasTtl());
DCHECK(ObjectAllocSize(tmp.GetObject()));

FreeLink(plink);
Expand Down
12 changes: 12 additions & 0 deletions src/core/string_set_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,4 +767,16 @@ TEST_F(StringSetTest, ReallocIfNeeded) {
EXPECT_EQ(*ss_->Find(build_str(i * 10)), build_str(i * 10));
}

TEST_F(StringSetTest, TransferTTLFlagLinkToObjectOnDelete) {
for (size_t i = 0; i < 10; i++) {
EXPECT_TRUE(ss_->Add(absl::StrCat(i), 1));
}
for (size_t i = 0; i < 9; i++) {
EXPECT_TRUE(ss_->Erase(absl::StrCat(i)));
}
auto it = ss_->Find("9"sv);
EXPECT_TRUE(it.HasExpiry());
EXPECT_EQ(1u, it.ExpiryTime());
}

} // namespace dfly
13 changes: 13 additions & 0 deletions src/server/set_family_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,4 +412,17 @@ TEST_F(SetFamilyTest, SAddEx) {
EXPECT_THAT(Run({"saddex", "key", "KEEPTTL", "2"}), ErrArg("wrong number of arguments"));
}

TEST_F(SetFamilyTest, CheckSetLinkExpiryTransfer) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you please add an equivalent test in src/core/string_set_test.cc, @mkaruza ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added

for (int i = 0; i < 10; i++) {
EXPECT_THAT(Run({"SADDEX", "key", "5", absl::StrCat(i)}), IntArg(1));
}
for (int i = 0; i < 9; i++) {
Run({"SREM", "key", absl::StrCat(i)});
}
EXPECT_THAT(Run({"SCARD", "key"}), IntArg(1));
AdvanceTime(6000);
Run({"SMEMBERS", "key"});
EXPECT_THAT(Run({"SCARD", "key"}), IntArg(0));
}

} // namespace dfly
Loading