MC-23215: Slow catalog_product_price indexer for Bundle products

Author: dhorytskyi

app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php

@@ -458,17 +458,17 @@ private function getBaseBundleSelectionPriceSelect(): Select
     }
 
     /**
-     * Calculate product selections price for fixed bundles
+     * Apply selections price for fixed bundles
      *
      * @return void
      * @throws \Exception
      */
-    private function calculateFixedBundleSelectionPrice()
+    private function applyFixedBundleSelectionPrice()
     {
         $connection = $this->getConnection();
 
-        $selectionPriceValue = 'bs.selection_price_value';
-        $selectionPriceType = 'bs.selection_price_type';
+        $selectionPriceValue = 'bsp.selection_price_value';
+        $selectionPriceType = 'bsp.selection_price_type';
         $priceExpr = new \Zend_Db_Expr(
             $connection->getCheckSql(
                 $selectionPriceType . ' = 1',
@@ -501,7 +501,11 @@ private function calculateFixedBundleSelectionPrice()
         );
 
         $select = $this->getBaseBundleSelectionPriceSelect();
-        $select->where(
+        $select->joinInner(
+            ['bsp' => $this->getTable('catalog_product_bundle_selection_price')],
+            'bs.selection_id = bsp.selection_id AND bsp.website_id = i.website_id',
+            []
+        )->where(
             'i.price_type=?',
             \Magento\Bundle\Model\Product\Price::PRICE_TYPE_FIXED
         )->columns(
@@ -512,11 +516,22 @@ private function calculateFixedBundleSelectionPrice()
                 'tier_price' => $tierExpr,
             ]
         );
-        $query = $select->insertFromSelect($this->getBundleSelectionTable());
+        $query = $select->crossUpdateFromSelect($this->getBundleSelectionTable());
         $connection->query($query);
+    }
 
-        $selectionPriceValue = 'bsp.selection_price_value';
-        $selectionPriceType = 'bsp.selection_price_type';
+    /**
+     * Calculate selections price for fixed bundles
+     *
+     * @return void
+     * @throws \Exception
+     */
+    private function calculateFixedBundleSelectionPrice()
+    {
+        $connection = $this->getConnection();
+
+        $selectionPriceValue = 'bs.selection_price_value';
+        $selectionPriceType = 'bs.selection_price_type';
         $priceExpr = new \Zend_Db_Expr(
             $connection->getCheckSql(
                 $selectionPriceType . ' = 1',
@@ -549,11 +564,7 @@ private function calculateFixedBundleSelectionPrice()
         );
 
         $select = $this->getBaseBundleSelectionPriceSelect();
-        $select->joinInner(
-            ['bsp' => $this->getTable('catalog_product_bundle_selection_price')],
-            'bs.selection_id = bsp.selection_id AND bsp.website_id = i.website_id',
-            []
-        )->where(
+        $select->where(
             'i.price_type=?',
             \Magento\Bundle\Model\Product\Price::PRICE_TYPE_FIXED
         )->columns(
@@ -564,12 +575,14 @@ private function calculateFixedBundleSelectionPrice()
                 'tier_price' => $tierExpr,
             ]
         );
-        $query = $select->crossUpdateFromSelect($this->getBundleSelectionTable());
+        $query = $select->insertFromSelect($this->getBundleSelectionTable());
         $connection->query($query);
+
+        $this->applyFixedBundleSelectionPrice();
     }
 
     /**
-     * Calculate product selections price for dynamic bundles
+     * Calculate selections price for dynamic bundles
      *
      * @param array $dimensions
      * @return void