1. task_id is 64 bit now

2. cleanups

Author: erlichmen

Classes/IPOfflineQueue.h

@@ -14,6 +14,8 @@ typedef enum {
 
 typedef IPOfflineQueueFilterResult (^IPOfflineQueueFilterBlock)(NSDictionary *userInfo);
 
+typedef unsigned long long int task_id;
+
 @class IPOfflineQueue;
 
 
@@ -26,7 +28,7 @@ typedef IPOfflineQueueFilterResult (^IPOfflineQueueFilterBlock)(NSDictionary *us
 // Returning IPOfflineQueueResultFailureShouldPauseQueue will pause the queue and the same task will be retried when the queue is resumed.
 //  Typically, you'd only return this if the internet connection is offline or some other global condition prevents ALL queued tasks from executing.
 @required
-- (IPOfflineQueueResult)offlineQueue:(IPOfflineQueue *)queue taskId:(int)taskId executeActionWithUserInfo:(NSDictionary *)userInfo;
+- (IPOfflineQueueResult)offlineQueue:(IPOfflineQueue *)queue taskId:(task_id)taskId executeActionWithUserInfo:(NSDictionary *)userInfo;
 
 @optional
 // Called before auto-resuming upon Reachability changes, app reactivation, or autoResumeInterval elapsed
@@ -48,8 +50,8 @@ typedef IPOfflineQueueFilterResult (^IPOfflineQueueFilterBlock)(NSDictionary *us
 
 - (void)stop:(NSString *)reason;
 - (void)start:(NSString *)reason;
-- (void)finishTask:(int)taskId;
-- (void)taskFailed:(int)taskId error:(NSError *)error;
+- (void)finishTask:(task_id)taskId;
+- (void)taskFailed:(task_id)taskId error:(NSError *)error;
 
 - (void)items:(void (^)(NSDictionary *userInfo))callback;
 

Classes/IPOfflineQueue.m

@@ -14,8 +14,6 @@
 static const int ddLogLevel = LOG_LEVEL_WARN;
 #endif
 
-#define kMaxRetrySeconds 10000
-
 static NSMutableSet *_activeQueues = nil;
 
 #define TABLE_NAME @"queue2"
@@ -28,8 +26,6 @@ @interface IPOfflineQueue() {
 
     NSNumber *_waitingForJob;
     NSDate *_waitingJobStartTime;
-    
-    BOOL _waitingForRetry;
 }
 @end
 
@@ -119,12 +115,6 @@ -(NSString*)dbFilePath {
                         [NSString stringWithFormat:@"%@.queue", _name]];    
 }
 
--(void)dropDB {
-    [self closeDB];
-    [[NSFileManager defaultManager] removeItemAtPath:[self dbFilePath] error:nil];
-    [self openDB];
-}
-
 -(void)closeDB {
     FMDatabaseQueue *dbQueue = self.currentDbQueue;
 
@@ -188,7 +178,7 @@ -(void)openDB {
                  raise];
             }
 
-            [self clear:db];
+            [self clear];
         } else {
             isNewQueue = NO;
         };
@@ -246,15 +236,14 @@ -(void)enqueueOperation {
     }];
 }
 
