Make searches with many matches exponentially faster

djsegal · Nov 3, 2014 · 22bec9d · 22bec9d
1 parent b1f169a
commit 22bec9d
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/Classes/Controllers/PBHistorySearchController.m b/Classes/Controllers/PBHistorySearchController.m
@@ -438,23 +438,25 @@ - (void)parseBackgroundSearchResults:(NSNotification *)notification
 	[[NSNotificationCenter defaultCenter] removeObserver:self name:NSFileHandleReadToEndOfFileCompletionNotification object:[notification object]];
 	backgroundSearchTask = nil;
 
-	NSMutableIndexSet *indexes = [NSMutableIndexSet indexSet];
 	NSData *data = [[notification userInfo] valueForKey:NSFileHandleNotificationDataItem];
 
 	NSString *resultsString = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
 	NSArray *resultsArray = [resultsString componentsSeparatedByString:@"\n"];
 
+	NSMutableSet *matches = [NSMutableSet new];
 	for (NSString *resultSHA in resultsArray) {
-		NSUInteger index = 0;
-		for (PBGitCommit *commit in [commitController arrangedObjects]) {
-			if ([resultSHA isEqualToString:commit.sha.SHA]) {
-				[indexes addIndex:index];
-				break;
-			}
-			index++;
+		GTOID *resultOID = [GTOID oidWithSHA:resultSHA];
+		if (resultOID) {
+			[matches addObject:resultOID];
 		}
 	}
 
+	NSArray *arrangedObjects = [commitController arrangedObjects];
+	NSIndexSet *indexes = [arrangedObjects indexesOfObjectsPassingTest:^BOOL(id obj, NSUInteger idx, BOOL *stop) {
+		PBGitCommit *commit = obj;
+		return [matches containsObject:commit.sha];
+	}];
+
 	results = indexes;
 	[self clearProgressIndicator];
 	[self updateSelectedResult];