chunk deletion

inbox/mailsync/backends/imap/common.py

@@ -33,6 +33,7 @@
 from inbox.models.session import session_scope
 from inbox.models.util import reconcile_message
 from inbox.sqlalchemy_ext.util import get_db_api_cursor_with_query
+from inbox.util.itert import chunk
 
 log = get_logger()
 
@@ -285,17 +286,19 @@ def remove_deleted_uids(account_id: int, folder_id: int, uids: Iterable[int]) ->
 
     for message_id, message_uids in uids_by_message_id.items():
         with session_scope(account_id) as db_session:
-            db_session.query(ImapUid).filter(
-                ImapUid.account_id == account_id,
-                ImapUid.folder_id == folder_id,
-                ImapUid.msg_uid.in_(message_uids),
-            ).with_hint(
-                ImapUid, "FORCE INDEX (ix_imapuid_account_id_folder_id_msg_uid_desc)"
-            ).delete(
-                synchronize_session=False
-            )
-
             print(message_id, len(message_uids))
+            for message_uid_batch in chunk(message_uids, 1000):
+                db_session.query(ImapUid).filter(
+                    ImapUid.account_id == account_id,
+                    ImapUid.folder_id == folder_id,
+                    ImapUid.msg_uid.in_(message_uid_batch),
+                ).with_hint(
+                    ImapUid,
+                    "FORCE INDEX (ix_imapuid_account_id_folder_id_msg_uid_desc)",
+                ).delete(
+                    synchronize_session=False
+                )
+                print("after delete")
 
             deleted_uid_count += len(message_uids)