diff --git a/SignalServiceKit/src/Storage/Database/GRDBSchemaMigrator.swift b/SignalServiceKit/src/Storage/Database/GRDBSchemaMigrator.swift index 40d7d3f00e..2eb3333939 100644 --- a/SignalServiceKit/src/Storage/Database/GRDBSchemaMigrator.swift +++ b/SignalServiceKit/src/Storage/Database/GRDBSchemaMigrator.swift @@ -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 { 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)