hset_family: Specify keepttl when incrementing a field value

Signed-off-by: Abhijat Malviya <[email protected]>

Author: abhijat

src/server/hset_family.cc

@@ -122,7 +122,7 @@ struct HMapWrap {
   }
 
   void AddOrUpdate(std::string_view key, std::string_view value) {
-    Overloaded ov{[&](StringMap* sm) { sm->AddOrUpdate(key, value); },
+    Overloaded ov{[&](StringMap* sm) { sm->AddOrUpdate(key, value, UINT32_MAX, true); },
                   [&](detail::ListpackWrap& lw) { lw.Insert(key, value, false); }};
     VisitMut(ov);
   }
@@ -320,7 +320,7 @@ OpStatus OpIncrBy(const OpArgs& op_args, string_view key, string_view field, Inc
   optional<string_view> res;
   if (!add_res.is_new) {
     if (auto it = hw.Find(field); it)
-      res = (*it).second;
+      res = it->second;
   }
 
   if (OpStatus status = IncrementValue(res, param); status != OpStatus::OK)

src/server/hset_family_test.cc

@@ -190,6 +190,22 @@ TEST_F(HSetFamilyTest, HIncrRespected) {
   EXPECT_EQ(11, CheckedInt({"hget", "key", "a"}));
 }
 
+TEST_F(HSetFamilyTest, HIncrCmdsPreserveTtl) {
+  Run({"hsetex", "key", "5", "a", "1"});
+  EXPECT_EQ(5, CheckedInt({"fieldttl", "key", "a"}));
+  EXPECT_EQ(2, CheckedInt({"hincrby", "key", "a", "1"}));
+  EXPECT_EQ(5, CheckedInt({"fieldttl", "key", "a"}));
+
+  // If the field has already expired by the time hincrby runs, the TTL is default
+  AdvanceTime(5 * 1000);
+  EXPECT_EQ(1, CheckedInt({"hincrby", "key", "a", "1"}));
+  EXPECT_EQ(-1, CheckedInt({"fieldttl", "key", "a"}));
+
+  Run({"hsetex", "key", "5", "fl", "1.1"});
+  EXPECT_EQ(5, CheckedInt({"fieldttl", "key", "fl"}));
+  EXPECT_EQ("2.2", Run({"hincrbyfloat", "key", "fl", "1.1"}));
+}
+
 TEST_F(HSetFamilyTest, HScan) {
   auto resp = Run("hscan non-existing-key 100 count 5");
   ASSERT_THAT(resp, ArgType(RespExpr::ARRAY));