CBL-5432: Vector Index API Tests 8-10 [Obj-C] (#3243)

* update litecore and fix NODISCARD * update VS extension version * fix WordModel constructor * 10 tests ready
couchbase · Mar 4, 2024 · 52ebcbb · 52ebcbb
1 parent 7b3acc3
commit 52ebcbb
Show file tree

Hide file tree

Showing 6 changed files with 321 additions and 22 deletions.
diff --git a/Objective-C/Internal/CBLCoreBridge.h b/Objective-C/Internal/CBLCoreBridge.h
@@ -43,7 +43,7 @@ class C4Transaction {
 
     ~C4Transaction() {
         if (_active)
-            c4db_endTransaction(_db, false, nullptr);
+            (void)c4db_endTransaction(_db, false, nullptr);
     }
 
     bool begin() {

diff --git a/Objective-C/Tests/Util/CBLWordEmbeddingModel.h b/Objective-C/Tests/Util/CBLWordEmbeddingModel.h
@@ -13,7 +13,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface CBLWordEmbeddingModel : NSObject <CBLPredictiveModel>
 
-- (instancetype) init: (CBLDatabase*) database;
+- (instancetype) initWithDatabase: (CBLDatabase*) database;
+
+/** Not available */
+- (instancetype) init NS_UNAVAILABLE;
 
 @end
 

diff --git a/Objective-C/Tests/Util/CBLWordEmbeddingModel.m b/Objective-C/Tests/Util/CBLWordEmbeddingModel.m
@@ -12,21 +12,27 @@ @implementation CBLWordEmbeddingModel {
     CBLDatabase* _database;
 }
 
-- (instancetype) init: (CBLDatabase*)database {
+- (instancetype) initWithDatabase: (CBLDatabase*)database {
     self = [super init];
     if (self) {
         _database = database;
     }
     return self;
 }
 
-- (NSArray*) vectorForWord: (NSString*)word collection: (NSString*)collection {
+- (CBLArray*) vectorForWord: (NSString*)word collection: (NSString*)collection {
     NSError* error;
-    NSString* sql = [NSString stringWithFormat: @"select vector from %@ where word = %@", collection, word];
+    NSString* sql = [NSString stringWithFormat: @"select vector from %@ where word = '%@'", collection, word];
     CBLQuery* q = [_database createQuery: sql error: &error];
     CBLQueryResultSet* rs = [q execute: &error];
-    NSArray* results = [rs allResults];
-    return results.count > 0 ? results[0][@"word"] : nil;
+    NSArray<CBLQueryResult*>* results = [rs allResults];
+
+    if (results.count == 0) {
+        return nil;
+    }
+
+    CBLQueryResult* result = results[0];
+    return [result arrayForKey: @"vector"];
 }
 
 
@@ -38,7 +44,7 @@ - (CBLDictionary*) predict: (CBLDictionary*)input {
         return nil;
     }
 
-    NSArray* result = [self vectorForWord: inputWord collection: @"words"];
+    CBLArray* result = [self vectorForWord: inputWord collection: @"words"];
     if (!result) {
         result = [self vectorForWord: inputWord collection: @"extwords"];
     }