Merge remote-tracking branch 'origin/ACP2E-3995' into PR_2025_07_18_chittima

Author: chittima

app/code/Magento/Indexer/etc/crontab.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Cron:etc/crontab.xsd">
@@ -14,7 +14,7 @@
             <schedule>* * * * *</schedule>
         </job>
         <job name="indexer_clean_all_changelogs" instance="Magento\Indexer\Cron\ClearChangelog" method="execute">
-            <schedule>0 * * * *</schedule>
+            <schedule>*/5 * * * *</schedule>
         </job>
     </group>
 </config>

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

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Framework\Mview\View;
 
@@ -107,21 +107,72 @@ public function testGetVersion()
     }
 
     /**
-     * Test for clear() method
-     *
      * @return void
      * @throws ChangelogTableNotExistsException
-     * @throws \Magento\Framework\Exception\RuntimeException
      */
-    public function testClear()
+    public function testChangelogClearOversizeBatchSize()
     {
-        $this->assertEquals(0, $this->model->getVersion());
-        //the same that a table is empty
-        $changelogName = $this->resource->getTableName($this->model->getName());
-        $this->connection->insert($changelogName, ['version_id' => 1, 'entity_id' => 1]);
-        $this->assertEquals(1, $this->model->getVersion());
-        $this->model->clear(1);
-        $this->assertEquals(1, $this->model->getVersion()); //the same that a table is empty
+        $stateVersionId = 10100;
+        $changelog = $this->generateChangelog(20000);
+
+        // #0: check if changelog generated correctly
+        $this->assertEquals(1, $this->getChangelogFirstEntityId($changelog));
+        $this->assertEquals(20000, $this->getChangelogEntitiesCount($changelog));
+
+        // #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));
+
+        // #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));
+    }
+
+    /**
+     * @param string $changelog
+     * @return int
+     */
+    private function getChangelogFirstEntityId(string $changelog): int
+    {
+        return (int) $this->connection->fetchOne($this->connection->select()->from($changelog, 'version_id'));
+    }
+
+    /**
+     * @param string $changelog
+     * @return int
+     */
+    private function getChangelogEntitiesCount(string $changelog): int
+    {
+        return (int) $this->connection->fetchOne($this->connection->select()->from($changelog, 'COUNT(1)'));
+    }
+
+    /**
+     * @param int $entitiesCount
+     * @return string
+     */
+    private function generateChangelog(int $entitiesCount = 100): string
+    {
+        $data = [];
+        $changelog = $this->resource->getTableName($this->model->getName());
+
+        for ($i = 1; $i <= $entitiesCount; $i++) {
+            $data[$i]['version_id'] = $i;
+            $data[$i]['entity_id'] = $i;
+        }
+        $this->connection->insertArray(
+            $changelog,
+            ['version_id', 'entity_id'],
+            $data
+        );
+
+        return $changelog;
     }
 
     /**

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

@@ -37,6 +37,11 @@ class Changelog implements ChangelogInterface
      */
     public const VERSION_ID_COLUMN_NAME = 'version_id';
 
+    /**
+     * Batch size for changelog cleaning operation
+     */
+    private const CHANGELOG_CLEAR_BATCH_SIZE = 10000;
+
     /**
      * Database connection
      *
@@ -249,7 +254,14 @@ public function clear($versionId)
             throw new ChangelogTableNotExistsException(new Phrase("Table %1 does not exist", [$changelogTableName]));
         }
 
-        $this->connection->delete($changelogTableName, ['version_id < ?' => (int)$versionId]);
+        $this->connection->query(
+            sprintf(
+                'DELETE FROM `%s` WHERE %s LIMIT %d',
+                $changelogTableName,
+                'version_id < ' . (int) $versionId,
+                self::CHANGELOG_CLEAR_BATCH_SIZE
+            )
+        );
 
         return true;
     }