[8.2] MOD-12371: Add invalid option for hybrid policy (#852)

MOD-12371: Add invalid option for hybrid policy (#848)

* Add invalid option for hybrid policy and expose it in vec_sim_common.h for external use

* Test VECSIM_POLICY_INVALID

* Change hard coded strings to use new macros

* Format

(cherry picked from commit 5f20db1)

Co-authored-by: Itzikvaknin <82322982+Itzikvaknin@users.noreply.github.com>

Author: github-actions[bot]

src/VecSim/vec_sim.cpp

@@ -152,10 +152,12 @@ static VecSimResolveCode _ResolveParams_HybridPolicy(VecSimRawParam rparam,
     if (qparams->searchMode != 0) {
         return VecSimParamResolverErr_AlreadySet;
     }
-    if (!strcasecmp(rparam.value, "batches")) {
+    if (!strcasecmp(rparam.value, VECSIM_POLICY_BATCHES)) {
         qparams->searchMode = HYBRID_BATCHES;
-    } else if (!strcasecmp(rparam.value, "adhoc_bf")) {
+    } else if (!strcasecmp(rparam.value, VECSIM_POLICY_ADHOC_BF)) {
         qparams->searchMode = HYBRID_ADHOC_BF;
+    } else if (!strcasecmp(rparam.value, VECSIM_POLICY_INVALID)) {
+        return VecSimParamResolverErr_InvalidPolicy_NExits;
     } else {
         return VecSimParamResolverErr_InvalidPolicy_NExits;
     }

src/VecSim/vec_sim_common.h

@@ -22,6 +22,11 @@ extern "C" {
 #define INVALID_LABEL      SIZE_MAX
 #define UNUSED(x)          (void)(x)
 
+// Hybrid policy values
+#define VECSIM_POLICY_ADHOC_BF "adhoc_bf"
+#define VECSIM_POLICY_BATCHES  "batches"
+#define VECSIM_POLICY_INVALID  "invalid_policy"
+
 // HNSW default parameters
 #define HNSW_DEFAULT_M       16
 #define HNSW_DEFAULT_EF_C    200

tests/unit/test_common.cpp

@@ -95,8 +95,17 @@ TYPED_TEST(CommonIndexTest, ResolveQueryRuntimeParams) {
                                         QUERY_TYPE_HYBRID),
               VecSimParamResolverErr_InvalidPolicy_NExits);
 
-    rparams[1].value = "batches";
-    rparams[1].valLen = strlen("batches");
+    rparams[1] = (VecSimRawParam){.name = "HYBRID_POLICY",
+                                  .nameLen = strlen("HYBRID_POLICY"),
+                                  .value = VECSIM_POLICY_INVALID,
+                                  .valLen = strlen(VECSIM_POLICY_INVALID)};
+
+    ASSERT_EQ(VecSimIndex_ResolveParams(index, rparams.data(), rparams.size(), &qparams,
+                                        QUERY_TYPE_HYBRID),
+              VecSimParamResolverErr_InvalidPolicy_NExits);
+
+    rparams[1].value = VECSIM_POLICY_BATCHES;
+    rparams[1].valLen = strlen(VECSIM_POLICY_BATCHES);
     ASSERT_EQ(VecSimIndex_ResolveParams(index, rparams.data(), rparams.size(), &qparams,
                                         QUERY_TYPE_HYBRID),
               VecSim_OK);
@@ -106,8 +115,8 @@ TYPED_TEST(CommonIndexTest, ResolveQueryRuntimeParams) {
     // Both params are "hybrid policy".
     rparams[0] = (VecSimRawParam){.name = "HYBRID_POLICY",
                                   .nameLen = strlen("HYBRID_POLICY"),
-                                  .value = "ADhOC_bf",
-                                  .valLen = strlen("ADhOC_bf")};
+                                  .value = VECSIM_POLICY_ADHOC_BF,
+                                  .valLen = strlen(VECSIM_POLICY_ADHOC_BF)};
     ASSERT_EQ(VecSimIndex_ResolveParams(index, rparams.data(), rparams.size(), &qparams,
                                         QUERY_TYPE_HYBRID),
               VecSimParamResolverErr_AlreadySet);
@@ -128,8 +137,8 @@ TYPED_TEST(CommonIndexTest, ResolveQueryRuntimeParams) {
 
     rparams[0] = (VecSimRawParam){.name = "HYBRID_POLICY",
                                   .nameLen = strlen("HYBRID_POLICY"),
-                                  .value = "batches",
-                                  .valLen = strlen("batches")};
+                                  .value = VECSIM_POLICY_BATCHES,
+                                  .valLen = strlen(VECSIM_POLICY_BATCHES)};
     ASSERT_EQ(VecSimIndex_ResolveParams(index, rparams.data(), rparams.size(), &qparams,
                                         QUERY_TYPE_HYBRID),
               VecSim_OK);