ACP2E-4303: Reindexing stuck due to high memory usage

Author: alzota

app/code/Magento/CatalogRule/Model/Rule.php

@@ -401,7 +401,8 @@ public function getMatchingProductIds()
                 $this->cachedWebsitesMap = $this->_getWebsitesMap();
                 $websiteIds = $this->getWebsiteIds();
                 $this->cachedWebsiteIdsArray = is_array($websiteIds) ? $websiteIds : explode(',', $websiteIds);
-                $this->cachedConditions = $this->getConditions();                $this->_resourceIterator->walk(
+                $this->cachedConditions = $this->getConditions();
+                $this->_resourceIterator->walk(
                     $productCollection->getSelect(),
                     [[$this, 'callbackValidateProduct']],
                     [

app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/Rule/ConfigurableProductHandler.php

@@ -7,6 +7,7 @@
 
 namespace Magento\CatalogRuleConfigurable\Plugin\CatalogRule\Model\Rule;
 
+use Magento\CatalogRule\Model\Rule;
 use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable as ConfigurableProductsResourceModel;
 use Magento\Framework\App\ResourceConnection;
 
@@ -50,37 +51,104 @@ public function __construct(
     /**
      * Match configurable child products if configurable product matches the condition
      *
-     * @param \Magento\CatalogRule\Model\Rule $rule
+     * @param Rule $rule
      * @param \Closure $proceed
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function aroundGetMatchingProductIds(
-        \Magento\CatalogRule\Model\Rule $rule,
+        Rule $rule,
         \Closure $proceed
     ): array {
         $productsFilter = $rule->getProductsFilter() ? (array) $rule->getProductsFilter() : [];
-        if ($productsFilter) {
-            $parentIds = $this->configurable->getParentIdsByChild($productsFilter);
-            if ($parentIds) {
-                $rule->setProductsFilter(
-                    array_unique(
-                        array_merge(
-                            $productsFilter,
-                            $parentIds
-                        )
-                    )
-                );
-            }
-        }
+
+        $this->updateProductsFilter($rule, $productsFilter);
 
         $productIds = $proceed();
 
         if (self::$allConfigurableProductIds === null) {
             self::$allConfigurableProductIds = $this->loadAllConfigurableProductIds();
         }
 
+        return $this->processConfigurableProducts($productIds, $productsFilter);
+    }
+
+    /**
+     * Update products filter to include parent IDs and remove duplicate children
+     *
+     * @param Rule $rule
+     * @param array $productsFilter
+     * @return void
+     */
+    private function updateProductsFilter(
+        Rule $rule,
+        array $productsFilter
+    ): void {
+        if (!$productsFilter) {
+            return;
+        }
+
+        $parentIds = $this->configurable->getParentIdsByChild($productsFilter);
+        if (!$parentIds) {
+            return;
+        }
+
+        $childrenToRemove = $this->getChildrenToRemove($productsFilter, $parentIds);
+        $filteredProducts = array_diff($productsFilter, $childrenToRemove);
+
+        $rule->setProductsFilter(
+            array_unique(
+                array_merge(
+                    $filteredProducts,
+                    $parentIds
+                )
+            )
+        );
+    }
+
+    /**
+     * Get children to remove from filter to avoid redundancy
+     *
+     * @param array $productsFilter
+     * @param array $parentIds
+     * @return array
+     */
+    private function getChildrenToRemove(array $productsFilter, array $parentIds): array
+    {
+        $childrenToRemove = [];
+
+        foreach ($parentIds as $parentId) {
+            if (in_array($parentId, $productsFilter)) {
+                continue;
+            }
+
+            if (!isset(self::$childrenProducts[$parentId])) {
+                self::$childrenProducts[$parentId] = $this->configurable->getChildrenIds($parentId)[0];
+            }
+            $children = self::$childrenProducts[$parentId];
+
+            $childrenInFilter = array_intersect($productsFilter, $children);
+            if (count($childrenInFilter) > 1) {
+                $childrenInFilterArray = array_values($childrenInFilter);
+                $childrenCount = count($childrenInFilterArray);
+                for ($i = 1; $i < $childrenCount; $i++) {
+                    $childrenToRemove[] = $childrenInFilterArray[$i];
+                }
+            }
+        }
+
+        return $childrenToRemove;
+    }
+
+    /**
+     * Process configurable products and apply parent validation to children
+     *
+     * @param array $productIds
+     * @param array $productsFilter
+     * @return array
+     */
+    private function processConfigurableProducts(array $productIds, array $productsFilter): array
+    {
         foreach (array_keys($productIds) as $productId) {
             if (isset(self::$allConfigurableProductIds[$productId])) {
                 if (!isset(self::$childrenProducts[$productId])) {

app/code/Magento/CatalogRuleConfigurable/Test/Unit/Plugin/CatalogRule/Model/Rule/ConfigurableProductHandlerTest.php

@@ -63,7 +63,6 @@ protected function setUp(): void
         $this->selectMock = $this->createMock(Select::class);
         $this->ruleMock = $this->createMock(Rule::class);
 
-        // Set up default resource connection behavior
         $this->resourceConnectionMock->method('getConnection')
             ->willReturn($this->connectionMock);
         $this->resourceConnectionMock->method('getTableName')
@@ -74,7 +73,6 @@ protected function setUp(): void
             $this->resourceConnectionMock
         );
 
-        // Reset static properties between tests
         $this->resetStaticProperties();
     }
 
@@ -88,11 +86,9 @@ private function resetStaticProperties(): void
         $reflection = new \ReflectionClass(ConfigurableProductHandler::class);
 
         $allConfigurableProductIdsProperty = $reflection->getProperty('allConfigurableProductIds');
-        $allConfigurableProductIdsProperty->setAccessible(true);
         $allConfigurableProductIdsProperty->setValue(null, null);
 
         $childrenProductsProperty = $reflection->getProperty('childrenProducts');
-        $childrenProductsProperty->setAccessible(true);
         $childrenProductsProperty->setValue(null, []);
     }
 
@@ -273,7 +269,7 @@ public static function aroundGetMatchingProductIdsDataProvider(): array
             ],
             [
                 ['simple11', 'simple12',],
-                ['simple11', 'simple12', 'conf1',],
+                ['simple11', 'conf1',],
                 ['simple11' => [1 => false], 'conf1' => [1 => true],],
                 ['simple11' => [1 => true], 'simple12' => [1 => true],],
             ],