Merge pull request #440 from rupertdaniel/fts-add-transaction-to-hand…

…ler-block Fts add transaction to handler blocks
yapstudios · Mar 8, 2018 · 9ac1bce · 9ac1bce
2 parents 15c3145 + db05d87
commit 9ac1bce
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 16 deletions.
diff --git a/Testing/UnitTesting/TestYapDatabaseFullTextSearch.m b/Testing/UnitTesting/TestYapDatabaseFullTextSearch.m
@@ -50,7 +50,7 @@ - (void)test
 	YapDatabaseConnection *connection = [database newConnection];
 
 	YapDatabaseFullTextSearchHandler *handler = [YapDatabaseFullTextSearchHandler withObjectBlock:
-	    ^(NSMutableDictionary *dict, NSString *collection, NSString *key, id object){
+	    ^(YapDatabaseReadTransaction *transaction, NSMutableDictionary *dict, NSString *collection, NSString *key, id object){
 
 		[dict setObject:object forKey:@"content"];
 	}];
@@ -169,7 +169,7 @@ - (void)testSnippet
 	YapDatabaseConnection *connection = [database newConnection];
 
 	YapDatabaseFullTextSearchHandler *handler = [YapDatabaseFullTextSearchHandler withObjectBlock:
-	    ^(NSMutableDictionary *dict, NSString *collection, NSString *key, id object){
+	    ^(YapDatabaseReadTransaction *transaction, NSMutableDictionary *dict, NSString *collection, NSString *key, id object){
 
 		[dict setObject:object forKey:@"content"];
 	}];

diff --git a/Testing/UnitTesting/TestYapDatabaseSearchResultsView.m b/Testing/UnitTesting/TestYapDatabaseSearchResultsView.m
@@ -169,7 +169,7 @@ - (void)_test1_parentView_withPath:(NSString *)databasePath
 	// Setup FTS
 
 	YapDatabaseFullTextSearchHandler *handler = [YapDatabaseFullTextSearchHandler withObjectBlock:
-	    ^(NSMutableDictionary *dict, NSString *collection, NSString *key, id object){
+	    ^(YapDatabaseReadTransaction *transaction, NSMutableDictionary *dict, NSString *collection, NSString *key, id object){
 
 		[dict setObject:object forKey:@"content"];
 	}];
@@ -259,7 +259,7 @@ - (void)_test1_blocks_withPath:(NSString *)databasePath
 	// Setup FTS
 
 	YapDatabaseFullTextSearchHandler *handler = [YapDatabaseFullTextSearchHandler withObjectBlock:
-	    ^(NSMutableDictionary *dict, NSString *collection, NSString *key, id object){
+	    ^(YapDatabaseReadTransaction *transaction, NSMutableDictionary *dict, NSString *collection, NSString *key, id object){
 
 		[dict setObject:object forKey:@"content"];
 	}];

diff --git a/YapDatabase/Extensions/FullTextSearch/YapDatabaseFullTextSearchHandler.h b/YapDatabase/Extensions/FullTextSearch/YapDatabaseFullTextSearchHandler.h
@@ -1,6 +1,8 @@
 #import <Foundation/Foundation.h>
 #import "YapDatabaseExtensionTypes.h"
 
+@class YapDatabaseReadTransaction;
+
 NS_ASSUME_NONNULL_BEGIN
 
 /**
@@ -22,16 +24,16 @@ NS_ASSUME_NONNULL_BEGIN
 typedef id YapDatabaseFullTextSearchBlock; // One of YapDatabaseFullTextSearchXBlock types
 
 typedef void (^YapDatabaseFullTextSearchWithKeyBlock)
-                            (NSMutableDictionary *dict, NSString *collection, NSString *key);
+                            (YapDatabaseReadTransaction *transaction, NSMutableDictionary *dict, NSString *collection, NSString *key);
 
 typedef void (^YapDatabaseFullTextSearchWithObjectBlock)
-                            (NSMutableDictionary *dict, NSString *collection, NSString *key, id object);
+                            (YapDatabaseReadTransaction *transaction, NSMutableDictionary *dict, NSString *collection, NSString *key, id object);
 
 typedef void (^YapDatabaseFullTextSearchWithMetadataBlock)
-                            (NSMutableDictionary *dict, NSString *collection, NSString *key, __nullable id metadata);
+                            (YapDatabaseReadTransaction *transaction, NSMutableDictionary *dict, NSString *collection, NSString *key, __nullable id metadata);
 
 typedef void (^YapDatabaseFullTextSearchWithRowBlock)
-                            (NSMutableDictionary *dict, NSString *collection, NSString *key, id object, __nullable id metadata);
+                            (YapDatabaseReadTransaction *transaction, NSMutableDictionary *dict, NSString *collection, NSString *key, id object, __nullable id metadata);
 
 + (instancetype)withKeyBlock:(YapDatabaseFullTextSearchWithKeyBlock)block;
 + (instancetype)withObjectBlock:(YapDatabaseFullTextSearchWithObjectBlock)block;

diff --git a/YapDatabase/Extensions/FullTextSearch/YapDatabaseFullTextSearchTransaction.m b/YapDatabase/Extensions/FullTextSearch/YapDatabaseFullTextSearchTransaction.m
@@ -246,7 +246,7 @@ - (BOOL)populate
 		[databaseTransaction _enumerateKeysInAllCollectionsUsingBlock:
 		    ^(int64_t rowid, NSString *collection, NSString *key, BOOL __unused *stop) {
 
-			block(parentConnection->blockDict, collection, key);
+			block(databaseTransaction, parentConnection->blockDict, collection, key);
 
 			if ([parentConnection->blockDict count] > 0)
 			{
@@ -263,7 +263,7 @@ - (BOOL)populate
 		[databaseTransaction _enumerateKeysAndObjectsInAllCollectionsUsingBlock:
 		    ^(int64_t rowid, NSString *collection, NSString *key, id object, BOOL __unused *stop) {
 
-			block(parentConnection->blockDict, collection, key, object);
+			block(databaseTransaction, parentConnection->blockDict, collection, key, object);
 
 			if ([parentConnection->blockDict count] > 0)
 			{
@@ -280,7 +280,7 @@ - (BOOL)populate
 		[databaseTransaction _enumerateKeysAndMetadataInAllCollectionsUsingBlock:
 		    ^(int64_t rowid, NSString *collection, NSString *key, id metadata, BOOL __unused *stop) {
 
-			block(parentConnection->blockDict, collection, key, metadata);
+			block(databaseTransaction, parentConnection->blockDict, collection, key, metadata);
 
 			if ([parentConnection->blockDict count] > 0)
 			{
@@ -297,7 +297,7 @@ - (BOOL)populate
 		[databaseTransaction _enumerateRowsInAllCollectionsUsingBlock:
 		    ^(int64_t rowid, NSString *collection, NSString *key, id object, id metadata, BOOL __unused *stop) {
 
-			block(parentConnection->blockDict, collection, key, object, metadata);
+			block(databaseTransaction, parentConnection->blockDict, collection, key, object, metadata);
 
 			if ([parentConnection->blockDict count] > 0)
 			{
@@ -573,28 +573,28 @@ - (void)_handleChangeWithRowid:(int64_t)rowid
 		__unsafe_unretained YapDatabaseFullTextSearchWithKeyBlock block =
 		    (YapDatabaseFullTextSearchWithKeyBlock)handler->block;
 
-		block(parentConnection->blockDict, collection, key);
+		block(databaseTransaction, parentConnection->blockDict, collection, key);
 	}
 	else if (handler->blockType == YapDatabaseBlockTypeWithObject)
 	{
 		__unsafe_unretained YapDatabaseFullTextSearchWithObjectBlock block =
 		    (YapDatabaseFullTextSearchWithObjectBlock)handler->block;
 
-		block(parentConnection->blockDict, collection, key, object);
+		block(databaseTransaction, parentConnection->blockDict, collection, key, object);
 	}
 	else if (handler->blockType == YapDatabaseBlockTypeWithMetadata)
 	{
 		__unsafe_unretained YapDatabaseFullTextSearchWithMetadataBlock block =
 		    (YapDatabaseFullTextSearchWithMetadataBlock)handler->block;
 
-		block(parentConnection->blockDict, collection, key, metadata);
+		block(databaseTransaction, parentConnection->blockDict, collection, key, metadata);
 	}
 	else
 	{
 		__unsafe_unretained YapDatabaseFullTextSearchWithRowBlock block =
 		    (YapDatabaseFullTextSearchWithRowBlock)handler->block;
 
-		block(parentConnection->blockDict, collection, key, object, metadata);
+		block(databaseTransaction, parentConnection->blockDict, collection, key, object, metadata);
 	}
 
 	if ([parentConnection->blockDict count] == 0)