Proper failable methods for the LocalIdStore

Author: flovilmart

Parse/Parse/Internal/Object/LocalIdStore/PFObjectLocalIdStore.h

@@ -38,10 +38,10 @@
 ///--------------------------------------
 
 - (NSString *)createLocalId;
-- (void)retainLocalIdOnDisk:(NSString *)localId error:(NSError **)error;
-- (void)releaseLocalIdOnDisk:(NSString *)localId error:(NSError **)error;
+- (BOOL)retainLocalIdOnDisk:(NSString *)localId error:(NSError **)error;
+- (BOOL)releaseLocalIdOnDisk:(NSString *)localId error:(NSError **)error;
 
-- (void)setObjectId:(NSString *)objectId forLocalId:(NSString *)localId error:(NSError **)error;
+- (BOOL)setObjectId:(NSString *)objectId forLocalId:(NSString *)localId error:(NSError **)error;
 - (NSString *)objectIdForLocalId:(NSString *)localId;
 
 // For testing only.

Parse/Parse/Internal/Object/LocalIdStore/PFObjectLocalIdStore.m

@@ -154,7 +154,9 @@ - (PFObjectLocalIdStoreMapEntry *)getMapEntry:(NSString *)localId error:(NSError
         if (objectId) {
             entry.objectId = objectId;
             if (entry.referenceCount > 0) {
-                [self putMapEntry:entry forLocalId:localId];
+                if(![self putMapEntry:entry forLocalId:localId error:error]) {
+                    return nil;
+                }
             }
         }
     }
@@ -165,21 +167,23 @@ - (PFObjectLocalIdStoreMapEntry *)getMapEntry:(NSString *)localId error:(NSError
 /**
  * Writes one entry to the local id map on disk.
  */
-- (void)putMapEntry:(PFObjectLocalIdStoreMapEntry *)entry forLocalId:(NSString *)localId {
-    PFConsistencyAssert([[self class] isLocalId:localId], @"Tried to get invalid local id: \"%@\".", localId);
+- (BOOL)putMapEntry:(PFObjectLocalIdStoreMapEntry *)entry forLocalId:(NSString *)localId error:(NSError **)error {
+    PFConsistencyError(error, [[self class] isLocalId:localId], NO, @"Tried to get invalid local id: \"%@\".", localId);
 
     NSString *file = [_diskPath stringByAppendingPathComponent:localId];
     [entry writeToFile:file];
+    return YES;
 }
 
 /**
  * Removes an entry from the local id map on disk.
  */
-- (void)removeMapEntry:(NSString *)localId {
-    PFConsistencyAssert([[self class] isLocalId:localId], @"Tried to get invalid local id: \"%@\".", localId);
+- (BOOL)removeMapEntry:(NSString *)localId error:(NSError **)error {
+    PFConsistencyError(error, [[self class] isLocalId:localId], NO, @"Tried to get invalid local id: \"%@\".", localId);
 
     NSString *file = [_diskPath stringByAppendingPathComponent:localId];
     [[NSFileManager defaultManager] removeItemAtPath:file error:nil];
+    return YES;
 }
 
 /**
@@ -203,49 +207,52 @@ - (NSString *)createLocalId {
 /**
  * Increments the retain count of a local id on disk.
  */
-- (void)retainLocalIdOnDisk:(NSString *)localId error:(NSError **)error {
+- (BOOL)retainLocalIdOnDisk:(NSString *)localId error:(NSError **)error {
     @synchronized (_lock) {
         PFObjectLocalIdStoreMapEntry *entry = [self getMapEntry:localId error:error];
-        if (!entry || error) {
-            return;
+        if (!entry && error) {
+            return NO;
         }
         entry.referenceCount++;
-        [self putMapEntry:entry forLocalId:localId];
+        return [self putMapEntry:entry forLocalId:localId error:error];
     }
 }
 
 /**
  * Decrements the retain count of a local id on disk.
  * If the retain count hits zero, the id is forgotten forever.
  */
-- (void)releaseLocalIdOnDisk:(NSString *)localId error:(NSError **)error {
+- (BOOL)releaseLocalIdOnDisk:(NSString *)localId error:(NSError **)error {
     @synchronized (_lock) {
         PFObjectLocalIdStoreMapEntry *entry = [self getMapEntry:localId error:error];
-        if (error || !entry) {
-            return;
+        if (!entry && error) {
+            return NO;
         }
         if (--entry.referenceCount > 0) {
-            [self putMapEntry:entry forLocalId:localId];
+            return [self putMapEntry:entry forLocalId:localId error:error];
         } else {
-            [self removeMapEntry:localId];
+            return [self removeMapEntry:localId error:error];
         }
     }
 }
 
 /**
  * Sets the objectId associated with a given local id.
  */
-- (void)setObjectId:(NSString *)objectId forLocalId:(NSString *)localId error:(NSError **)error {
+- (BOOL)setObjectId:(NSString *)objectId forLocalId:(NSString *)localId error:(NSError **)error {
     @synchronized (_lock) {
         PFObjectLocalIdStoreMapEntry *entry = [self getMapEntry:localId error:error];
-        if (error || !entry) {
-            return;
+        if (!entry && error) {
+            return NO;
         }
         if (entry.referenceCount > 0) {
             entry.objectId = objectId;
-            [self putMapEntry:entry forLocalId:localId];
+            if (![self putMapEntry:entry forLocalId:localId error:error]) {
+                return NO;
+            }
         }
         _inMemoryCache[localId] = objectId;
+        return YES;
     }
 }