From 6c0d44e8cd328e6951312a73c368496e947d58cf Mon Sep 17 00:00:00 2001 From: Nora Trapp Date: Tue, 12 Apr 2022 22:56:18 -0700 Subject: [PATCH 1/7] Enable stories migration 1 --- .../Storage/Database/GRDBSchemaMigrator.swift | 24 ++++++++----------- SignalServiceKit/src/Util/FeatureFlags.swift | 3 --- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/SignalServiceKit/src/Storage/Database/GRDBSchemaMigrator.swift b/SignalServiceKit/src/Storage/Database/GRDBSchemaMigrator.swift index 5fd8aeae5d..0f83ce7cbc 100644 --- a/SignalServiceKit/src/Storage/Database/GRDBSchemaMigrator.swift +++ b/SignalServiceKit/src/Storage/Database/GRDBSchemaMigrator.swift @@ -1607,22 +1607,18 @@ public class GRDBSchemaMigrator: NSObject { // These index migrations are *expensive* for users with large interaction tables. For external // users who don't yet have access to stories and don't have need for the indices, we will perform // one migration per release to keep the blocking time low (ideally one 5-7s migration per release). - if FeatureFlags.storiesMigration1 { + migrator.registerMigration(MigrationId.updateConversationLoadInteractionCountIndex.rawValue) { db in + let transaction = GRDBWriteTransaction(database: db) + defer { transaction.finalizeTransaction() } + guard !hasRunMigration("addColumnsForStoryContext", transaction: transaction) else { return } - migrator.registerMigration(MigrationId.updateConversationLoadInteractionCountIndex.rawValue) { db in - let transaction = GRDBWriteTransaction(database: db) - defer { transaction.finalizeTransaction() } - guard !hasRunMigration("addColumnsForStoryContext", transaction: transaction) else { return } - - try db.execute(sql: """ - DROP INDEX index_model_TSInteraction_ConversationLoadInteractionCount; - - CREATE INDEX index_model_TSInteraction_ConversationLoadInteractionCount - ON model_TSInteraction(uniqueThreadId, isGroupStoryReply, recordType) - WHERE recordType IS NOT \(SDSRecordType.recoverableDecryptionPlaceholder.rawValue); - """) - } + try db.execute(sql: """ + DROP INDEX index_model_TSInteraction_ConversationLoadInteractionCount; + CREATE INDEX index_model_TSInteraction_ConversationLoadInteractionCount + ON model_TSInteraction(uniqueThreadId, isGroupStoryReply, recordType) + WHERE recordType IS NOT \(SDSRecordType.recoverableDecryptionPlaceholder.rawValue); + """) } if FeatureFlags.storiesMigration2 { diff --git a/SignalServiceKit/src/Util/FeatureFlags.swift b/SignalServiceKit/src/Util/FeatureFlags.swift index b7f0e909dc..5ce167e752 100644 --- a/SignalServiceKit/src/Util/FeatureFlags.swift +++ b/SignalServiceKit/src/Util/FeatureFlags.swift @@ -91,9 +91,6 @@ public class FeatureFlags: BaseFlags { @objc public static let stories = build.includes(.qa) - @objc - public static let storiesMigration1 = build.includes(.beta) - @objc public static let storiesMigration2 = build.includes(.qa) From 39e016909412496727e535d937b0d6f672d56d97 Mon Sep 17 00:00:00 2001 From: Michelle Linington Date: Tue, 12 Apr 2022 23:03:15 -0700 Subject: [PATCH 2/7] "Feature flags for .production." --- SignalServiceKit/src/Util/FeatureFlags.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SignalServiceKit/src/Util/FeatureFlags.swift b/SignalServiceKit/src/Util/FeatureFlags.swift index 5ce167e752..21db9af38e 100644 --- a/SignalServiceKit/src/Util/FeatureFlags.swift +++ b/SignalServiceKit/src/Util/FeatureFlags.swift @@ -19,7 +19,7 @@ extension FeatureBuild { } } -private let build: FeatureBuild = OWSIsDebugBuild() ? .dev : .qa +private let build: FeatureBuild = OWSIsDebugBuild() ? .dev : .production // MARK: - From c1f0c7bd72423a07e8012d918e7685e5253e0164 Mon Sep 17 00:00:00 2001 From: Michelle Linington Date: Tue, 12 Apr 2022 23:03:17 -0700 Subject: [PATCH 3/7] "Bump build to 5.35.0.33." --- Signal/Signal-Info.plist | 4 ++-- SignalNSE/Info.plist | 4 ++-- SignalShareExtension/Info.plist | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 74ff4d7249..e208814b5b 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -43,7 +43,7 @@ CFBundleVersion - 32 + 33 ITSAppUsesNonExemptEncryption LOGS_EMAIL @@ -141,7 +141,7 @@ INStartCallIntent OWSBundleVersion4 - 5.35.0.32 + 5.35.0.33 PHPhotoLibraryPreventAutomaticLimitedAccessAlert UIApplicationShortcutItems diff --git a/SignalNSE/Info.plist b/SignalNSE/Info.plist index e66ca22ab8..9b685ddcf1 100644 --- a/SignalNSE/Info.plist +++ b/SignalNSE/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 5.35.0 CFBundleVersion - 32 + 33 NSAppTransportSecurity NSExceptionDomains @@ -55,6 +55,6 @@ $(PRODUCT_MODULE_NAME).NotificationService OWSBundleVersion4 - 5.35.0.32 + 5.35.0.33 diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 577b7e97ec..9ce0a7900b 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 5.35.0 CFBundleVersion - 32 + 33 ITSAppUsesNonExemptEncryption NSAppTransportSecurity @@ -77,7 +77,7 @@ com.apple.share-services OWSBundleVersion4 - 5.35.0.32 + 5.35.0.33 UIStatusBarStyle UIStatusBarStyleLightContent UIViewControllerBasedStatusBarAppearance From 7699c9fa9a65c23cdfa9ffcb7382c37e2a2780a2 Mon Sep 17 00:00:00 2001 From: Michelle Linington Date: Tue, 12 Apr 2022 23:04:21 -0700 Subject: [PATCH 4/7] "Feature flags for .beta." --- SignalServiceKit/src/Util/FeatureFlags.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SignalServiceKit/src/Util/FeatureFlags.swift b/SignalServiceKit/src/Util/FeatureFlags.swift index 21db9af38e..4f7e652be3 100644 --- a/SignalServiceKit/src/Util/FeatureFlags.swift +++ b/SignalServiceKit/src/Util/FeatureFlags.swift @@ -19,7 +19,7 @@ extension FeatureBuild { } } -private let build: FeatureBuild = OWSIsDebugBuild() ? .dev : .production +private let build: FeatureBuild = OWSIsDebugBuild() ? .dev : .beta // MARK: - From f3a56cafea3c7335cf515c79ae03a938e557b2c1 Mon Sep 17 00:00:00 2001 From: Michelle Linington Date: Tue, 12 Apr 2022 23:04:24 -0700 Subject: [PATCH 5/7] "Bump build to 5.35.0.34." (Beta) --- Signal/Signal-Info.plist | 4 ++-- SignalNSE/Info.plist | 4 ++-- SignalShareExtension/Info.plist | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index e208814b5b..2ffe1d3203 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -43,7 +43,7 @@ CFBundleVersion - 33 + 34 ITSAppUsesNonExemptEncryption LOGS_EMAIL @@ -141,7 +141,7 @@ INStartCallIntent OWSBundleVersion4 - 5.35.0.33 + 5.35.0.34 PHPhotoLibraryPreventAutomaticLimitedAccessAlert UIApplicationShortcutItems diff --git a/SignalNSE/Info.plist b/SignalNSE/Info.plist index 9b685ddcf1..956b1e0434 100644 --- a/SignalNSE/Info.plist +++ b/SignalNSE/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 5.35.0 CFBundleVersion - 33 + 34 NSAppTransportSecurity NSExceptionDomains @@ -55,6 +55,6 @@ $(PRODUCT_MODULE_NAME).NotificationService OWSBundleVersion4 - 5.35.0.33 + 5.35.0.34 diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index 9ce0a7900b..f8b2a7c7df 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 5.35.0 CFBundleVersion - 33 + 34 ITSAppUsesNonExemptEncryption NSAppTransportSecurity @@ -77,7 +77,7 @@ com.apple.share-services OWSBundleVersion4 - 5.35.0.33 + 5.35.0.34 UIStatusBarStyle UIStatusBarStyleLightContent UIViewControllerBasedStatusBarAppearance From a61fac154313ad928c489352be2e78dff1f63b62 Mon Sep 17 00:00:00 2001 From: Michelle Linington Date: Tue, 12 Apr 2022 23:04:27 -0700 Subject: [PATCH 6/7] "Feature flags for .qa." --- SignalServiceKit/src/Util/FeatureFlags.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SignalServiceKit/src/Util/FeatureFlags.swift b/SignalServiceKit/src/Util/FeatureFlags.swift index 4f7e652be3..5ce167e752 100644 --- a/SignalServiceKit/src/Util/FeatureFlags.swift +++ b/SignalServiceKit/src/Util/FeatureFlags.swift @@ -19,7 +19,7 @@ extension FeatureBuild { } } -private let build: FeatureBuild = OWSIsDebugBuild() ? .dev : .beta +private let build: FeatureBuild = OWSIsDebugBuild() ? .dev : .qa // MARK: - From fbfa1109a4293cb70dd873f5cd8e05ff138b3a49 Mon Sep 17 00:00:00 2001 From: Michelle Linington Date: Tue, 12 Apr 2022 23:04:31 -0700 Subject: [PATCH 7/7] "Bump build to 5.35.0.35." (Internal) --- Signal/Signal-Info.plist | 4 ++-- SignalNSE/Info.plist | 4 ++-- SignalShareExtension/Info.plist | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 2ffe1d3203..f8355ec75f 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -43,7 +43,7 @@ CFBundleVersion - 34 + 35 ITSAppUsesNonExemptEncryption LOGS_EMAIL @@ -141,7 +141,7 @@ INStartCallIntent OWSBundleVersion4 - 5.35.0.34 + 5.35.0.35 PHPhotoLibraryPreventAutomaticLimitedAccessAlert UIApplicationShortcutItems diff --git a/SignalNSE/Info.plist b/SignalNSE/Info.plist index 956b1e0434..b0031ee4f9 100644 --- a/SignalNSE/Info.plist +++ b/SignalNSE/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 5.35.0 CFBundleVersion - 34 + 35 NSAppTransportSecurity NSExceptionDomains @@ -55,6 +55,6 @@ $(PRODUCT_MODULE_NAME).NotificationService OWSBundleVersion4 - 5.35.0.34 + 5.35.0.35 diff --git a/SignalShareExtension/Info.plist b/SignalShareExtension/Info.plist index f8b2a7c7df..529b7f0ca6 100644 --- a/SignalShareExtension/Info.plist +++ b/SignalShareExtension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 5.35.0 CFBundleVersion - 34 + 35 ITSAppUsesNonExemptEncryption NSAppTransportSecurity @@ -77,7 +77,7 @@ com.apple.share-services OWSBundleVersion4 - 5.35.0.34 + 5.35.0.35 UIStatusBarStyle UIStatusBarStyleLightContent UIViewControllerBasedStatusBarAppearance