motion-yapper 0.0.1 → 0.0.2

data/vendor/Pods/YapDatabase/YapDatabase/Extensions/Views/YapDatabaseViewTransaction.m

@@ -25,6 +25,10 @@
   static const int ydbLogLevel = YDB_LOG_LEVEL_WARN;
 #endif
 
+#define ExtKey_classVersion        @"classVersion"
+#define ExtKey_persistent          @"persistent"
+#define ExtKey_version_deprecated  @"version"
+#define ExtKey_versionTag          @"versionTag"
 
 /**
  * The view is tasked with storing ordered arrays of keys.
@@ -35,6 +39,13 @@
 **/
 #define YAP_DATABASE_VIEW_MAX_PAGE_SIZE 50
 
+/**
+ * Declare that this class implements YapDatabaseExtensionTransaction_Hooks protocol.
+ * This is done privately, as the protocol is internal.
+**/
+@interface YapDatabaseViewTransaction () <YapDatabaseExtensionTransaction_Hooks>
+@end
+
 /**
  * ARCHITECTURE OVERVIEW:
  *
@@ -75,6 +86,8 @@
 - (id)initWithViewConnection:(YapDatabaseViewConnection *)inViewConnection
          databaseTransaction:(YapDatabaseReadTransaction *)inDatabaseTransaction
 {
+	YDBLogAutoTrace();
+	
 	if ((self = [super init]))
 	{
 		viewConnection = inViewConnection;
@@ -104,31 +117,63 @@
 **/
 - (BOOL)createIfNeeded
 {
+	YDBLogAutoTrace();
+	
+	int classVersion = YAP_DATABASE_VIEW_CLASS_VERSION;
+	BOOL isPersistent = [self isPersistentView];
+	
+	NSString *versionTag = viewConnection->view->versionTag;
+	
+	// Figure out what steps we need to take in order to register the view
+	
 	BOOL needsCreateTables = NO;
 	
+	BOOL oldIsPersistent = NO;
+	BOOL hasOldIsPersistent = NO;
+	
+	NSString *oldVersionTag = nil;
+	
 	// Check classVersion (the internal version number of YapDatabaseView implementation)
 	
-	int oldClassVersion = [self intValueForExtensionKey:@"classVersion"];
-	int classVersion = YAP_DATABASE_VIEW_CLASS_VERSION;
+	int oldClassVersion = 0;
+	BOOL hasOldClassVersion = [self getIntValue:&oldClassVersion forExtensionKey:ExtKey_classVersion];
 	
-	if (oldClassVersion != classVersion)
+	if (!hasOldClassVersion)
+	{
+		needsCreateTables = YES;
+	}
+	else if (oldClassVersion != classVersion)
+	{
+		[self dropTablesForOldClassVersion:oldClassVersion];
 		needsCreateTables = YES;
+	}
 	
 	// Check persistence.
 	// Need to properly transition from persistent to non-persistent, and vice-versa.
 	
-	BOOL oldIsPersistent = NO;
-	BOOL hasOldIsPersistent = [self getBoolValue:&oldIsPersistent forExtensionKey:@"persistent"];
-	
-	BOOL isPersistent = [self isPersistentView];
-	
-	if (hasOldIsPersistent && (oldIsPersistent != isPersistent))
+	if (!needsCreateTables || hasOldClassVersion)
 	{
-		[[viewConnection->view class]
-		  dropTablesForRegisteredName:[self registeredName]
-		              withTransaction:(YapDatabaseReadWriteTransaction *)databaseTransaction];
+		hasOldIsPersistent = [self getBoolValue:&oldIsPersistent forExtensionKey:ExtKey_persistent];
 		
-		needsCreateTables = YES;
+		if (hasOldIsPersistent && oldIsPersistent && !isPersistent)
+		{
+			[[viewConnection->view class]
+			  dropTablesForRegisteredName:[self registeredName]
+			              withTransaction:(YapDatabaseReadWriteTransaction *)databaseTransaction];
+		}
+		
+		if (!hasOldIsPersistent || (oldIsPersistent != isPersistent))
+		{
+			needsCreateTables = YES;
+		}
+		else if (!isPersistent)
+		{
+			// We always have to create & populate the tables for non-persistent views.
+			// Even when re-registering from previous app launch.
+			needsCreateTables = YES;
+			
+			oldVersionTag = [self stringValueForExtensionKey:ExtKey_versionTag];
+		}
 	}
 	
 	// Create or re-populate if needed
@@ -137,36 +182,54 @@
 	{
 		// First time registration
 		
-		[self dropTablesForOldClassVersion:oldClassVersion];
-		
 		if (![self createTables]) return NO;
 		if (![self populateView]) return NO;
 		
-		[self setIntValue:classVersion forExtensionKey:@"classVersion"];
+		if (!hasOldClassVersion || (oldClassVersion != classVersion)) {
+			[self setIntValue:classVersion forExtensionKey:ExtKey_classVersion];
+		}
 		
-		[self setBoolValue:isPersistent forExtensionKey:@"persistent"];
+		if (!hasOldIsPersistent || (oldIsPersistent != isPersistent)) {
+			[self setBoolValue:isPersistent forExtensionKey:ExtKey_persistent];
+		}
 		
-		int userSuppliedConfigVersion = viewConnection->view->version;
-		[self setIntValue:userSuppliedConfigVersion forExtensionKey:@"version"];
+		if (![oldVersionTag isEqualToString:versionTag]) {
+			[self setStringValue:versionTag forExtensionKey:ExtKey_versionTag];
+		}
 	}
 	else
 	{
 		// Check user-supplied config version.
 		// We may need to re-populate the database if the groupingBlock or sortingBlock changed.
 		
-		int oldVersion = [self intValueForExtensionKey:@"version"];
-		int newVersion = viewConnection->view->version;
+		oldVersionTag = [self stringValueForExtensionKey:ExtKey_versionTag];
 		
-		if (oldVersion != newVersion)
+		BOOL hasOldVersion_deprecated = NO;
+		if (oldVersionTag == nil)
 		{
-			if (![self populateView]) return NO;
+			int oldVersion_deprecated = 0;
+			hasOldVersion_deprecated = [self getIntValue:&oldVersion_deprecated
+			                             forExtensionKey:ExtKey_version_deprecated];
 			
-			[self setIntValue:newVersion forExtensionKey:@"version"];
+			if (hasOldVersion_deprecated)
+			{
+				oldVersionTag = [NSString stringWithFormat:@"%d", oldVersion_deprecated];
+			}
 		}
 		
-		if (!hasOldIsPersistent)
+		if (![oldVersionTag isEqualToString:versionTag])
+		{
+			if (![self populateView]) return NO;
+			
+			[self setStringValue:versionTag forExtensionKey:ExtKey_versionTag];
+			
+			if (hasOldVersion_deprecated)
+				[self removeValueForExtensionKey:ExtKey_version_deprecated];
+		}
+		else if (hasOldVersion_deprecated)
 		{
-			[self setBoolValue:isPersistent forExtensionKey:@"persistent"];
+			[self removeValueForExtensionKey:ExtKey_version_deprecated];
+			[self setStringValue:versionTag forExtensionKey:ExtKey_versionTag];
 		}
 	}
 	
@@ -184,6 +247,8 @@
 **/
 - (BOOL)prepareIfNeeded
 {
+	YDBLogAutoTrace();
+	
 	if (viewConnection->group_pagesMetadata_dict && viewConnection->pageKey_group_dict)
 	{
 		// Already prepared
@@ -428,6 +493,8 @@
 
 - (void)dropTablesForOldClassVersion:(int)oldClassVersion
 {
+	YDBLogAutoTrace();
+	
 	if (oldClassVersion == 1)
 	{
 		// In version 2, we switched from 'view_name_key' to 'view_name_map'.
@@ -473,6 +540,8 @@
 
 - (BOOL)createTables
 {
+	YDBLogAutoTrace();
+	
 	if ([self isPersistentView])
 	{
 		sqlite3 *db = databaseTransaction->connection->db;
@@ -556,14 +625,19 @@
 
 - (BOOL)populateView
 {
+	YDBLogAutoTrace();
+	
 	// Remove everything from the database
 	
 	[self removeAllRowids];
 	
 	// Initialize ivars
 	
-	viewConnection->group_pagesMetadata_dict = [[NSMutableDictionary alloc] init];
-	viewConnection->pageKey_group_dict = [[NSMutableDictionary alloc] init];
+	if (viewConnection->group_pagesMetadata_dict == nil)
+		viewConnection->group_pagesMetadata_dict = [[NSMutableDictionary alloc] init];
+	
+	if (viewConnection->pageKey_group_dict == nil)
+		viewConnection->pageKey_group_dict = [[NSMutableDictionary alloc] init];
 	
 	// Enumerate the existing rows in the database and populate the view
 	
@@ -585,37 +659,47 @@
 	BOOL needsMetadata = groupingNeedsMetadata || sortingNeedsMetadata;
 	
 	NSString *(^getGroup)(NSString *collection, NSString *key, id object, id metadata);
-	getGroup = ^(NSString *collection, NSString *key, id object, id metadata){
-		
-		if (view->groupingBlockType == YapDatabaseViewBlockTypeWithKey)
-		{
+	
+	if (view->groupingBlockType == YapDatabaseViewBlockTypeWithKey)
+	{
+		getGroup = ^(NSString *collection, NSString *key, id object, id metadata){
+			
 			__unsafe_unretained YapDatabaseViewGroupingWithKeyBlock groupingBlock =
 		        (YapDatabaseViewGroupingWithKeyBlock)view->groupingBlock;
 			
 			return groupingBlock(collection, key);
-		}
-		else if (view->groupingBlockType == YapDatabaseViewBlockTypeWithObject)
-		{
+		};
+	}
+	else if (view->groupingBlockType == YapDatabaseViewBlockTypeWithObject)
+	{
+		getGroup = ^(NSString *collection, NSString *key, id object, id metadata){
+			
 			__unsafe_unretained YapDatabaseViewGroupingWithObjectBlock groupingBlock =
 		        (YapDatabaseViewGroupingWithObjectBlock)view->groupingBlock;
 			
 			return groupingBlock(collection, key, object);
-		}
-		else if (view->groupingBlockType == YapDatabaseViewBlockTypeWithMetadata)
-		{
+		};
+	}
+	else if (view->groupingBlockType == YapDatabaseViewBlockTypeWithMetadata)
+	{
+		getGroup = ^(NSString *collection, NSString *key, id object, id metadata){
+			
 			__unsafe_unretained YapDatabaseViewGroupingWithMetadataBlock groupingBlock =
 		        (YapDatabaseViewGroupingWithMetadataBlock)view->groupingBlock;
 			
 			return groupingBlock(collection, key, metadata);
-		}
-		else
-		{
+		};
+	}
+	else
+	{
+		getGroup = ^(NSString *collection, NSString *key, id object, id metadata){
+			
 			__unsafe_unretained YapDatabaseViewGroupingWithRowBlock groupingBlock =
 		        (YapDatabaseViewGroupingWithRowBlock)view->groupingBlock;
 			
 			return groupingBlock(collection, key, object, metadata);
-		}
-	};
+		};
+	}
 	
 	int flags = (YapDatabaseViewChangedObject | YapDatabaseViewChangedMetadata);
 	
@@ -861,6 +945,55 @@
 	return YES;
 }
 
+- (void)repopulateView
+{
+	YDBLogAutoTrace();
+	
+	// Code overview:
+	//
+	// We could simply run the usual algorithm.
+	// That is, enumerate over every item in the database, and run pretty much the same code as
+	// in the handleUpdateObject:forCollectionKey:withMetadata:rowid:.
+	// However, this causes a potential issue where the sortingBlock will be invoked with items that
+	// no longer exist in the given group.
+	//
+	// Instead we're going to find a way around this.
+	// That way the sortingBlock works in a manner we're used to.
+	//
+	// Here's the algorithm overview:
+	//
+	// - Insert remove ops for every row & group
+	// - Remove all items from the database tables
+	// - Flush the group_pagesMetadata_dict (and related ivars)
+	// - Set the reset flag (for internal notification creation)
+	// - And then run the normal populate routine, with one exceptione handled by the isRepopulate flag.
+	//
+	// The changeset mechanism will automatically consolidate all changes to the minimum.
+	
+	for (NSString *group in viewConnection->group_pagesMetadata_dict)
+	{
+		// We must add the changes in reverse order.
+		// Either that, or the change index of each item would have to be zero,
+		// because a YapDatabaseViewRowChange records the index at the moment the change happens.
+		
+		[self enumerateRowidsInGroup:group
+		                 withOptions:NSEnumerationReverse
+		                  usingBlock:^(int64_t rowid, NSUInteger index, BOOL *stop)
+		{
+			YapCollectionKey *collectionKey = [databaseTransaction collectionKeyForRowid:rowid];
+			
+			[viewConnection->changes addObject:
+			 [YapDatabaseViewRowChange deleteKey:collectionKey inGroup:group atIndex:index]];
+		}];
+		
+		[viewConnection->changes addObject:[YapDatabaseViewSectionChange deleteGroup:group]];
+	}
+	
+	isRepopulate = YES;
+	[self populateView];
+	isRepopulate = NO;
+}
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 #pragma mark Accessors
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1229,7 +1362,7 @@
 	// Calculate the offset of the corresponding page within the group.
 	
 	NSUInteger pageOffset = 0;
-	NSMutableArray *pagesMetadataForGroup = [viewConnection->group_pagesMetadata_dict objectForKey:group];
+	NSArray *pagesMetadataForGroup = [viewConnection->group_pagesMetadata_dict objectForKey:group];
 	
 	for (YapDatabaseViewPageMetadata *pageMetadata in pagesMetadataForGroup)
 	{
@@ -1259,7 +1392,7 @@
 
 - (BOOL)getRowid:(int64_t *)rowidPtr atIndex:(NSUInteger)index inGroup:(NSString *)group
 {
-	NSMutableArray *pagesMetadataForGroup = [viewConnection->group_pagesMetadata_dict objectForKey:group];
+	NSArray *pagesMetadataForGroup = [viewConnection->group_pagesMetadata_dict objectForKey:group];
 	NSUInteger pageOffset = 0;
 	
 	for (YapDatabaseViewPageMetadata *pageMetadata in pagesMetadataForGroup)
@@ -1293,7 +1426,7 @@
 	// else
 	//     return nil;
 	
-	NSMutableArray *pagesMetadataForGroup = [viewConnection->group_pagesMetadata_dict objectForKey:group];
+	NSArray *pagesMetadataForGroup = [viewConnection->group_pagesMetadata_dict objectForKey:group];
 	
 	__block int64_t rowid = 0;
 	__block BOOL found = NO;
@@ -1375,7 +1508,7 @@
 	// Add change to log
 	
 	[viewConnection->changes addObject:
-	 [YapDatabaseViewSectionChange insertGroup:group]];
+	  [YapDatabaseViewSectionChange insertGroup:group]];
 	
 	[viewConnection->changes addObject:
 	  [YapDatabaseViewRowChange insertKey:collectionKey inGroup:group atIndex:0]];
@@ -1627,62 +1760,54 @@
 			__unsafe_unretained YapDatabaseViewSortingWithKeyBlock sortingBlock =
 			    (YapDatabaseViewSortingWithKeyBlock)view->sortingBlock;
 			
-			NSString *anotherKey = nil;
-			NSString *anotherCollection = nil;
-			[databaseTransaction getKey:&anotherKey collection:&anotherCollection forRowid:anotherRowid];
+			YapCollectionKey *another = [databaseTransaction collectionKeyForRowid:anotherRowid];
 			
 			return sortingBlock(group, collectionKey.collection, collectionKey.key,
-			                                  anotherCollection,        anotherKey);
+			                                 another.collection,       another.key);
 		}
 		else if (view->sortingBlockType == YapDatabaseViewBlockTypeWithObject)
 		{
 			__unsafe_unretained YapDatabaseViewSortingWithObjectBlock sortingBlock =
 			    (YapDatabaseViewSortingWithObjectBlock)view->sortingBlock;
 			
-			NSString *anotherKey = nil;
-			NSString *anotherCollection = nil;
+			YapCollectionKey *another = nil;
 			id anotherObject = nil;
-			[databaseTransaction getKey:&anotherKey
-			                 collection:&anotherCollection
-			                     object:&anotherObject
-			                   forRowid:anotherRowid];
+			[databaseTransaction getCollectionKey:&another
+			                               object:&anotherObject
+			                             forRowid:anotherRowid];
 			
 			return sortingBlock(group, collectionKey.collection, collectionKey.key,        object,
-			                                  anotherCollection,        anotherKey, anotherObject);
+			                                 another.collection,       another.key, anotherObject);
 		}
 		else if (view->sortingBlockType == YapDatabaseViewBlockTypeWithMetadata)
 		{
 			__unsafe_unretained YapDatabaseViewSortingWithMetadataBlock sortingBlock =
 			    (YapDatabaseViewSortingWithMetadataBlock)view->sortingBlock;
 			
-			NSString *anotherKey = nil;
-			NSString *anotherCollection = nil;
+			YapCollectionKey *another = nil;
 			id anotherMetadata = nil;
-			[databaseTransaction getKey:&anotherKey
-			                 collection:&anotherCollection
-			                   metadata:&anotherMetadata
-			                   forRowid:anotherRowid];
+			[databaseTransaction getCollectionKey:&another
+			                             metadata:&anotherMetadata
+			                             forRowid:anotherRowid];
 			
 			return sortingBlock(group, collectionKey.collection, collectionKey.key,        metadata,
-			                                  anotherCollection,        anotherKey, anotherMetadata);
+			                                 another.collection,       another.key, anotherMetadata);
 		}
 		else
 		{
 			__unsafe_unretained YapDatabaseViewSortingWithRowBlock sortingBlock =
 			    (YapDatabaseViewSortingWithRowBlock)view->sortingBlock;
 			
-			NSString *anotherKey = nil;
-			NSString *anotherCollection = nil;
+			YapCollectionKey *another = nil;
 			id anotherObject = nil;
 			id anotherMetadata = nil;
-			[databaseTransaction getKey:&anotherKey
-			                 collection:&anotherCollection
-			                     object:&anotherObject
-			                   metadata:&anotherMetadata
-			                   forRowid:anotherRowid];
+			[databaseTransaction getCollectionKey:&another
+			                               object:&anotherObject
+			                             metadata:&anotherMetadata
+			                             forRowid:anotherRowid];
 			
 			return sortingBlock(group, collectionKey.collection, collectionKey.key,        object,        metadata,
-			                                  anotherCollection,        anotherKey, anotherObject, anotherMetadata);
+			                                 another.collection,       another.key, anotherObject, anotherMetadata);
 		}
 	};
 	
@@ -1950,8 +2075,10 @@
 	
 	// Add change to log
 	
+	NSUInteger indexWithinGroup = pageOffset + indexWithinPage;
+	
 	[viewConnection->changes addObject:
-	    [YapDatabaseViewRowChange deleteKey:collectionKey inGroup:group atIndex:(pageOffset + indexWithinPage)]];
+	  [YapDatabaseViewRowChange deleteKey:collectionKey inGroup:group atIndex:indexWithinGroup]];
 	
 	[viewConnection->mutatedGroups addObject:group];
 	
@@ -2065,7 +2192,7 @@
 			numRemoved++;
 			
 			[viewConnection->changes addObject:
-			    [YapDatabaseViewRowChange deleteKey:collectionKey inGroup:group atIndex:(pageOffset + i)]];
+			  [YapDatabaseViewRowChange deleteKey:collectionKey inGroup:group atIndex:(pageOffset + i)]];
 		}
 	}
 	
