feat: Implement GEORADIUSBYMEMBER_RO command (#5726)

Signed-off-by: Eric <[email protected]>

Author: EricHayter

src/server/geo_family.cc

@@ -685,7 +685,8 @@ void GeoFamily::GeoSearch(CmdArgList args, const CommandContext& cmd_cntx) {
   GeoSearchStoreGeneric(cmd_cntx.tx, builder, shape, key, member, geo_ops);
 }
 
-void GeoFamily::GeoRadiusByMember(CmdArgList args, const CommandContext& cmd_cntx) {
+void GeoFamily::GeoRadiusByMemberGeneric(CmdArgList args, const CommandContext& cmd_cntx,
+                                         bool read_only) {
   GeoShape shape = {};
   GeoSearchOpts geo_ops;
   // parse arguments
@@ -737,7 +738,7 @@ void GeoFamily::GeoRadiusByMember(CmdArgList args, const CommandContext& cmd_cnt
       geo_ops.withdist = true;
     } else if (cur_arg == "WITHHASH") {
       geo_ops.withhash = true;
-    } else if (cur_arg == "STORE") {
+    } else if (cur_arg == "STORE" && !read_only) {
       if (geo_ops.store != GeoStoreType::kNoStore) {
         return builder->SendError(kStoreTypeErr);
       }
@@ -748,7 +749,7 @@ void GeoFamily::GeoRadiusByMember(CmdArgList args, const CommandContext& cmd_cnt
       } else {
         return builder->SendError(kSyntaxErr);
       }
-    } else if (cur_arg == "STOREDIST") {
+    } else if (cur_arg == "STOREDIST" && !read_only) {
       if (geo_ops.store != GeoStoreType::kNoStore) {
         return builder->SendError(kStoreTypeErr);
       }
@@ -773,6 +774,14 @@ void GeoFamily::GeoRadiusByMember(CmdArgList args, const CommandContext& cmd_cnt
   GeoSearchStoreGeneric(cmd_cntx.tx, builder, shape, key, member, geo_ops);
 }
 
+void GeoFamily::GeoRadiusByMember(CmdArgList args, const CommandContext& cmd_cntx) {
+  GeoRadiusByMemberGeneric(args, cmd_cntx, false);
+}
+
+void GeoFamily::GeoRadiusByMemberRO(CmdArgList args, const CommandContext& cmd_cntx) {
+  GeoRadiusByMemberGeneric(args, cmd_cntx, true);
+}
+
 void GeoFamily::GeoRadiusGeneric(CmdArgList args, const CommandContext& cmd_cntx, bool read_only) {
   GeoShape shape = {};
   GeoSearchOpts geo_ops;
@@ -893,6 +902,7 @@ constexpr uint32_t kGeoPos = READ | GEO | SLOW;
 constexpr uint32_t kGeoDist = READ | GEO | SLOW;
 constexpr uint32_t kGeoSearch = READ | GEO | SLOW;
 constexpr uint32_t kGeoRadiusByMember = WRITE | GEO | SLOW;
+constexpr uint32_t kGeoRadiusByMemberRO = READ | GEO | SLOW;
 constexpr uint32_t kGeoRadius = WRITE | GEO | SLOW;
 constexpr uint32_t kGeoRadiusRO = READ | GEO | SLOW;
 }  // namespace acl
@@ -907,6 +917,8 @@ void GeoFamily::Register(CommandRegistry* registry) {
       << CI{"GEOSEARCH", CO::READONLY, -7, 1, 1, acl::kGeoSearch}.HFUNC(GeoSearch)
       << CI{"GEORADIUSBYMEMBER", CO::WRITE | CO::STORE_LAST_KEY, -5, 1, 1, acl::kGeoRadiusByMember}
              .HFUNC(GeoRadiusByMember)
+      << CI{"GEORADIUSBYMEMBER_RO", CO::READONLY, -5, 1, 1, acl::kGeoRadiusByMemberRO}.HFUNC(
+             GeoRadiusByMemberRO)
       << CI{"GEORADIUS", CO::WRITE | CO::STORE_LAST_KEY, -6, 1, 1, acl::kGeoRadius}.HFUNC(GeoRadius)
       << CI{"GEORADIUS_RO", CO::READONLY, -6, 1, 1, acl::kGeoRadiusRO}.HFUNC(GeoRadiusRO);
 }

src/server/geo_family.h

@@ -21,7 +21,10 @@ class GeoFamily {
   static void GeoPos(CmdArgList args, const CommandContext& cmd_cntx);
   static void GeoDist(CmdArgList args, const CommandContext& cmd_cntx);
   static void GeoSearch(CmdArgList args, const CommandContext& cmd_cntx);
+  static void GeoRadiusByMemberGeneric(CmdArgList args, const CommandContext& cmd_cntx,
+                                       bool read_only);
   static void GeoRadiusByMember(CmdArgList args, const CommandContext& cmd_cntx);
+  static void GeoRadiusByMemberRO(CmdArgList args, const CommandContext& cmd_cntx);
   static void GeoRadiusGeneric(CmdArgList args, const CommandContext& cmd_cntx, bool read_only);
   static void GeoRadius(CmdArgList args, const CommandContext& cmd_cntx);
   static void GeoRadiusRO(CmdArgList args, const CommandContext& cmd_cntx);

src/server/geo_family_test.cc

@@ -242,6 +242,34 @@ TEST_F(GeoFamilyTest, GeoRadiusByMember) {
   EXPECT_THAT(resp, ErrArg(err));
 }
 
+TEST_F(GeoFamilyTest, GeoRadiusByMemberRO) {
+  EXPECT_EQ(10, CheckedInt({"geoadd",  "Europe",    "13.4050", "52.5200", "Berlin",   "3.7038",
+                            "40.4168", "Madrid",    "9.1427",  "38.7369", "Lisbon",   "2.3522",
+                            "48.8566", "Paris",     "16.3738", "48.2082", "Vienna",   "4.8952",
+                            "52.3702", "Amsterdam", "10.7522", "59.9139", "Oslo",     "23.7275",
+                            "37.9838", "Athens",    "19.0402", "47.4979", "Budapest", "6.2603",
+                            "53.3498", "Dublin"}));
+
+  auto resp =
+      Run({"GEORADIUSBYMEMBER_RO", "Europe", "Madrid", "700", "KM", "WITHCOORD", "WITHDIST"});
+  EXPECT_THAT(
+      resp,
+      RespArray(ElementsAre(
+          RespArray(ElementsAre(
+              "Madrid", "0", RespArray(ElementsAre("3.7038007378578186", "40.416799319406216")))),
+          RespArray(
+              ElementsAre("Lisbon", "502.20769462704084",
+                          RespArray(ElementsAre("9.142698347568512", "38.736900197448534")))))));
+
+  // GEORADIUSBYMEMBER_RO should not accept arguments for storing (writing data)
+  resp =
+      Run({"GEORADIUSBYMEMBER_RO", "Europe", "Madrid", "700", "KM", "STOREDIST", "store_dist_key"});
+  EXPECT_THAT(resp, ErrArg("syntax error"));
+
+  resp = Run({"GEORADIUSBYMEMBER_RO", "Europe", "Madrid", "700", "KM", "STORE", "store_key"});
+  EXPECT_THAT(resp, ErrArg("syntax error"));
+}
+
 TEST_F(GeoFamilyTest, GeoRadius) {
   EXPECT_EQ(10, CheckedInt({"geoadd",  "Europe",    "13.4050", "52.5200", "Berlin",   "3.7038",
                             "40.4168", "Madrid",    "9.1427",  "38.7369", "Lisbon",   "2.3522",