Clean-up code

Author: rfsaliev

src/VecSim/algorithms/svs/svs_tiered.h

@@ -1,12 +1,3 @@
-/* TODO: change the copyright here */
-
-/*
- *Copyright Redis Ltd. 2021 - present
- *Licensed under your choice of the Redis Source Available License 2.0 (RSALv2) or
- *the Server Side Public License v1 (SSPLv1).
- */
-
-/* TODO clean the includes */
 #pragma once
 #include "VecSim/algorithms/brute_force/brute_force_single.h"
 #include "VecSim/vec_sim_tiered_index.h"
@@ -490,7 +481,6 @@ class TieredSVSIndex : public VecSimTieredIndex<DataType, float> {
         { // lock both indicies for writing - these changes to be synchronized
             std::scoped_lock lock(this->flatIndexGuard, this->mainIndexGuard);
             auto svs_index = GetSVSIndex();
-            // TODO(rfsaliev) remove below assuming that vectors had to be deleted directly
             auto deleted_num =
                 svs_index->deleteVectors(labels_to_delete.data(), labels_to_delete.size());
             assert(deleted_num == 0);

src/VecSim/vec_sim_tiered_index.h

@@ -287,7 +287,7 @@ VecSimIndexDebugInfo VecSimTieredIndex<DataType, DistType>::debugInfo() const {
     case VecSimAlgo_HNSWLIB:
         info.tieredInfo.backendInfo.hnswInfo = backendInfo.hnswInfo;
         break;
-    case VecSimAlgo_SVS: // TODO: Add SVS info.
+    case VecSimAlgo_SVS:
         break;
     case VecSimAlgo_BF:
     case VecSimAlgo_TIERED:

tests/unit/test_svs_tiered.cpp

@@ -489,44 +489,43 @@ TYPED_TEST(SVSTieredIndexTest, KNNSearch) {
     // Memory usage should not change.
     ASSERT_EQ(allocator->getAllocationSize(), cur_memory_usage);
 
-    // TODO: add timeouts support to SVS index and test it here.
-    // // // // // // // // // // // // //
-    // // Check behavior upon timeout.  //
-    // // // // // // // // // // // // //
-
-    // VecSimQueryReply *res;
-    // // Add a vector to the SVS index so there will be a reason to query it.
-    // GenerateAndAddVector<TEST_DATA_T>(svs_index, dim, n, n);
-
-    // // Set timeout callback to always return 1 (will fail while querying the flat buffer).
-    // VecSim_SetTimeoutCallbackFunction([](void *ctx) { return 1; }); // Always times out
-
-    // res = VecSimIndex_TopKQuery(tiered_index, query_0, k, nullptr, BY_SCORE);
-    // ASSERT_TRUE(res->results.empty());
-    // ASSERT_EQ(VecSimQueryReply_GetCode(res), VecSim_QueryReply_TimedOut);
-    // VecSimQueryReply_Free(res);
-
-    // // Set timeout callback to return 1 after n checks (will fail while querying the SVS index).
-    // // Brute-force index checks for timeout after each vector.
-    // size_t checks_in_flat = flat_index->indexSize();
-    // VecSimQueryParams qparams = {.timeoutCtx = &checks_in_flat};
-    // VecSim_SetTimeoutCallbackFunction([](void *ctx) {
-    //     auto count = static_cast<size_t *>(ctx);
-    //     if (*count == 0) {
-    //         return 1;
-    //     }
-    //     (*count)--;
-    //     return 0;
-    // });
-    // res = VecSimIndex_TopKQuery(tiered_index, query_0, k, &qparams, BY_SCORE);
-    // ASSERT_TRUE(res->results.empty());
-    // ASSERT_EQ(VecSimQueryReply_GetCode(res), VecSim_QueryReply_TimedOut);
-    // VecSimQueryReply_Free(res);
-    // // Make sure we didn't get the timeout in the flat index.
-    // checks_in_flat = flat_index->indexSize(); // Reset the counter.
-    // res = VecSimIndex_TopKQuery(flat_index, query_0, k, &qparams, BY_SCORE);
-    // ASSERT_EQ(VecSimQueryReply_GetCode(res), VecSim_QueryReply_OK);
-    // VecSimQueryReply_Free(res);
+    // // // // // // // // // // // //
+    // Check behavior upon timeout.  //
+    // // // // // // // // // // // //
+
+    VecSimQueryReply *res;
+    // Add a vector to the SVS index so there will be a reason to query it.
+    GenerateAndAddVector<TEST_DATA_T>(svs_index, dim, n, n);
+
+    // Set timeout callback to always return 1 (will fail while querying the flat buffer).
+    VecSim_SetTimeoutCallbackFunction([](void *ctx) { return 1; }); // Always times out
+
+    res = VecSimIndex_TopKQuery(tiered_index, query_0, k, nullptr, BY_SCORE);
+    ASSERT_TRUE(res->results.empty());
+    ASSERT_EQ(VecSimQueryReply_GetCode(res), VecSim_QueryReply_TimedOut);
+    VecSimQueryReply_Free(res);
+
+    // Set timeout callback to return 1 after n checks (will fail while querying the SVS index).
+    // Brute-force index checks for timeout after each vector.
+    size_t checks_in_flat = flat_index->indexSize();
+    VecSimQueryParams qparams = {.timeoutCtx = &checks_in_flat};
+    VecSim_SetTimeoutCallbackFunction([](void *ctx) {
+        auto count = static_cast<size_t *>(ctx);
+        if (*count == 0) {
+            return 1;
+        }
+        (*count)--;
+        return 0;
+    });
+    res = VecSimIndex_TopKQuery(tiered_index, query_0, k, &qparams, BY_SCORE);
+    ASSERT_TRUE(res->results.empty());
+    ASSERT_EQ(VecSimQueryReply_GetCode(res), VecSim_QueryReply_TimedOut);
+    VecSimQueryReply_Free(res);
+    // Make sure we didn't get the timeout in the flat index.
+    checks_in_flat = flat_index->indexSize(); // Reset the counter.
+    res = VecSimIndex_TopKQuery(flat_index, query_0, k, &qparams, BY_SCORE);
+    ASSERT_EQ(VecSimQueryReply_GetCode(res), VecSim_QueryReply_OK);
+    VecSimQueryReply_Free(res);
 
     // Clean up.
     VecSim_SetTimeoutCallbackFunction([](void *ctx) { return 0; });