-- (void)enqueueActionWithUserInfo:(NSDictionary *)userInfo
+-(void)enqueueActionWithUserInfo:(NSDictionary *)userInfo
 {
     [self.dbQueue inDatabase:^(FMDatabase *db) {
         [self backgroundTaskBlock:^{
             NSMutableData *data = [[NSMutableData alloc] init];
             NSKeyedArchiver *archiver = [[NSKeyedArchiver alloc] initForWritingWithMutableData:data];
             [archiver encodeObject:userInfo forKey:@"userInfo"];
             [archiver finishEncoding];
-            archiver = nil;
 
             NSError *error;
             NSString *sql = [NSString stringWithFormat:@"INSERT INTO %@ (params) VALUES (?)", TABLE_NAME];
@@ -285,14 +274,11 @@ - (void)filterActionsUsingBlock:(IPOfflineQueueFilterBlock)filterBlock {
         FMResultSet *rs = [db executeQuery:[NSString stringWithFormat:@"SELECT taskid, params FROM %@ ORDER BY taskid", TABLE_NAME]];
 
         while ([rs next]) {
-            sqlite_uint64 taskId = [rs intForColumnIndex:0];
+            sqlite_uint64 taskId = [rs unsignedLongLongIntForColumnIndex:0];
             NSData *blobData = [rs dataForColumnIndex:1];
 
-            NSKeyedUnarchiver *unarchiver = [[NSKeyedUnarchiver alloc] initForReadingWithData:blobData];
-            NSDictionary *userInfo = [unarchiver decodeObjectForKey:@"userInfo"];
-            [unarchiver finishDecoding];
-            unarchiver = nil;
-            
+            NSDictionary *userInfo = [self decodeTaskInfo:blobData];
+
             if (filterBlock(userInfo) == IPOfflineQueueFilterResultAttemptToDelete) {
                 [self deleteTask:taskId db:db];
             }
@@ -302,7 +288,7 @@ - (void)filterActionsUsingBlock:(IPOfflineQueueFilterBlock)filterBlock {
     }];
 }
 
-- (void)clear:(FMDatabase*)db {
+- (void)clear {
     [self backgroundTaskBlock:^{
         [_operationQueue cancelAllOperations];
         [self.dbQueue inDatabase:^(FMDatabase *db) {
@@ -323,15 +309,14 @@ - (void)clear:(FMDatabase*)db {
 - (void)waitForRetry {
     NSString *reason = [NSString stringWithFormat:@"Last task of %@ failed waiting for retry", _name];
     DDLogError(@"Last task of %@ failed waiting for retry", _name);
-    
-    _waitingForRetry = TRUE;
+
     [self suspended:reason];
 }
 
-- (void)waitForJob:(int)jobId {
+- (void)waitForJob:(task_id)jobId {
     _waitingForJob = [NSNumber numberWithInt:jobId];
     _waitingJobStartTime = [NSDate date];
-    [self stop:[NSString stringWithFormat:@"Waiting for job id %d", jobId]];
+    [self stop:[NSString stringWithFormat:@"Waiting for job id %lld", jobId]];
 }
 
 - (void)stop:(NSString *)reason {
@@ -388,7 +373,11 @@ - (void)setAutoResumeInterval:(NSTimeInterval)newInterval
             }
 
             if (newInterval > 0) {
-                _autoResumeTimer = [NSTimer scheduledTimerWithTimeInterval:newInterval target:self selector:@selector(autoResumeTimerFired:) userInfo:nil repeats:YES];
+                _autoResumeTimer = [NSTimer scheduledTimerWithTimeInterval:newInterval
+                                                                    target:self
+                                                                  selector:@selector(autoResumeTimerFired:)
+                                                                  userInfo:nil
+                                                                   repeats:YES];
             } else {
                 _autoResumeTimer = nil;
             }
@@ -402,12 +391,8 @@ - (void)items:(void (^)(NSDictionary *userInfo))callback {
 
         while ([rs next]) {
             NSData *blobData = [rs dataForColumnIndex:0];
-            
-            NSKeyedUnarchiver *unarchiver = [[NSKeyedUnarchiver alloc] initForReadingWithData:blobData];
-            NSDictionary *userInfo = [unarchiver decodeObjectForKey:@"userInfo"];
-            [unarchiver finishDecoding];
-            unarchiver = nil;
-            
+            NSDictionary *userInfo = [self decodeTaskInfo:blobData];
+
             callback(userInfo);
         }
 
@@ -446,13 +431,13 @@ -(void)recoverPendingTasks {
 
 // this task has failed, need to be rerun
 // next time the queue will run again it will pop the task again
--(void)taskFailed:(int)taskId error:(NSError *)error{
-    DDLogError(@"Task %d failed", taskId);
+-(void)taskFailed:(task_id)taskId error:(NSError *)error{
+    DDLogError(@"Task %lld failed", taskId);
 
     [self resetWaitingTask:taskId error:error]; // TODO run in the proper queue
 }
 
--(void)finishTask:(int)taskId {
+-(void)finishTask:(task_id)taskId {
     DDLogInfo(@"Task %d finished", taskId);
 
     [self.dbQueue inDatabase:^(FMDatabase *db) {
@@ -461,24 +446,24 @@ -(void)finishTask:(int)taskId {
     }];
 }
 
--(void)resetWaitingTask:(int)taskId error:(NSError *)error {
-    if ([_waitingForJob integerValue] == taskId) {
+-(void)resetWaitingTask:(task_id)taskId error:(NSError *)error {
+    if ([_waitingForJob unsignedLongLongValue] == taskId) {
         if (error) {
-            DDLogInfo(@"Task %d finished with error %@ total time %f seconds", taskId, error, [_waitingJobStartTime timeIntervalSinceNow]);
+            DDLogInfo(@"Task %d finished with error %@ total time %f seconds", taskId, error, -[_waitingJobStartTime timeIntervalSinceNow]);
         } else {
-            DDLogInfo(@"Task %d finished total time %f seconds", taskId, [_waitingJobStartTime timeIntervalSinceNow]);
+            DDLogInfo(@"Task %d finished total time %f seconds", taskId, -[_waitingJobStartTime timeIntervalSinceNow]);
         }
         _waitingForJob = nil;
         _waitingJobStartTime = nil;
     }
 }
 
 
--(void)deleteTask:(int)taskId db:(FMDatabase *)db {
+-(void)deleteTask:(task_id)taskId db:(FMDatabase *)db {
     [self backgroundTaskBlock:^{
         NSString *sql = [NSString stringWithFormat:@"DELETE FROM %@ WHERE taskid = ?", TABLE_NAME];
         NSError *error;
-        BOOL deleted = [db update:sql withErrorAndBindings:&error, [NSNumber numberWithInt:taskId]];
+        BOOL deleted = [db update:sql withErrorAndBindings:&error, [NSNumber numberWithUnsignedLongLong:taskId]];
 
         if (deleted == FALSE) {
             [[NSException exceptionWithName:@"IPOfflineQueueDatabaseException"
@@ -494,7 +479,7 @@ -(void)deleteTask:(int)taskId db:(FMDatabase *)db {
 - (void)execute {
     [self.dbQueue inDatabase:^(FMDatabase *db) {
 
-        sqlite_uint64 taskId;
+        sqlite_uint64 taskId = 0;
         NSData *blobData;
 
         NSString *sql = [NSString stringWithFormat:@"SELECT taskid, params FROM %@ ORDER BY taskid LIMIT 1", TABLE_NAME];
@@ -509,7 +494,7 @@ - (void)execute {
 
         BOOL hasData = [rs next];
         if (hasData) {
-            taskId = [rs intForColumnIndex:0];
+            taskId = [rs unsignedLongLongIntForColumnIndex:0];
             blobData = [rs dataForColumnIndex:1];
         }
 
@@ -520,12 +505,9 @@ - (void)execute {
         if (isEmpty) {
             return;
         }
-        
-        NSKeyedUnarchiver *unarchiver = [[NSKeyedUnarchiver alloc] initForReadingWithData:blobData];
-        NSDictionary *userInfo = [unarchiver decodeObjectForKey:@"userInfo"];
-        [unarchiver finishDecoding];
-        unarchiver = nil;
-        
+
+        NSDictionary *userInfo= [self decodeTaskInfo:blobData];
+
         IPOfflineQueueResult result = [self.delegate offlineQueue:self taskId:taskId executeActionWithUserInfo:userInfo];
         if (result == IPOfflineQueueResultSuccess) {
             [self deleteTask:taskId db:db];
@@ -537,4 +519,16 @@ - (void)execute {
     }];
 }
 
+- (NSDictionary *)decodeTaskInfo:(NSData *)blobData {
+    NSKeyedUnarchiver *unarchiver = [[NSKeyedUnarchiver alloc] initForReadingWithData:blobData];
+    NSDictionary *userInfo = [unarchiver decodeObjectForKey:@"userInfo"];
+    [unarchiver finishDecoding];
+#pragma clang diagnostic push
+#pragma ide diagnostic ignored "UnusedValue"
+    unarchiver = nil;
+#pragma clang diagnostic pop
+
+    return userInfo;
+}
+
 @end