From f70a45ef1b59cdb89a0ec827c30c80d0546539b1 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 23 Apr 2018 17:11:22 -0400 Subject: [PATCH] Clean up ahead of PR. --- .../src/Messages/OWSDisappearingMessagesFinder.m | 2 +- .../src/Messages/OWSFailedAttachmentDownloadsJob.m | 2 +- SignalServiceKit/src/Messages/OWSFailedMessagesJob.m | 2 +- SignalServiceKit/src/Storage/OWSIncomingMessageFinder.m | 2 +- SignalServiceKit/src/Storage/OWSStorage.h | 2 +- SignalServiceKit/src/Storage/OWSStorage.m | 5 ++++- SignalServiceKit/src/Storage/TSDatabaseSecondaryIndexes.m | 2 +- 7 files changed, 10 insertions(+), 7 deletions(-) diff --git a/SignalServiceKit/src/Messages/OWSDisappearingMessagesFinder.m b/SignalServiceKit/src/Messages/OWSDisappearingMessagesFinder.m index 9e8d6fb1f..cd2261f2c 100644 --- a/SignalServiceKit/src/Messages/OWSDisappearingMessagesFinder.m +++ b/SignalServiceKit/src/Messages/OWSDisappearingMessagesFinder.m @@ -188,7 +188,7 @@ static NSString *const OWSDisappearingMessageFinderExpiresAtIndex = @"index_mess return [[YapDatabaseSecondaryIndex alloc] initWithSetup:setup handler:handler - versionTag:[OWSStorage appendSuffixToDatabaseExtensionVersionIfNecessary:@"1"]]; + versionTag:[OWSStorage appendSuffixToDatabaseExtensionVersionIfNecessary:nil]]; } #ifdef DEBUG diff --git a/SignalServiceKit/src/Messages/OWSFailedAttachmentDownloadsJob.m b/SignalServiceKit/src/Messages/OWSFailedAttachmentDownloadsJob.m index a990f99c1..753bf7105 100644 --- a/SignalServiceKit/src/Messages/OWSFailedAttachmentDownloadsJob.m +++ b/SignalServiceKit/src/Messages/OWSFailedAttachmentDownloadsJob.m @@ -117,7 +117,7 @@ static NSString *const OWSFailedAttachmentDownloadsJobAttachmentStateIndex = @"i return [[YapDatabaseSecondaryIndex alloc] initWithSetup:setup handler:handler - versionTag:[OWSStorage appendSuffixToDatabaseExtensionVersionIfNecessary:@"1"]]; + versionTag:[OWSStorage appendSuffixToDatabaseExtensionVersionIfNecessary:nil]]; } #ifdef DEBUG diff --git a/SignalServiceKit/src/Messages/OWSFailedMessagesJob.m b/SignalServiceKit/src/Messages/OWSFailedMessagesJob.m index 30ebe6ba6..08e8ab7b5 100644 --- a/SignalServiceKit/src/Messages/OWSFailedMessagesJob.m +++ b/SignalServiceKit/src/Messages/OWSFailedMessagesJob.m @@ -127,7 +127,7 @@ static NSString *const OWSFailedMessagesJobMessageStateIndex = @"index_outoing_m return [[YapDatabaseSecondaryIndex alloc] initWithSetup:setup handler:handler - versionTag:[OWSStorage appendSuffixToDatabaseExtensionVersionIfNecessary:@"1"]]; + versionTag:[OWSStorage appendSuffixToDatabaseExtensionVersionIfNecessary:nil]]; } #ifdef DEBUG diff --git a/SignalServiceKit/src/Storage/OWSIncomingMessageFinder.m b/SignalServiceKit/src/Storage/OWSIncomingMessageFinder.m index ad6522619..22e53c06f 100644 --- a/SignalServiceKit/src/Storage/OWSIncomingMessageFinder.m +++ b/SignalServiceKit/src/Storage/OWSIncomingMessageFinder.m @@ -92,7 +92,7 @@ NSString *const OWSIncomingMessageFinderColumnSourceDeviceId = @"OWSIncomingMess return [[YapDatabaseSecondaryIndex alloc] initWithSetup:setup handler:handler - versionTag:[OWSStorage appendSuffixToDatabaseExtensionVersionIfNecessary:@"1"]]; + versionTag:[OWSStorage appendSuffixToDatabaseExtensionVersionIfNecessary:nil]]; } + (NSString *)databaseExtensionName diff --git a/SignalServiceKit/src/Storage/OWSStorage.h b/SignalServiceKit/src/Storage/OWSStorage.h index 526e99075..4d91706ff 100644 --- a/SignalServiceKit/src/Storage/OWSStorage.h +++ b/SignalServiceKit/src/Storage/OWSStorage.h @@ -67,7 +67,7 @@ typedef void (^OWSStorageMigrationBlock)(void); #pragma mark - Extension Registration + (void)incrementDatabaseExtensionVersionSuffix; -+ (NSString *)appendSuffixToDatabaseExtensionVersionIfNecessary:(NSString *)versionTag; ++ (nullable NSString *)appendSuffixToDatabaseExtensionVersionIfNecessary:(nullable NSString *)versionTag; - (BOOL)registerExtension:(YapDatabaseExtension *)extension withName:(NSString *)extensionName; diff --git a/SignalServiceKit/src/Storage/OWSStorage.m b/SignalServiceKit/src/Storage/OWSStorage.m index d902f4356..b2aa5f27d 100644 --- a/SignalServiceKit/src/Storage/OWSStorage.m +++ b/SignalServiceKit/src/Storage/OWSStorage.m @@ -490,12 +490,15 @@ NSString *const kNSUserDefaults_DatabaseExtensionVersionSuffix = @"kNSUserDefaul return [NSString stringWithFormat:@".%@", suffix]; } -+ (NSString *)appendSuffixToDatabaseExtensionVersionIfNecessary:(NSString *)versionTag ++ (nullable NSString *)appendSuffixToDatabaseExtensionVersionIfNecessary:(nullable NSString *)versionTag { OWSAssertIsOnMainThread(); NSString *_Nullable suffix = [self databaseExtensionVersionSuffix]; if (suffix) { + if (!versionTag) { + versionTag = @"0"; + } NSString *result = [versionTag stringByAppendingString:suffix]; DDLogWarn(@"%@ database extension version: %@ + %@ -> %@", self.logTag, versionTag, suffix, result); return result; diff --git a/SignalServiceKit/src/Storage/TSDatabaseSecondaryIndexes.m b/SignalServiceKit/src/Storage/TSDatabaseSecondaryIndexes.m index 646d02293..296bf43ca 100644 --- a/SignalServiceKit/src/Storage/TSDatabaseSecondaryIndexes.m +++ b/SignalServiceKit/src/Storage/TSDatabaseSecondaryIndexes.m @@ -29,7 +29,7 @@ YapDatabaseSecondaryIndex *secondaryIndex = [[YapDatabaseSecondaryIndex alloc] initWithSetup:setup handler:handler - versionTag:[OWSStorage appendSuffixToDatabaseExtensionVersionIfNecessary:@"1"]]; + versionTag:[OWSStorage appendSuffixToDatabaseExtensionVersionIfNecessary:nil]]; return secondaryIndex; }