Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
namespace launchdarkly::server_side::data_components {

void ExpirationTracker::Add(std::string const& key, TimePoint expiration) {
unscoped_.insert({key, expiration});
unscoped_.insert_or_assign(key, expiration);
}

void ExpirationTracker::Remove(std::string const& key) {
Expand Down Expand Up @@ -87,8 +87,9 @@ ExpirationTracker::TrackState ExpirationTracker::State(TimePoint expiration,
void ExpirationTracker::ScopedTtls::Set(DataKind kind,
std::string const& key,
TimePoint expiration) {
data_[static_cast<std::underlying_type_t<DataKind>>(kind)].Data().insert(
{key, expiration});
data_[static_cast<std::underlying_type_t<DataKind>>(kind)]
.Data()
.insert_or_assign(key, expiration);
}

void ExpirationTracker::ScopedTtls::Remove(DataKind kind,
Expand Down
14 changes: 14 additions & 0 deletions libs/server-sdk/tests/expiration_tracker_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -119,3 +119,17 @@ TEST(ExpirationTrackerTest, CanPrune) {
EXPECT_EQ(ExpirationTracker::TrackState::kFresh,
tracker.State(DataKind::kSegment, "freshSegment", Second(80)));
}

TEST(ExpirationTrackerTest, CanUpdateExistingExpiry) {
ExpirationTracker tracker;

for (std::size_t seconds = 1; seconds < 10; seconds++) {
auto const now = Second(seconds - 1);
auto const expiry = Second(seconds);

tracker.Add("Potato", expiry);
EXPECT_EQ(ExpirationTracker::TrackState::kFresh,
tracker.State("Potato", now));
ASSERT_TRUE(tracker.Prune(now).empty());
}
}