Fixed faiss tests to work with writeIndex

Signed-off-by: Andrew Klepchick <[email protected]>
opensearch-project · Aug 2, 2024 · 4121df7 · 4121df7
1 parent 7894e40
commit 4121df7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/jni/tests/faiss_index_service_test.cpp b/jni/tests/faiss_index_service_test.cpp
@@ -66,7 +66,7 @@ TEST(CreateIndexTest, BasicAssertions) {
     knn_jni::faiss_wrapper::IndexService indexService(std::move(mockFaissMethods));
     long indexAddress = indexService.initIndex(&mockJNIUtil, jniEnv, metricType, indexDescription, dim, numIds, threadCount, parametersMap);
     indexService.insertToIndex(dim, numIds, threadCount, (int64_t) &vectors, ids, indexAddress);
-    indexService.writeIndex(threadCount, indexPath, indexAddress);
+    indexService.writeIndex(indexPath, indexAddress);
 }
 
 TEST(CreateBinaryIndexTest, BasicAssertions) {
@@ -112,5 +112,5 @@ TEST(CreateBinaryIndexTest, BasicAssertions) {
     knn_jni::faiss_wrapper::BinaryIndexService indexService(std::move(mockFaissMethods));
     long indexAddress = indexService.initIndex(&mockJNIUtil, jniEnv, metricType, indexDescription, dim, numIds, threadCount, parametersMap);
     indexService.insertToIndex(dim, numIds, threadCount, (int64_t) &vectors, ids, indexAddress);
-    indexService.writeIndex(threadCount, indexPath, indexAddress);
+    indexService.writeIndex(indexPath, indexAddress);
 }
diff --git a/jni/tests/faiss_wrapper_test.cpp b/jni/tests/faiss_wrapper_test.cpp
@@ -62,7 +62,7 @@ void createIndexIteratively(
         }
         knn_jni::faiss_wrapper::InsertToIndex(JNIUtil, jniEnv, reinterpret_cast<jintArray>(&insertIds), (jlong)&insertVecs, dim, index_ptr, 0, indexService);
     }
-    knn_jni::faiss_wrapper::WriteIndex(JNIUtil, jniEnv, (jstring)&indexPath, index_ptr, 0, indexService);
+    knn_jni::faiss_wrapper::WriteIndex(JNIUtil, jniEnv, (jstring)&indexPath, index_ptr, indexService);
 }
 
 void createBinaryIndexIteratively(
@@ -93,7 +93,7 @@ void createBinaryIndexIteratively(
         }
         knn_jni::faiss_wrapper::InsertToIndex(JNIUtil, jniEnv, reinterpret_cast<jintArray>(&insertIds), (jlong)&insertVecs, dim, index_ptr, 0, indexService);
     }
-    knn_jni::faiss_wrapper::WriteIndex(JNIUtil, jniEnv, (jstring)&indexPath, index_ptr, 0, indexService);
+    knn_jni::faiss_wrapper::WriteIndex(JNIUtil, jniEnv, (jstring)&indexPath, index_ptr, indexService);
 }
 
 TEST(FaissCreateIndexTest, BasicAssertions) {
@@ -132,7 +132,7 @@ TEST(FaissCreateIndexTest, BasicAssertions) {
         .Times(1);
     EXPECT_CALL(mockIndexService, insertToIndex(dim, numIds / insertions, 0, _, _, _))
         .Times(insertions);
-    EXPECT_CALL(mockIndexService, writeIndex(0, indexPath, _))
+    EXPECT_CALL(mockIndexService, writeIndex(indexPath, _))
         .Times(1);
 
     createIndexIteratively(&mockJNIUtil, jniEnv, ids, vectors, dim, indexPath, parametersMap, &mockIndexService, insertions);
@@ -174,7 +174,7 @@ TEST(FaissCreateBinaryIndexTest, BasicAssertions) {
         .Times(1);
     EXPECT_CALL(mockIndexService, insertToIndex(dim, numIds / insertions, 0, _, _, _))
         .Times(insertions);
-    EXPECT_CALL(mockIndexService, writeIndex(0, indexPath, _))
+    EXPECT_CALL(mockIndexService, writeIndex(indexPath, _))
         .Times(1);
 
     // This method calls delete vectors at the end

diff --git a/jni/tests/mocks/faiss_index_service_mock.h b/jni/tests/mocks/faiss_index_service_mock.h
@@ -52,7 +52,6 @@ class MockIndexService : public IndexService {
         void,
         writeIndex,
         (
-            int threadCount,
             std::string indexPath,
             long indexPtr
         ),