ACP2E-3387: [Cloud] Magento: queue message has been deleted

Author: aplapana

app/code/Magento/MysqlMq/Model/ResourceModel/Queue.php

@@ -173,9 +173,12 @@ public function deleteMarkedMessages(): void
 
         $select = $connection->select()
             ->from(['queue_message_status' => $this->getMessageStatusTable()], ['message_id'])
-            ->where('status <> ?', QueueManagement::MESSAGE_STATUS_TO_BE_DELETED)
+            ->where('status = ?', QueueManagement::MESSAGE_STATUS_TO_BE_DELETED)
             ->distinct();
-        $connection->delete($this->getMessageTable(), 'id NOT IN (' . $select->assemble() . ')');
+        $messageIds = $connection->fetchCol($select);
+        foreach (array_chunk($messageIds, 10000) as $messageIdsChunk) {
+            $connection->delete($this->getMessageTable(), ['id IN (?)' => $messageIdsChunk]);
+        }
     }
 
     /**