signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Merge branch 'release/5.35.0'

Browse Source
This commit is contained in:
Michelle Linington 2022-04-12 23:09:14 -07:00
commit 23b802bd7f
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
SignalServiceKit/src/Storage/Database/GRDBSchemaMigrator.swift
View File

@ -1641,22 +1641,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 {

3
SignalServiceKit/src/Util/FeatureFlags.swift
View File

@ -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)