Merge branch 'ACP2E-3387' of https://github.com/adobe-commerce-tier-4/magento2ce into PR-11-14-2024

Author: chittima

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

@@ -1,19 +1,45 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\MysqlMq\Model\ResourceModel;
 
 use Magento\Framework\DB\Select;
 use Magento\Framework\DB\Sql\Expression;
+use Magento\Framework\Model\ResourceModel\Db\Context;
 use Magento\MysqlMq\Model\QueueManagement;
 
 /**
  * Resource model for queue.
  */
 class Queue extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 {
+    /**
+     *
+     */
+    private const CHUNK_SIZE = 10000;
+
+    /**
+     * @var int|mixed
+     */
+    private int $chunkSize;
+
+    /**
+     * @param Context $context
+     * @param string|null $connectionName
+     * @param int|null $chunkSize
+     */
+    public function __construct(Context $context, $connectionName = null, int $chunkSize = null)
+    {
+        parent::__construct($context, $connectionName);
+        if ($chunkSize) {
+            $this->chunkSize = $chunkSize;
+        } else {
+            $this->chunkSize = self::CHUNK_SIZE;
+        }
+    }
+
     /**
      * Model initialization
      *
@@ -163,22 +189,29 @@ public function getMessages($queueName, $limit = null)
     }
 
     /**
-     * Delete messages if there is no queue whrere the message is not in status TO BE DELETED
+     * Delete messages if there is no queue where the message is not in status TO BE DELETED
      *
      * @return void
      */
-    public function deleteMarkedMessages()
+    public function deleteMarkedMessages(): void
     {
         $connection = $this->getConnection();
-
         $select = $connection->select()
             ->from(['queue_message_status' => $this->getMessageStatusTable()], ['message_id'])
-            ->where('status <> ?', QueueManagement::MESSAGE_STATUS_TO_BE_DELETED)
+            ->joinLeft(
+                ['message_status2' => $this->getMessageStatusTable()],
+                'queue_message_status.message_id = message_status2.message_id AND message_status2.status <> ' .
+                QueueManagement::MESSAGE_STATUS_TO_BE_DELETED,
+                []
+            )
+            ->where('queue_message_status.status = ?', QueueManagement::MESSAGE_STATUS_TO_BE_DELETED)
+            ->where('message_status2.message_id IS NULL')
             ->distinct();
-        $messageIds = $connection->fetchCol($select);
 
-        $condition = count($messageIds) > 0 ? ['id NOT IN (?)' => $messageIds] : null;
-        $connection->delete($this->getMessageTable(), $condition);
+        $messageIds = $connection->fetchCol($select);
+        foreach (array_chunk($messageIds, $this->chunkSize) as $messageIdsChunk) {
+            $connection->delete($this->getMessageTable(), ['id IN (?)' => $messageIdsChunk]);
+        }
     }
 
     /**

app/code/Magento/MysqlMq/Test/Unit/Model/ResourceModel/QueueTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -171,10 +171,12 @@ function ($arg1, $arg2) use ($tableNames) {
 
     /**
      * Test for getMessages method.
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      *
      * @return void
      */
-    public function testGetMessages()
+    public function testGetMessages(): void
     {
         $limit = 100;
         $queueName = 'queueName0';
@@ -261,7 +263,6 @@ function ($arg1, $arg2 = null) use ($queueName, $select) {
      */
     public function testDeleteMarkedMessages()
     {
-        $messageIds = [1, 2];
         $tableNames = ['queue_message_status', 'queue_message'];
         $connection = $this->getMockBuilder(AdapterInterface::class)
             ->disableOriginalConstructor()
@@ -284,13 +285,24 @@ function ($arg1, $arg2) use ($tableNames) {
         $connection->expects($this->once())->method('select')->willReturn($select);
         $select->expects($this->once())
             ->method('from')->with(['queue_message_status' => $tableNames[0]], ['message_id'])->willReturnSelf();
-        $select->expects($this->once())->method('where')
-            ->with('status <> ?', QueueManagement::MESSAGE_STATUS_TO_BE_DELETED)
+        $select->expects($this->once())->method('joinLeft')
+            ->with(
+                ['message_status2' => 'queue_message_status'],
+                'queue_message_status.message_id = message_status2.message_id AND message_status2.status <> ' .
+                QueueManagement::MESSAGE_STATUS_TO_BE_DELETED,
+                []
+            )
+            ->willReturnSelf();
+        $select->expects($this->exactly(2))->method('where')
             ->willReturnSelf();
         $select->expects($this->once())->method('distinct')->willReturnSelf();
-        $connection->expects($this->once())->method('fetchCol')->with($select)->willReturn($messageIds);
+        $connection->expects($this->once())->method('fetchCol')->with($select)->willReturn([1, 2]);
+
         $connection->expects($this->once())->method('delete')
-            ->with($tableNames[1], ['id NOT IN (?)' => $messageIds])->willReturn(2);
+            ->with(
+                $tableNames[1],
+                ['id IN (?)' => [1,2]]
+            )->willReturn(2);
         $this->queue->deleteMarkedMessages();
     }