@@ -2146,10 +2273,12 @@
 		[pageTableTransaction removeAllObjects];
 		[pageMetadataTableTransaction removeAllObjects];
 	}
-		
+	
 	for (NSString *group in viewConnection->group_pagesMetadata_dict)
 	{
-		[viewConnection->changes addObject:[YapDatabaseViewSectionChange resetGroup:group]];
+		if (!isRepopulate) {
+			[viewConnection->changes addObject:[YapDatabaseViewSectionChange resetGroup:group]];
+		}
 		[viewConnection->mutatedGroups addObject:group];
 	}
 	
@@ -2429,7 +2558,7 @@
  * Extensions may implement it to perform any "cleanup" before the changeset is requested.
  * Remember, the changeset is requested before the commitTransaction method is invoked.
 **/
-- (void)preCommitReadWriteTransaction
+- (void)prepareChangeset
 {
 	YDBLogAutoTrace();
 	
@@ -2514,7 +2643,7 @@
 			else
 			{
 				NSString *group = [self groupForPageKey:pageKey];
-				NSMutableArray *pagesMetadataForGroup = [viewConnection->group_pagesMetadata_dict objectForKey:group];
+				NSArray *pagesMetadataForGroup = [viewConnection->group_pagesMetadata_dict objectForKey:group];
 				
 				for (YapDatabaseViewPageMetadata *pm in pagesMetadataForGroup)
 				{
@@ -2865,8 +2994,8 @@
 						if (pageMetadata == nil)
 						{
 							NSString *group = [self groupForPageKey:pageKey];
-							NSMutableArray *pagesMetadataForGroup =
-							[viewConnection->group_pagesMetadata_dict objectForKey:group];
+							NSArray *pagesMetadataForGroup =
+							  [viewConnection->group_pagesMetadata_dict objectForKey:group];
 							
 							for (YapDatabaseViewPageMetadata *pm in pagesMetadataForGroup)
 							{
@@ -2981,8 +3110,7 @@
  * This method is invoked by a YapDatabaseReadWriteTransaction as a post-operation-hook.
 **/
 - (void)handleInsertObject:(id)object
-                    forKey:(NSString *)key
-              inCollection:(NSString *)collection
+          forCollectionKey:(YapCollectionKey *)collectionKey
               withMetadata:(id)metadata
                      rowid:(int64_t)rowid
 {
@@ -2990,6 +3118,9 @@
 	
 	__unsafe_unretained YapDatabaseView *view = viewConnection->view;
 	
+	__unsafe_unretained NSString *collection = collectionKey.collection;
+	__unsafe_unretained NSString *key = collectionKey.key;
+	
 	// Invoke the grouping block to find out if the object should be included in the view.
 	
 	NSString *group = nil;
@@ -3036,8 +3167,6 @@
 		// Add key to view.
 		// This was an insert operation, so we know the key wasn't already in the view.
 		
-		YapCollectionKey *collectionKey = [[YapCollectionKey alloc] initWithCollection:collection key:key];
-		
 		int flags = (YapDatabaseViewChangedObject | YapDatabaseViewChangedMetadata);
 		
 		[self insertRowid:rowid
@@ -3055,18 +3184,17 @@
  * This method is invoked by a YapDatabaseReadWriteTransaction as a post-operation-hook.
 **/
 - (void)handleUpdateObject:(id)object
-                    forKey:(NSString *)key
-              inCollection:(NSString *)collection
+          forCollectionKey:(YapCollectionKey *)collectionKey
               withMetadata:(id)metadata
                      rowid:(int64_t)rowid
 {
 	YDBLogAutoTrace();
 	
-	NSParameterAssert(key != nil);
-	NSParameterAssert(collection != nil);
-	
 	__unsafe_unretained YapDatabaseView *view = viewConnection->view;
 	
+	__unsafe_unretained NSString *collection = collectionKey.collection;
+	__unsafe_unretained NSString *key = collectionKey.key;
+	
 	// Invoke the grouping block to find out if the object should be included in the view.
 	
 	NSString *group = nil;
@@ -3103,8 +3231,6 @@
 			group = groupingBlock(collection, key, object, metadata);
 		}
 	}
-
-	YapCollectionKey *collectionKey = [[YapCollectionKey alloc] initWithCollection:collection key:key];
 	
 	if (group == nil)
 	{
@@ -3134,16 +3260,167 @@
  * YapDatabase extension hook.
  * This method is invoked by a YapDatabaseReadWriteTransaction as a post-operation-hook.
 **/
-- (void)handleUpdateMetadata:(id)metadata
-                      forKey:(NSString *)key
-                inCollection:(NSString *)collection
-                   withRowid:(int64_t)rowid
+- (void)handleReplaceObject:(id)object forCollectionKey:(YapCollectionKey *)collectionKey withRowid:(int64_t)rowid
 {
 	YDBLogAutoTrace();
 	
 	__unsafe_unretained YapDatabaseView *view = viewConnection->view;
 	
-	YapCollectionKey *collectionKey = [[YapCollectionKey alloc] initWithCollection:collection key:key];
+	__unsafe_unretained NSString *collection = collectionKey.collection;
+	__unsafe_unretained NSString *key = collectionKey.key;
+	
+	// Invoke the grouping block to find out if the object should be included in the view.
+	
+	id metadata = nil;
+	NSString *group = nil;
+	
+	if (view->groupingBlockType == YapDatabaseViewBlockTypeWithKey ||
+	    view->groupingBlockType == YapDatabaseViewBlockTypeWithMetadata)
+	{
+		// Grouping is based on the key or metadata.
+		// Neither have changed, and thus the group hasn't changed.
+		
+		NSString *pageKey = [self pageKeyForRowid:rowid];
+		group = [self groupForPageKey:pageKey];
+		
+		if (group == nil)
+		{
+			// Nothing to do.
+			// The key wasn't previously in the view, and still isn't in the view.
+			lastHandledGroup = group;
+			return;
+		}
+		
+		if (view->sortingBlockType == YapDatabaseViewBlockTypeWithKey ||
+		    view->sortingBlockType == YapDatabaseViewBlockTypeWithMetadata)
+		{
+			// Nothing has moved because the group hasn't changed and
+			// nothing has changed that relates to sorting.
+			
+			int flags = YapDatabaseViewChangedObject;
+			NSUInteger existingIndex = [self indexForRowid:rowid inGroup:group withPageKey:pageKey];
+			
+			[viewConnection->changes addObject:
+			    [YapDatabaseViewRowChange updateKey:collectionKey changes:flags inGroup:group atIndex:existingIndex]];
+		}
+		else
+		{
+			// Sorting is based on the object, which has changed.
+			// So the sort order may possibly have changed.
+			
+			// From previous if statement (above) we know:
+			// sortingBlockType is object or row (object+metadata)
+			
+			if (view->sortingBlockType == YapDatabaseViewBlockTypeWithRow)
+			{
+				// Need the metadata for the sorting block
+				metadata = [databaseTransaction metadataForCollectionKey:collectionKey withRowid:rowid];
+			}
+			
+			int flags = YapDatabaseViewChangedObject;
+			
+			[self insertRowid:rowid
+			    collectionKey:collectionKey
+			           object:object
+			         metadata:metadata
+			          inGroup:group withChanges:flags isNew:NO];
+		}
+	}
+	else
+	{
+		// Grouping is based on object or row (object+metadata).
+		// Invoke groupingBlock to see what the new group is.
+		
+		NSSet *allowedCollections = view->options.allowedCollections;
+		
+		if (!allowedCollections || [allowedCollections containsObject:collection])
+		{
+			if (view->groupingBlockType == YapDatabaseViewBlockTypeWithObject)
+			{
+				__unsafe_unretained YapDatabaseViewGroupingWithObjectBlock groupingBlock =
+			        (YapDatabaseViewGroupingWithObjectBlock)view->groupingBlock;
+				
+				group = groupingBlock(collection, key, object);
+			}
+			else
+			{
+				__unsafe_unretained YapDatabaseViewGroupingWithRowBlock groupingBlock =
+			        (YapDatabaseViewGroupingWithRowBlock)view->groupingBlock;
+				
+				metadata = [databaseTransaction metadataForCollectionKey:collectionKey withRowid:rowid];
+				group = groupingBlock(collection, key, object, metadata);
+			}
+		}
+		
+		if (group == nil)
+		{
+			// The key is not included in the view.
+			// Remove key from view (if needed).
+			
+			[self removeRowid:rowid collectionKey:collectionKey];
+		}
+		else
+		{
+			if (view->sortingBlockType == YapDatabaseViewBlockTypeWithKey ||
+			    view->sortingBlockType == YapDatabaseViewBlockTypeWithMetadata)
+			{
+				// Sorting is based on the key or metadata, neither of which has changed.
+				// So if the group hasn't changed, then the sort order hasn't changed.
+				
+				NSString *existingPageKey = [self pageKeyForRowid:rowid];
+				NSString *existingGroup = [self groupForPageKey:existingPageKey];
+				
+				if ([group isEqualToString:existingGroup])
+				{
+					// Nothing left to do.
+					// The group didn't change, and the sort order cannot change (because the object didn't change).
+					
+					int flags = YapDatabaseViewChangedObject;
+					NSUInteger existingIndex = [self indexForRowid:rowid inGroup:group withPageKey:existingPageKey];
+					
+					[viewConnection->changes addObject:
+					    [YapDatabaseViewRowChange updateKey:collectionKey
+					                                changes:flags
+					                                inGroup:group
+					                                atIndex:existingIndex]];
+					
+					lastHandledGroup = group;
+					return;
+				}
+			}
+			
+			if (metadata == nil && (view->sortingBlockType == YapDatabaseViewBlockTypeWithMetadata ||
+			                        view->sortingBlockType == YapDatabaseViewBlockTypeWithRow      ))
+			{
+				// Need the metadata for the sorting block
+				metadata = [databaseTransaction metadataForCollectionKey:collectionKey withRowid:rowid];
+			}
+			
+			int flags = YapDatabaseViewChangedObject;
+			
+			[self insertRowid:rowid
+			    collectionKey:collectionKey
+			           object:object
+			         metadata:metadata
+			          inGroup:group withChanges:flags isNew:NO];
+		}
+	}
+	
+	lastHandledGroup = group;
+}
+
+/**
+ * YapDatabase extension hook.
+ * This method is invoked by a YapDatabaseReadWriteTransaction as a post-operation-hook.
+**/
+- (void)handleReplaceMetadata:(id)metadata forCollectionKey:(YapCollectionKey *)collectionKey withRowid:(int64_t)rowid
+{
+	YDBLogAutoTrace();
+	
+	__unsafe_unretained YapDatabaseView *view = viewConnection->view;
+	
+	__unsafe_unretained NSString *collection = collectionKey.collection;
+	__unsafe_unretained NSString *key = collectionKey.key;
 	
 	// Invoke the grouping block to find out if the object should be included in the view.
 	
@@ -3190,7 +3467,7 @@
 			if (view->sortingBlockType == YapDatabaseViewBlockTypeWithRow)
 			{
 				// Need the object for the sorting block
-				object = [databaseTransaction objectForKey:key inCollection:collection withRowid:rowid];
+				object = [databaseTransaction objectForCollectionKey:collectionKey withRowid:rowid];
 			}
 			
 			int flags = YapDatabaseViewChangedMetadata;
@@ -3223,7 +3500,7 @@
 				__unsafe_unretained YapDatabaseViewGroupingWithRowBlock groupingBlock =
 			        (YapDatabaseViewGroupingWithRowBlock)view->groupingBlock;
 				
-				object = [databaseTransaction objectForKey:key inCollection:collection withRowid:rowid];
+				object = [databaseTransaction objectForCollectionKey:collectionKey withRowid:rowid];
 				group = groupingBlock(collection, key, object, metadata);
 			}
 		}
@@ -3269,7 +3546,7 @@
 			                      view->sortingBlockType == YapDatabaseViewBlockTypeWithRow    ))
 			{
 				// Need the object for the sorting block
-				object = [databaseTransaction objectForKey:key inCollection:collection withRowid:rowid];
+				object = [databaseTransaction objectForCollectionKey:collectionKey withRowid:rowid];
 			}
 			
 			int flags = YapDatabaseViewChangedMetadata;
@@ -3289,7 +3566,7 @@
  * YapDatabase extension hook.
  * This method is invoked by a YapDatabaseReadWriteTransaction as a post-operation-hook.
 **/
-- (void)handleTouchObjectForKey:(NSString *)key inCollection:(NSString *)collection withRowid:(int64_t)rowid
+- (void)handleTouchObjectForCollectionKey:(YapCollectionKey *)collectionKey withRowid:(int64_t)rowid
 {
 	YDBLogAutoTrace();
 	
@@ -3301,7 +3578,6 @@
 		NSString *group = [self groupForPageKey:pageKey];
 		NSUInteger index = [self indexForRowid:rowid inGroup:group withPageKey:pageKey];
 		
-		YapCollectionKey *collectionKey = [[YapCollectionKey alloc] initWithCollection:collection key:key];
 		int flags = (YapDatabaseViewChangedObject | YapDatabaseViewChangedMetadata);
 		
 		[viewConnection->changes addObject:
@@ -3313,7 +3589,7 @@
  * YapDatabase extension hook.
  * This method is invoked by a YapDatabaseReadWriteTransaction as a post-operation-hook.
 **/
-- (void)handleTouchMetadataForKey:(NSString *)key inCollection:(NSString *)collection withRowid:(int64_t)rowid
+- (void)handleTouchMetadataForCollectionKey:(YapCollectionKey *)collectionKey withRowid:(int64_t)rowid
 {
 	YDBLogAutoTrace();
 	
@@ -3332,7 +3608,6 @@
 			NSString *group = [self groupForPageKey:pageKey];
 			NSUInteger index = [self indexForRowid:rowid inGroup:group withPageKey:pageKey];
 			
-			YapCollectionKey *collectionKey = [[YapCollectionKey alloc] initWithCollection:collection key:key];
 			int flags = YapDatabaseViewChangedMetadata;
 			
 			[viewConnection->changes addObject:
@@ -3345,15 +3620,10 @@
  * YapDatabase extension hook.
  * This method is invoked by a YapDatabaseReadWriteTransaction as a post-operation-hook.
 **/
-- (void)handleRemoveObjectForKey:(NSString *)key inCollection:(NSString *)collection withRowid:(int64_t)rowid
+- (void)handleRemoveObjectForCollectionKey:(YapCollectionKey *)collectionKey withRowid:(int64_t)rowid
 {
 	YDBLogAutoTrace();
 	
-	NSParameterAssert(key != nil);
-	NSParameterAssert(collection != nil);
-	
-	YapCollectionKey *collectionKey = [[YapCollectionKey alloc] initWithCollection:collection key:key];
-	
 	[self removeRowid:rowid collectionKey:collectionKey];
 }
 
@@ -3365,8 +3635,6 @@
 {
 	YDBLogAutoTrace();
 	
-	NSParameterAssert(collection != nil);
-	
 	NSUInteger count = [keys count];
 	NSMutableDictionary *keyMappings = [NSMutableDictionary dictionaryWithCapacity:count];
 	
@@ -3479,20 +3747,18 @@
 	int64_t rowid = 0;
 	if ([self getRowid:&rowid atIndex:index inGroup:group])
 	{
-		NSString *collection = nil;
-		NSString *key = nil;
-		BOOL found = [databaseTransaction getKey:&key collection:&collection forRowid:rowid];
-		
-		if (collectionPtr) *collectionPtr = collection;
-		if (keyPtr) *keyPtr = key;
-		return found;
-	}
-	else
-	{
-		if (collectionPtr) *collectionPtr = nil;
-		if (keyPtr) *keyPtr = nil;
-		return NO;
+		YapCollectionKey *ck = [databaseTransaction collectionKeyForRowid:rowid];
+		if (ck)
+		{
+			if (collectionPtr) *collectionPtr = ck.collection;
+			if (keyPtr) *keyPtr = ck.key;
+			return YES;
+		}
 	}
+	
+	if (collectionPtr) *collectionPtr = nil;
+	if (keyPtr) *keyPtr = nil;
+	return NO;
 }
 
 - (BOOL)getFirstKey:(NSString **)keyPtr collection:(NSString **)collectionPtr inGroup:(NSString *)group
@@ -3505,20 +3771,18 @@
 	int64_t rowid = 0;
 	if ([self getLastRowid:&rowid inGroup:group])
 	{
-		NSString *collection = nil;
-		NSString *key = nil;
-		BOOL found = [databaseTransaction getKey:&key collection:&collection forRowid:rowid];
-		
-		if (collectionPtr) *collectionPtr = collection;
-		if (keyPtr) *keyPtr = key;
-		return found;
-	}
-	else
-	{
-		if (collectionPtr) *collectionPtr = nil;
-		if (keyPtr) *keyPtr = nil;
-		return NO;
+		YapCollectionKey *ck = [databaseTransaction collectionKeyForRowid:rowid];
+		if (ck)
+		{
+			if (collectionPtr) *collectionPtr = ck.collection;
+			if (keyPtr) *keyPtr = ck.key;
+			return YES;
+		}
 	}
+	
+	if (collectionPtr) *collectionPtr = nil;
+	if (keyPtr) *keyPtr = nil;
+	return NO;
 }
 
 - (NSString *)collectionAtIndex:(NSUInteger)index inGroup:(NSString *)group
@@ -3591,7 +3855,7 @@
 			// Calculate the offset of the corresponding page within the group.
 			
 			NSUInteger pageOffset = 0;
-			NSMutableArray *pagesMetadataForGroup = [viewConnection->group_pagesMetadata_dict objectForKey:group];
+			NSArray *pagesMetadataForGroup = [viewConnection->group_pagesMetadata_dict objectForKey:group];
 			
 			for (YapDatabaseViewPageMetadata *pageMetadata in pagesMetadataForGroup)
 			{
@@ -3645,7 +3909,7 @@
 		return NSMakeRange(NSNotFound, 0);
 	}
 	
-	NSMutableArray *pagesMetadataForGroup = [viewConnection->group_pagesMetadata_dict objectForKey:group];
+	NSArray *pagesMetadataForGroup = [viewConnection->group_pagesMetadata_dict objectForKey:group];
 	NSUInteger count = 0;
 	
 	for (YapDatabaseViewPageMetadata *pageMetadata in pagesMetadataForGroup)
@@ -3683,48 +3947,43 @@
 			__unsafe_unretained YapDatabaseViewFindWithKeyBlock findBlock =
 			    (YapDatabaseViewFindWithKeyBlock)block;
 			
-			NSString *key = nil;
-			NSString *collection = nil;
-			[databaseTransaction getKey:&key collection:&collection forRowid:rowid];
+			YapCollectionKey *ck = [databaseTransaction collectionKeyForRowid:rowid];
 			
-			return findBlock(collection, key);
+			return findBlock(ck.collection, ck.key);
 		}
 		else if (blockType == YapDatabaseViewBlockTypeWithObject)
 		{
 			__unsafe_unretained YapDatabaseViewFindWithObjectBlock findBlock =
 			    (YapDatabaseViewFindWithObjectBlock)block;
 			
-			NSString *key = nil;
-			NSString *collection = nil;
+			YapCollectionKey *ck = nil;
 			id object = nil;
-			[databaseTransaction getKey:&key collection:&collection object:&object forRowid:rowid];
+			[databaseTransaction getCollectionKey:&ck object:&object forRowid:rowid];
 			
-			return findBlock(collection, key, object);
+			return findBlock(ck.collection, ck.key, object);
 		}
 		else if (blockType == YapDatabaseViewBlockTypeWithMetadata)
 		{
 			__unsafe_unretained YapDatabaseViewFindWithMetadataBlock findBlock =
 			    (YapDatabaseViewFindWithMetadataBlock)block;
 			
-			NSString *key = nil;
-			NSString *collection = nil;
+			YapCollectionKey *ck = nil;
 			id metadata = nil;
-			[databaseTransaction getKey:&key collection:&collection metadata:&metadata forRowid:rowid];
+			[databaseTransaction getCollectionKey:&ck metadata:&metadata forRowid:rowid];
 			
-			return findBlock(collection, key, metadata);
+			return findBlock(ck.collection, ck.key, metadata);
 		}
 		else
 		{
 			__unsafe_unretained YapDatabaseViewFindWithRowBlock findBlock =
 			    (YapDatabaseViewFindWithRowBlock)block;
 			
-			NSString *key = nil;
-			NSString *collection = nil;
+			YapCollectionKey *ck = nil;
 			id object = nil;
 			id metadata = nil;
-			[databaseTransaction getKey:&key collection:&collection object:&object metadata:&metadata forRowid:rowid];
+			[databaseTransaction getCollectionKey:&ck object:&object metadata:&metadata forRowid:rowid];
 			
-			return findBlock(collection, key, object, metadata);
+			return findBlock(ck.collection, ck.key, object, metadata);
 		}
 	};
 	
@@ -3815,11 +4074,9 @@
 	
 	[self enumerateRowidsInGroup:group usingBlock:^(int64_t rowid, NSUInteger index, BOOL *stop) {
 		
-		NSString *key = nil;
-		NSString *collection = nil;
-		[databaseTransaction getKey:&key collection:&collection forRowid:rowid];
+		YapCollectionKey *ck = [databaseTransaction collectionKeyForRowid:rowid];
 		
-		block(collection, key, index, stop);
+		block(ck.collection, ck.key, index, stop);
 	}];
 }
 
@@ -3831,11 +4088,9 @@
 	
 	[self enumerateRowidsInGroup:group withOptions:options usingBlock:^(int64_t rowid, NSUInteger index, BOOL *stop) {
 		
-		NSString *key = nil;
-		NSString *collection = nil;
-		[databaseTransaction getKey:&key collection:&collection forRowid:rowid];
+		YapCollectionKey *ck = [databaseTransaction collectionKeyForRowid:rowid];
 		
-		block(collection, key, index, stop);
+		block(ck.collection, ck.key, index, stop);
 	}];
 }
 
@@ -3849,13 +4104,11 @@
 	[self enumerateRowidsInGroup:group
 	                 withOptions:options
 	                       range:range
-	                  usingBlock:^(int64_t rowid, NSUInteger index, BOOL *stop) {
-		
-		NSString *key = nil;
-		NSString *collection = nil;
-		[databaseTransaction getKey:&key collection:&collection forRowid:rowid];
+	                  usingBlock:^(int64_t rowid, NSUInteger index, BOOL *stop)
+	{
+		YapCollectionKey *ck = [databaseTransaction collectionKeyForRowid:rowid];
 		
-		block(collection, key, index, stop);
+		block(ck.collection, ck.key, index, stop);
 	}];
 }
 
@@ -3873,7 +4126,7 @@
 	__block BOOL stop = NO;
 	
 	NSUInteger pageOffset = 0;
-	NSMutableArray *pagesMetadataForGroup = [viewConnection->group_pagesMetadata_dict objectForKey:group];
+	NSArray *pagesMetadataForGroup = [viewConnection->group_pagesMetadata_dict objectForKey:group];
 	
 	for (YapDatabaseViewPageMetadata *pageMetadata in pagesMetadataForGroup)
 	{
@@ -3918,11 +4171,11 @@
 	else
 		index = [self numberOfKeysInGroup:group] - 1;
 	
-	NSMutableArray *pagesMetadataForGroup = [viewConnection->group_pagesMetadata_dict objectForKey:group];
+	NSArray *pagesMetadataForGroup = [viewConnection->group_pagesMetadata_dict objectForKey:group];
 	
 	[pagesMetadataForGroup enumerateObjectsWithOptions:options
-	                                        usingBlock:^(id pageMetadataObj, NSUInteger outerIdx, BOOL *outerStop){
-		
+	                                        usingBlock:^(id pageMetadataObj, NSUInteger outerIdx, BOOL *outerStop)
+	{
 		__unsafe_unretained YapDatabaseViewPageMetadata *pageMetadata =
 		    (YapDatabaseViewPageMetadata *)pageMetadataObj;
 		
@@ -3958,7 +4211,7 @@
 	
 	NSEnumerationOptions options = (inOptions & NSEnumerationReverse); // We only support NSEnumerationReverse
 	
-	NSMutableArray *pagesMetadataForGroup = [viewConnection->group_pagesMetadata_dict objectForKey:group];
+	NSArray *pagesMetadataForGroup = [viewConnection->group_pagesMetadata_dict objectForKey:group];
 	
 	// Helper block to fetch the pageOffset for some page.
 	
@@ -3985,8 +4238,8 @@
 	__block NSUInteger keysLeft = range.length;
 	
 	[pagesMetadataForGroup enumerateObjectsWithOptions:options
-	                                        usingBlock:^(id pageMetadataObj, NSUInteger pageIndex, BOOL *outerStop){
-	
+	                                        usingBlock:^(id pageMetadataObj, NSUInteger pageIndex, BOOL *outerStop)
+	{
 		__unsafe_unretained YapDatabaseViewPageMetadata *pageMetadata =
 		    (YapDatabaseViewPageMetadata *)pageMetadataObj;
 		
@@ -4201,6 +4454,82 @@
 	}
 }
 
+/**
+ * This method allows you to change the groupingBlock and/or sortingBlock on-the-fly.
+ * 
+ * Note: You must pass a different versionTag, or this method does nothing.
+**/
+- (void)setGroupingBlock:(YapDatabaseViewGroupingBlock)inGroupingBlock
+       groupingBlockType:(YapDatabaseViewBlockType)inGroupingBlockType
+            sortingBlock:(YapDatabaseViewSortingBlock)inSortingBlock
+        sortingBlockType:(YapDatabaseViewBlockType)inSortingBlockType
+              versionTag:(NSString *)inVersionTag
+{
+	YDBLogAutoTrace();
+	
+	NSAssert(inGroupingBlock != NULL, @"Invalid grouping block");
+	NSAssert(inSortingBlock != NULL, @"Invalid grouping block");
+	
+	NSAssert(inGroupingBlockType == YapDatabaseViewBlockTypeWithKey ||
+	         inGroupingBlockType == YapDatabaseViewBlockTypeWithObject ||
+	         inGroupingBlockType == YapDatabaseViewBlockTypeWithMetadata ||
+	         inGroupingBlockType == YapDatabaseViewBlockTypeWithRow,
+	         @"Invalid grouping block type");
+	
+	NSAssert(inSortingBlockType == YapDatabaseViewBlockTypeWithKey ||
+	         inSortingBlockType == YapDatabaseViewBlockTypeWithObject ||
+	         inSortingBlockType == YapDatabaseViewBlockTypeWithMetadata ||
+	         inSortingBlockType == YapDatabaseViewBlockTypeWithRow,
+	         @"Invalid sorting block type");
+	
+	if (!databaseTransaction->isReadWriteTransaction)
+	{
+		YDBLogWarn(@"%@ - Method only allowed in readWrite transaction", THIS_METHOD);
+		return;
+	}
+	
+	NSString *newVersionTag = inVersionTag ? [inVersionTag copy] : @"";
+	
+	__unsafe_unretained YapDatabaseView *view = viewConnection->view;
+	
+	if ([view->versionTag isEqualToString:newVersionTag])
+	{
+		YDBLogWarn(@"%@ - versionTag didn't change, so not updating view", THIS_METHOD);
+		return;
+	}
+	
+	view->groupingBlock = inGroupingBlock;
+	view->groupingBlockType = inGroupingBlockType;
+	view->sortingBlock = inSortingBlock;
+	view->sortingBlockType = inSortingBlockType;
+	
+	view->versionTag = newVersionTag;
+	
+	[self repopulateView];
+	[self setStringValue:newVersionTag forExtensionKey:ExtKey_versionTag];
+	
+	// Notify any extensions dependent upon this one that we repopulated.
+	
+	NSString *registeredName = [self registeredName];
+	NSDictionary *extensionDependencies = databaseTransaction->connection->extensionDependencies;
+	
+	[extensionDependencies enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop){
+		
+		__unsafe_unretained NSString *extName = (NSString *)key;
+		__unsafe_unretained NSSet *extDependencies = (NSSet *)obj;
+		
+		if ([extDependencies containsObject:registeredName])
+		{
+			YapDatabaseExtensionTransaction *extTransaction = [databaseTransaction ext:extName];
+			
+			if ([extTransaction respondsToSelector:@selector(viewDidRepopulate:)])
+			{
+				[(id <YapDatabaseViewDependency>)extTransaction viewDidRepopulate:registeredName];
+			}
+		}
+	}];
+}
+
 @end
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -4219,11 +4548,9 @@
 		// So it's likely faster to fetch just the key first.
 		// And if the cache misses then we're still using a fetch based on the rowid.
 		
-		NSString *key = nil;
-		NSString *collection = nil;
-		[databaseTransaction getKey:&key collection:&collection forRowid:rowid];
+		YapCollectionKey *ck = [databaseTransaction collectionKeyForRowid:rowid];
 		
-		return [databaseTransaction objectForKey:key inCollection:collection withRowid:rowid];
+		return [databaseTransaction objectForCollectionKey:ck withRowid:rowid];
 	}
 	else
 	{
@@ -4247,11 +4574,9 @@
 		// So it's likely faster to fetch just the key first.
 		// And if the cache misses then we're still using a fetch based on the rowid.
 		
-		NSString *key = nil;
-		NSString *collection = nil;
-		[databaseTransaction getKey:&key collection:&collection forRowid:rowid];
+		YapCollectionKey *ck = [databaseTransaction collectionKeyForRowid:rowid];
 		
-		return [databaseTransaction objectForKey:key inCollection:collection withRowid:rowid];
+		return [databaseTransaction objectForCollectionKey:ck withRowid:rowid];
 	}
 	else
 	{
@@ -4272,12 +4597,11 @@
 	
 	[self enumerateRowidsInGroup:group usingBlock:^(int64_t rowid, NSUInteger index, BOOL *stop) {
 		
-		NSString *key = nil;
-		NSString *collection = nil;
+		YapCollectionKey *ck = nil;
 		id metadata = nil;
-		[databaseTransaction getKey:&key collection:&collection metadata:&metadata forRowid:rowid];
+		[databaseTransaction getCollectionKey:&ck metadata:&metadata forRowid:rowid];
 		
-		block(collection, key, metadata, index, stop);
+		block(ck.collection, ck.key, metadata, index, stop);
 	}];
 }
 
@@ -4290,14 +4614,13 @@
 	
 	[self enumerateRowidsInGroup:group
 	                 withOptions:options
-	                  usingBlock:^(int64_t rowid, NSUInteger index, BOOL *stop) {
-		
-		NSString *key = nil;
-		NSString *collection = nil;
+	                  usingBlock:^(int64_t rowid, NSUInteger index, BOOL *stop)
+	{
+		YapCollectionKey *ck = nil;
 		id metadata = nil;
-		[databaseTransaction getKey:&key collection:&collection metadata:&metadata forRowid:rowid];
+		[databaseTransaction getCollectionKey:&ck metadata:&metadata forRowid:rowid];
 						  
-		block(collection, key, metadata, index, stop);
+		block(ck.collection, ck.key, metadata, index, stop);
 	}];
 }
 
@@ -4312,14 +4635,13 @@
 	[self enumerateRowidsInGroup:group
 	                 withOptions:options
 	                       range:range
-	                  usingBlock:^(int64_t rowid, NSUInteger index, BOOL *stop) {
-		
-		NSString *key = nil;
-		NSString *collection = nil;
+	                  usingBlock:^(int64_t rowid, NSUInteger index, BOOL *stop)
+	{
+		YapCollectionKey *ck = nil;
 		id metadata = nil;
-		[databaseTransaction getKey:&key collection:&collection metadata:&metadata forRowid:rowid];
+		[databaseTransaction getCollectionKey:&ck metadata:&metadata forRowid:rowid];
 		
-		block(collection, key, metadata, index, stop);
+		block(ck.collection, ck.key, metadata, index, stop);
 	}];
 }
 
@@ -4336,12 +4658,11 @@
 	
 	[self enumerateRowidsInGroup:group usingBlock:^(int64_t rowid, NSUInteger index, BOOL *stop) {
 		
-		NSString *key = nil;
-		NSString *collection = nil;
+		YapCollectionKey *ck = nil;
 		id object = nil;
-		[databaseTransaction getKey:&key collection:&collection object:&object forRowid:rowid];
+		[databaseTransaction getCollectionKey:&ck object:&object forRowid:rowid];
 		
-		block(collection, key, object, index, stop);
+		block(ck.collection, ck.key, object, index, stop);
 	}];
 }
 
@@ -4354,14 +4675,13 @@
 	
 	[self enumerateRowidsInGroup:group
 	                 withOptions:options
-	                  usingBlock:^(int64_t rowid, NSUInteger index, BOOL *stop) {
-		
-		NSString *key = nil;
-		NSString *collection = nil;
+	                  usingBlock:^(int64_t rowid, NSUInteger index, BOOL *stop)
+	{
+		YapCollectionKey *ck = nil;
 		id object = nil;
-		[databaseTransaction getKey:&key collection:&collection object:&object forRowid:rowid];
+		[databaseTransaction getCollectionKey:&ck object:&object forRowid:rowid];
 		
-		block(collection, key, object, index, stop);
+		block(ck.collection, ck.key, object, index, stop);
 	}];
 }
 
@@ -4376,14 +4696,13 @@
 	[self enumerateRowidsInGroup:group
 	                 withOptions:options
 	                       range:range
-	                  usingBlock:^(int64_t rowid, NSUInteger index, BOOL *stop) {
-		
-		NSString *key = nil;
-		NSString *collection = nil;
+	                  usingBlock:^(int64_t rowid, NSUInteger index, BOOL *stop)
+	{
+		YapCollectionKey *ck = nil;
 		id object = nil;
-		[databaseTransaction getKey:&key collection:&collection object:&object forRowid:rowid];
+		[databaseTransaction getCollectionKey:&ck object:&object forRowid:rowid];
 		
-		block(collection, key, object, index, stop);
+		block(ck.collection, ck.key, object, index, stop);
 	}];
 }
 
@@ -4395,13 +4714,12 @@
 	
 	[self enumerateRowidsInGroup:group usingBlock:^(int64_t rowid, NSUInteger index, BOOL *stop) {
 		
-		NSString *key = nil;
-		NSString *collection = nil;
+		YapCollectionKey *ck = nil;
 		id object = nil;
 		id metadata = nil;
-		[databaseTransaction getKey:&key collection:&collection object:&object metadata:&metadata forRowid:rowid];
+		[databaseTransaction getCollectionKey:&ck object:&object metadata:&metadata forRowid:rowid];
 		
-		block(collection, key, object, metadata, index, stop);
+		block(ck.collection, ck.key, object, metadata, index, stop);
 	}];
 }
 
@@ -4414,15 +4732,14 @@
 	
 	[self enumerateRowidsInGroup:group
 	                 withOptions:options
-	                  usingBlock:^(int64_t rowid, NSUInteger index, BOOL *stop) {
-						
-		NSString *key = nil;
-		NSString *collection = nil;
+	                  usingBlock:^(int64_t rowid, NSUInteger index, BOOL *stop)
+	{
+		YapCollectionKey *ck = nil;
 		id object = nil;
 		id metadata = nil;
-		[databaseTransaction getKey:&key collection:&collection object:&object metadata:&metadata forRowid:rowid];
-						
-		block(collection, key, object, metadata, index, stop);
+		[databaseTransaction getCollectionKey:&ck object:&object metadata:&metadata forRowid:rowid];
+		
+		block(ck.collection, ck.key, object, metadata, index, stop);
 	}];
 }
 
@@ -4437,15 +4754,14 @@
 	[self enumerateRowidsInGroup:group
 	                 withOptions:options
 	                       range:range
-	                  usingBlock:^(int64_t rowid, NSUInteger index, BOOL *stop) {
-		
-		NSString *key = nil;
-		NSString *collection = nil;
+	                  usingBlock:^(int64_t rowid, NSUInteger index, BOOL *stop)
+	{
+		YapCollectionKey *ck = nil;
 		id object = nil;
 		id metadata = nil;
-		[databaseTransaction getKey:&key collection:&collection object:&object metadata:&metadata forRowid:rowid];
+		[databaseTransaction getCollectionKey:&ck object:&object metadata:&metadata forRowid:rowid];
 		
-		block(collection, key, object, metadata, index, stop);
+		block(ck.collection, ck.key, object, metadata, index, stop);
 	}];
 }
 
@@ -4457,6 +4773,43 @@
 
 @implementation YapDatabaseViewTransaction (Mappings)
 
+/**
+ * Performance boost.
+ * If the object isn't in the cache, having the rowid makes for a faster fetch from sqlite.
+**/
+- (BOOL)getRowid:(int64_t *)rowidPtr
+   collectionKey:(YapCollectionKey **)collectionKeyPtr
+          forRow:(NSUInteger)row
+       inSection:(NSUInteger)section
+    withMappings:(YapDatabaseViewMappings *)mappings
+{
+	if (mappings)
+	{
+		NSString *group = nil;
+		NSUInteger index = 0;
+		
+		if ([mappings getGroup:&group index:&index forRow:row inSection:section])
+		{
+			int64_t rowid = 0;
+			if ([self getRowid:&rowid atIndex:index inGroup:group])
+			{
+				if (collectionKeyPtr)
+				{
+					YapCollectionKey *ck = [databaseTransaction collectionKeyForRowid:rowid];
+					*collectionKeyPtr = ck;
+				}
+				
+				if (rowidPtr) *rowidPtr = rowid;
+				return YES;
+			}
+		}
+	}
+	
+	if (rowidPtr) *rowidPtr = 0;
+	if (collectionKeyPtr) *collectionKeyPtr = nil;
+	return NO;
+}
+
 /**
  * Gets the key & collection at the given indexPath, assuming the given mappings are being used.
  * Returns NO if the indexPath is invalid, or the mappings aren't initialized.
@@ -4467,20 +4820,124 @@
    atIndexPath:(NSIndexPath *)indexPath
   withMappings:(YapDatabaseViewMappings *)mappings
 {
-	if (indexPath && mappings)
+	if (indexPath == nil)
 	{
-		NSString *group = nil;
-		NSUInteger index = 0;
+		if (keyPtr) *keyPtr = nil;
+		if (collectionPtr) *collectionPtr = nil;
 		
-		if ([mappings getGroup:&group index:&index forIndexPath:indexPath])
-		{
-			return [self getKey:keyPtr collection:collectionPtr atIndex:index inGroup:group];
-		}
+		return NO;
 	}
 	
-	if (keyPtr) *keyPtr = nil;
-	if (collectionPtr) *collectionPtr = nil;
-	return NO;
+#if TARGET_OS_IPHONE
+	NSUInteger section = indexPath.section;
+	NSUInteger row = indexPath.row;
+#else
+	NSUInteger section = [indexPath indexAtPosition:0];
+	NSUInteger row = [indexPath indexAtPosition:1];
+#endif
+	
+	YapCollectionKey *ck = nil;
+	BOOL result = [self getRowid:NULL
+	               collectionKey:&ck
+	                      forRow:row
+	                   inSection:section
+	                withMappings:mappings];
+	
+	if (keyPtr) *keyPtr = ck.key;
+	if (collectionPtr) *collectionPtr = ck.collection;
+	
+	return result;
+}
+
+/**
+ * Gets the key & collection at the given row & section, assuming the given mappings are being used.
+ * Returns NO if the row or section is invalid, or the mappings aren't initialized.
+ * Otherwise returns YES, and sets the key & collection ptr (both optional).
+**/
+- (BOOL)getKey:(NSString **)keyPtr
+    collection:(NSString **)collectionPtr
+        forRow:(NSUInteger)row
+     inSection:(NSUInteger)section
+  withMappings:(YapDatabaseViewMappings *)mappings
+{
+	YapCollectionKey *ck = nil;
+	BOOL result = [self getRowid:NULL
+	               collectionKey:&ck
+	                      forRow:row
+	                   inSection:section
+	                withMappings:mappings];
+	
+	if (keyPtr) *keyPtr = ck.key;
+	if (collectionPtr) *collectionPtr = ck.collection;
+	
+	return result;
+}
+
+/**
+ * Gets the object at the given indexPath, assuming the given mappings are being used.
+ * 
+ * Equivalent to invoking:
+ *
+ * NSString *collection, *key;
+ * if ([[transaction ext:@"myView"] getKey:&key collection:&collection atIndexPath:indexPath withMappings:mappings]) {
+ *     object = [transaction objectForKey:key inCollection:collection];
+ * }
+**/
+- (id)objectAtIndexPath:(NSIndexPath *)indexPath withMappings:(YapDatabaseViewMappings *)mappings
+{
+	if (indexPath == nil)
+	{
+		return nil;
+	}
+	
+#if TARGET_OS_IPHONE
+	NSUInteger section = indexPath.section;
+	NSUInteger row = indexPath.row;
+#else
+	NSUInteger section = [indexPath indexAtPosition:0];
+	NSUInteger row = [indexPath indexAtPosition:1];
+#endif
+	
+	id object = nil;
+	
+	int64_t rowid = 0;
+	YapCollectionKey *ck = nil;
+	
+	if ([self getRowid:&rowid collectionKey:&ck forRow:row inSection:section withMappings:mappings])
+	{
+		object = [databaseTransaction objectForCollectionKey:ck withRowid:rowid];
+	}
+	
+	return object;
+}
+
+/**
+ * Gets the object at the given indexPath, assuming the given mappings are being used.
+ *
+ * Equivalent to invoking:
+ *
+ * NSString *collection, *key;
+ * if ([[transaction ext:@"view"] getKey:&key
+ *                            collection:&collection
+ *                                forRow:row
+ *                             inSection:section
+ *                          withMappings:mappings]) {
+ *     object = [transaction objectForKey:key inCollection:collection];
+ * }
+**/
+- (id)objectAtRow:(NSUInteger)row inSection:(NSUInteger)section withMappings:(YapDatabaseViewMappings *)mappings
+{
+	id object = nil;
+	
+	int64_t rowid = 0;
+	YapCollectionKey *ck = nil;
+	
+	if ([self getRowid:&rowid collectionKey:&ck forRow:row inSection:section withMappings:mappings])
+	{
+		object = [databaseTransaction objectForCollectionKey:ck withRowid:rowid];
+	}
+	
+	return object;
 }
 
 /**
@@ -4502,4 +4959,28 @@
 	return nil;
 }
 
+/**
+ * Fetches the row & section for the given {collection, key} tuple, assuming the given mappings are being used.
+ * Returns NO if the {collection, key} tuple isn't included in the view + mappings.
+ * Otherwise returns YES, and sets the row & section (both optional).
+**/
+- (BOOL)getRow:(NSUInteger *)rowPtr
+       section:(NSUInteger *)sectionPtr
+        forKey:(NSString *)key
+  inCollection:(NSString *)collection
+  withMappings:(YapDatabaseViewMappings *)mappings
+{
+	NSString *group = nil;
+	NSUInteger index = 0;
+	
+	if ([self getGroup:&group index:&index forKey:key inCollection:collection])
+	{
+		return [mappings getRow:rowPtr section:sectionPtr forIndex:index inGroup:group];
+	}
+	
+	if (rowPtr) *rowPtr = 0;
+	if (sectionPtr) *sectionPtr = 0;
+	return NO;
+}
+
 @end