Merge remote-tracking branch 'origin/ACP2E-4211' into PR_2025_09_19_flowers

Author: thiaramus

dev/tests/integration/testsuite/Magento/Framework/Mview/View/ChangelogTest.php

@@ -112,7 +112,7 @@ public function testGetVersion()
      */
     public function testChangelogClearOversizeBatchSize()
     {
-        $stateVersionId = 10100;
+        $stateVersionId = 14001;
         $changelog = $this->generateChangelog(20000);
 
         // #0: check if changelog generated correctly
@@ -121,18 +121,12 @@ public function testChangelogClearOversizeBatchSize()
 
         // #1: check if changelog reduced by batch size value
         $this->model->clear($stateVersionId);
-        $this->assertEquals(10001, $this->getChangelogFirstEntityId($changelog));
-        $this->assertEquals(10000, $this->getChangelogEntitiesCount($changelog));
+        $this->assertEquals($stateVersionId, $this->getChangelogFirstEntityId($changelog));
+        $this->assertEquals(6000, $this->getChangelogEntitiesCount($changelog));
 
-        // #2: check if changelog reduced to the mview state version id
-        $this->model->clear($stateVersionId);
-        $this->assertEquals(10100, $this->getChangelogFirstEntityId($changelog));
-        $this->assertEquals(9901, $this->getChangelogEntitiesCount($changelog));
-
-        // #3: check if changelog stays the same size and values on the next iteration
-        $this->model->clear($stateVersionId);
-        $this->assertEquals(10100, $this->getChangelogFirstEntityId($changelog));
-        $this->assertEquals(9901, $this->getChangelogEntitiesCount($changelog));
+        // #2: fully clear changelog
+        $this->model->clear(20001);
+        $this->assertEquals(0, $this->getChangelogEntitiesCount($changelog));
     }
 
     /**

lib/internal/Magento/Framework/Mview/Test/Unit/View/ChangelogTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -15,6 +15,7 @@
 use Magento\Framework\Mview\View\AdditionalColumnsProcessor\ProcessorFactory;
 use Magento\Framework\Mview\View\Changelog;
 use Magento\Framework\Mview\View\ChangelogInterface;
+use Magento\Framework\Setup\Declaration\Schema\Dto\Factories\Table as DtoFactoriesTable;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -28,33 +29,44 @@ class ChangelogTest extends TestCase
     /**
      * @var Changelog
      */
-    protected $model;
+    private $model;
 
     /**
      * Mysql PDO DB adapter mock
      *
-     * @var MockObject|\Magento\Framework\DB\Adapter\Pdo\Mysql
+     * @var MockObject|Mysql
      */
-    protected $connectionMock;
+    private $connectionMock;
 
     /**
      * @var MockObject|ResourceConnection
      */
-    protected $resourceMock;
+    private $resourceMock;
 
     /**
      * @var ProcessorFactory|MockObject
      */
-    protected $processorFactory;
+    private $processorFactory;
+
+    /**
+     * @var DtoFactoriesTable|MockObject
+     */
+    private $dtoFactoriesTableMock;
 
     protected function setUp(): void
     {
         $this->connectionMock = $this->createMock(Mysql::class);
         $this->resourceMock = $this->createMock(ResourceConnection::class);
         $this->mockGetConnection($this->connectionMock);
         $this->processorFactory = $this->createMock(ProcessorFactory::class);
+        $this->dtoFactoriesTableMock = $this->createMock(DtoFactoriesTable::class);
 
-        $this->model = new Changelog($this->resourceMock, $this->getMviewConfigMock(), $this->processorFactory);
+        $this->model = new Changelog(
+            $this->resourceMock,
+            $this->getMviewConfigMock(),
+            $this->processorFactory,
+            $this->dtoFactoriesTableMock,
+        );
     }
 
     /**
@@ -73,11 +85,7 @@ private function getMviewConfigMock()
 
     public function testInstanceOf()
     {
-        $resourceMock =
-            $this->createMock(ResourceConnection::class);
-        $resourceMock->expects($this->once())->method('getConnection')->willReturn(true);
-        $model = new Changelog($resourceMock, $this->getMviewConfigMock(), $this->processorFactory);
-        $this->assertInstanceOf(ChangelogInterface::class, $model);
+        $this->assertInstanceOf(ChangelogInterface::class, $this->model);
     }
 
     public function testCheckConnectionException()
@@ -308,6 +316,21 @@ public function testGetListWithException()
         $this->model->getList(random_int(1, 200), random_int(201, 400));
     }
 
+    public function testClear()
+    {
+        $versionId = 100;
+        $tableName = 'viewIdtest_cl';
+        $this->resourceMock->expects(self::once())->method('getTableName')->willReturn($tableName);
+        $this->connectionMock->expects(self::once())->method('isTableExists')->with($tableName)->willReturn(true);
+
+        $stmtMock = $this->createMock(\Zend_Db_Statement_Interface::class);
+        $stmtMock->expects(self::exactly(3))->method('rowCount')->willReturnOnConsecutiveCalls(10000, 5000, 0);
+        $this->connectionMock->expects(self::exactly(3))->method('query')->willReturn($stmtMock);
+
+        $this->model->setViewId('viewIdtest');
+        $this->model->clear($versionId);
+    }
+
     public function testClearWithException()
     {
         $changelogTableName = 'viewIdtest_cl';

lib/internal/Magento/Framework/Mview/View/Changelog.php

@@ -8,7 +8,6 @@
 
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DB\Adapter\ConnectionException;
-use Magento\Framework\DB\Sql\Expression;
 use Magento\Framework\Exception\RuntimeException;
 use Magento\Framework\Mview\Config;
 use Magento\Framework\Mview\View\AdditionalColumnsProcessor\ProcessorFactory;
@@ -86,13 +85,15 @@ class Changelog implements ChangelogInterface
      * @param Config $mviewConfig
      * @param ProcessorFactory $additionalColumnsProcessorFactory
      * @param DtoFactoriesTable|null $dtoFactoriesTable
+     * @param int $batchSize
      * @throws ConnectionException
      */
     public function __construct(
         \Magento\Framework\App\ResourceConnection $resource,
         Config $mviewConfig,
         ProcessorFactory $additionalColumnsProcessorFactory,
-        ?DtoFactoriesTable $dtoFactoriesTable = null
+        ?DtoFactoriesTable $dtoFactoriesTable = null,
+        private readonly int $batchSize = self::CHANGELOG_CLEAR_BATCH_SIZE,
     ) {
         $this->connection = $resource->getConnection();
         $this->resource = $resource;
@@ -254,14 +255,15 @@ public function clear($versionId)
             throw new ChangelogTableNotExistsException(new Phrase("Table %1 does not exist", [$changelogTableName]));
         }
 
-        $this->connection->query(
-            sprintf(
-                'DELETE FROM `%s` WHERE %s LIMIT %d',
-                $changelogTableName,
-                'version_id < ' . (int) $versionId,
-                self::CHANGELOG_CLEAR_BATCH_SIZE
-            )
+        $query = sprintf(
+            'DELETE FROM `%s` WHERE %s LIMIT %d',
+            $changelogTableName,
+            'version_id < ' . (int) $versionId,
+            $this->batchSize
         );
+        do {
+            $stmt = $this->connection->query($query);
+        } while ($stmt->rowCount());
 
         return true;
     }