From fd127b41916a89053d51989251135c83e23fa4a8 Mon Sep 17 00:00:00 2001
From: Alex Vandiver <alexmv@zulip.com>
Date: Mon, 17 Mar 2025 18:18:14 +0000
Subject: [PATCH] messages: Remove unconditional topic indexes.

---
 ...ove_message_unconditional_topic_indexes.py | 25 +++++++++++++++++++
 zerver/models/messages.py                     | 23 -----------------
 2 files changed, 25 insertions(+), 23 deletions(-)
 create mode 100644 zerver/migrations/0694_remove_message_unconditional_topic_indexes.py

diff --git a/zerver/migrations/0694_remove_message_unconditional_topic_indexes.py b/zerver/migrations/0694_remove_message_unconditional_topic_indexes.py
new file mode 100644
index 0000000000..08a3f51abe
--- /dev/null
+++ b/zerver/migrations/0694_remove_message_unconditional_topic_indexes.py
@@ -0,0 +1,25 @@
+from django.contrib.postgres.operations import RemoveIndexConcurrently
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    atomic = False
+
+    dependencies = [
+        ("zerver", "0693_add_conditional_indexes_for_topic"),
+    ]
+
+    operations = [
+        RemoveIndexConcurrently(
+            model_name="message",
+            name="zerver_message_realm_upper_subject_all",
+        ),
+        RemoveIndexConcurrently(
+            model_name="message",
+            name="zerver_message_realm_recipient_upper_subject_all",
+        ),
+        RemoveIndexConcurrently(
+            model_name="message",
+            name="zerver_message_realm_recipient_subject_all",
+        ),
+    ]
diff --git a/zerver/models/messages.py b/zerver/models/messages.py
index c1de136684..e9a02c9f51 100644
--- a/zerver/models/messages.py
+++ b/zerver/models/messages.py
@@ -205,29 +205,6 @@ class Message(AbstractMessage):
                 "date_sent",
                 name="zerver_message_realm_date_sent",
             ),
-            models.Index(
-                # To be removed shortly
-                "realm_id",
-                Upper("subject"),
-                F("id").desc(nulls_last=True),
-                name="zerver_message_realm_upper_subject_all",
-            ),
-            models.Index(
-                # To be removed shortly
-                "realm_id",
-                "recipient_id",
-                Upper("subject"),
-                F("id").desc(nulls_last=True),
-                name="zerver_message_realm_recipient_upper_subject_all",
-            ),
-            models.Index(
-                # To be removed shortly
-                "realm_id",
-                "recipient_id",
-                "subject",
-                F("id").desc(nulls_last=True),
-                name="zerver_message_realm_recipient_subject_all",
-            ),
             models.Index(
                 # For users searching by topic (but not stream), which
                 # is done case-insensitively