Post-rebase fix

Author: rfsaliev

src/VecSim/algorithms/svs/svs.h

@@ -166,7 +166,6 @@ class SVSIndex : public VecSimIndexAbstract<svs_details::vecsim_dt<DataType>, fl
 
     int addVectorsImpl(const void *vectors_data, const labelType *labels, size_t n) {
         if (n == 0) {
-            assert(false && "Empty batch of vectors"); // This case to be enabled for TieredSVS
             return 0;
         }
 

src/VecSim/algorithms/svs/svs_tiered.h

@@ -428,9 +428,11 @@ class TieredSVSIndex : public VecSimTieredIndex<DataType, float> {
         assert(index);
         // prevent parallel updates
         std::lock_guard<std::mutex> lock(index->updateJobMutex);
+        // Release the scheduled flag to allow scheduling again
+        index->indexUpdateScheduled.clear();
+        // Update the SVS index
         index->GetSVSIndex()->setNumThreads(availableThreads);
         index->updateSVSIndex();
-        index->indexUpdateScheduled.clear();
     }
 
 #ifdef BUILD_TESTS

tests/unit/test_svs_tiered.cpp

@@ -73,7 +73,9 @@ struct SVSIndexType {
 
 // clang-format off
 using SVSDataTypeSet = ::testing::Types<SVSIndexType<VecSimType_FLOAT32, float, VecSimSvsQuant_NONE>
-                                    //   ,SVSIndexType<VecSimType_FLOAT32, float, VecSimSvsQuant_8>
+#if HAVE_SVS_LVQ
+                                       ,SVSIndexType<VecSimType_FLOAT32, float, VecSimSvsQuant_8>
+#endif
                                         >;
 // clang-format on
 
@@ -139,7 +141,7 @@ TYPED_TEST(SVSTieredIndexTest, ThreadsReservation) {
     // The number of reserved threads should be equal to requested
     ASSERT_EQ(num_reserved_threads, num_threads - 2);
 
-    // Request and more threads than available
+    // Request more threads than available
     jobs = SVSMultiThreadJob::createJobs(allocator, HNSW_INSERT_VECTOR_JOB, update_job_mock,
                                          tiered_index, num_threads + 2, timeout);
     tiered_index->submitJobs(jobs);
@@ -214,7 +216,7 @@ TYPED_TEST(SVSTieredIndexTest, addVector) {
     ASSERT_EQ(tiered_index->GetFlatIndex()->indexSize(), 1);
     ASSERT_EQ(tiered_index->GetBackendIndex()->indexSize(), 0);
     ASSERT_EQ(tiered_index->GetFlatIndex()->indexCapacity(), DEFAULT_BLOCK_SIZE);
-    ASSERT_EQ(tiered_index->indexCapacity(), DEFAULT_BLOCK_SIZE + 1);
+    ASSERT_EQ(tiered_index->indexCapacity(), DEFAULT_BLOCK_SIZE);
     ASSERT_EQ(tiered_index->GetFlatIndex()->getDistanceFrom_Unsafe(vec_label, vector), 0);
     ASSERT_EQ(mock_thread_pool.jobQ.size(), mock_thread_pool.thread_pool_size);
     // Validate that the job was created properly
@@ -264,7 +266,10 @@ TYPED_TEST(SVSTieredIndexTest, insertJob) {
     ASSERT_EQ(tiered_index->GetBackendIndex()->indexSize(), 1);
     // SVS index should have allocated a single record, while flat index should remove the
     // block.
-    ASSERT_EQ(tiered_index->indexCapacity(), DEFAULT_BLOCK_SIZE);
+    // LVQDataset does not provide a capacity method
+    const size_t expected_capacity =
+        TypeParam::get_quant_bits() > 0 ? tiered_index->indexSize() : DEFAULT_BLOCK_SIZE;
+    ASSERT_EQ(tiered_index->indexCapacity(), expected_capacity);
     ASSERT_EQ(tiered_index->GetFlatIndex()->indexCapacity(), 0);
     ASSERT_EQ(tiered_index->getDistanceFrom_Unsafe(vec_label, vector), 0);
 }
@@ -287,7 +292,7 @@ TYPED_TEST(SVSTieredIndexTest, insertJobAsync) {
         GenerateAndAddVector<TEST_DATA_T>(tiered_index, dim, i, i);
     }
 
-    mock_thread_pool.thread_pool_join();
+    mock_thread_pool.thread_pool_wait();
     ASSERT_EQ(tiered_index->indexSize(), n);
     ASSERT_EQ(mock_thread_pool.jobQ.size(), 0);
     auto sz_f = tiered_index->GetFlatIndex()->indexSize();
@@ -302,6 +307,7 @@ TYPED_TEST(SVSTieredIndexTest, insertJobAsync) {
             << "Vector label: " << i;
     }
 
+    mock_thread_pool.thread_pool_join();
     // Verify that all vectors were moved to SVS as expected
     sz_f = tiered_index->GetFlatIndex()->indexSize();
     sz_b = tiered_index->GetBackendIndex()->indexSize();