MAGETWO-71554: Category edit performance issue - for 2.2

Author: dhorytskyi

app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php

@@ -102,32 +102,32 @@ class IndexBuilder
     protected $connection;
 
     /**
-     * @var \Magento\CatalogRule\Model\Indexer\ProductPriceCalculator
+     * @var ProductPriceCalculator
      */
     private $productPriceCalculator;
 
     /**
-     * @var \Magento\CatalogRule\Model\Indexer\ReindexRuleProduct
+     * @var ReindexRuleProduct
      */
     private $reindexRuleProduct;
 
     /**
-     * @var \Magento\CatalogRule\Model\Indexer\ReindexRuleGroupWebsite
+     * @var ReindexRuleGroupWebsite
      */
     private $reindexRuleGroupWebsite;
 
     /**
-     * @var \Magento\CatalogRule\Model\Indexer\RuleProductsSelectBuilder
+     * @var RuleProductsSelectBuilder
      */
     private $ruleProductsSelectBuilder;
 
     /**
-     * @var \Magento\CatalogRule\Model\Indexer\ReindexRuleProductPrice
+     * @var ReindexRuleProductPrice
      */
     private $reindexRuleProductPrice;
 
     /**
-     * @var \Magento\CatalogRule\Model\Indexer\RuleProductPricesPersistor
+     * @var RuleProductPricesPersistor
      */
     private $pricesPersistor;
 
@@ -152,16 +152,15 @@ class IndexBuilder
      * @param \Magento\Framework\Stdlib\DateTime\DateTime $dateTime
      * @param \Magento\Catalog\Model\ProductFactory $productFactory
      * @param int $batchCount
-     * @param \Magento\CatalogRule\Model\Indexer\ProductPriceCalculator|null $productPriceCalculator
-     * @param \Magento\CatalogRule\Model\Indexer\ReindexRuleProduct|null $reindexRuleProduct
-     * @param \Magento\CatalogRule\Model\Indexer\ReindexRuleGroupWebsite|null $reindexRuleGroupWebsite
-     * @param \Magento\CatalogRule\Model\Indexer\RuleProductsSelectBuilder|null $ruleProductsSelectBuilder
-     * @param \Magento\CatalogRule\Model\Indexer\ReindexRuleProductPrice|null $reindexRuleProductPrice
-     * @param \Magento\CatalogRule\Model\Indexer\RuleProductPricesPersistor|null $pricesPersistor
+     * @param ProductPriceCalculator|null $productPriceCalculator
+     * @param ReindexRuleProduct|null $reindexRuleProduct
+     * @param ReindexRuleGroupWebsite|null $reindexRuleGroupWebsite
+     * @param RuleProductsSelectBuilder|null $ruleProductsSelectBuilder
+     * @param ReindexRuleProductPrice|null $reindexRuleProductPrice
+     * @param RuleProductPricesPersistor|null $pricesPersistor
      * @param \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher|null $activeTableSwitcher
      * @param ProductLoader|null $productLoader
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function __construct(
         RuleCollectionFactory $ruleCollectionFactory,
@@ -174,12 +173,12 @@ public function __construct(
         \Magento\Framework\Stdlib\DateTime\DateTime $dateTime,
         \Magento\Catalog\Model\ProductFactory $productFactory,
         $batchCount = 1000,
-        \Magento\CatalogRule\Model\Indexer\ProductPriceCalculator $productPriceCalculator = null,
-        \Magento\CatalogRule\Model\Indexer\ReindexRuleProduct $reindexRuleProduct = null,
-        \Magento\CatalogRule\Model\Indexer\ReindexRuleGroupWebsite $reindexRuleGroupWebsite = null,
-        \Magento\CatalogRule\Model\Indexer\RuleProductsSelectBuilder $ruleProductsSelectBuilder = null,
-        \Magento\CatalogRule\Model\Indexer\ReindexRuleProductPrice $reindexRuleProductPrice = null,
-        \Magento\CatalogRule\Model\Indexer\RuleProductPricesPersistor $pricesPersistor = null,
+        ProductPriceCalculator $productPriceCalculator = null,
+        ReindexRuleProduct $reindexRuleProduct = null,
+        ReindexRuleGroupWebsite $reindexRuleGroupWebsite = null,
+        RuleProductsSelectBuilder $ruleProductsSelectBuilder = null,
+        ReindexRuleProductPrice $reindexRuleProductPrice = null,
+        RuleProductPricesPersistor $pricesPersistor = null,
         \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher $activeTableSwitcher = null,
         ProductLoader $productLoader = null
     ) {
@@ -195,29 +194,30 @@ public function __construct(
         $this->productFactory = $productFactory;
         $this->batchCount = $batchCount;
 
-        $this->productPriceCalculator = $productPriceCalculator ?: ObjectManager::getInstance()->get(
-            \Magento\CatalogRule\Model\Indexer\ProductPriceCalculator::class
+        $this->productPriceCalculator = $productPriceCalculator ?? ObjectManager::getInstance()->get(
+           ProductPriceCalculator::class
         );
-        $this->reindexRuleProduct = $reindexRuleProduct ?: ObjectManager::getInstance()->get(
-            \Magento\CatalogRule\Model\Indexer\ReindexRuleProduct::class
+        $this->reindexRuleProduct = $reindexRuleProduct ?? ObjectManager::getInstance()->get(
+            ReindexRuleProduct::class
         );
-        $this->reindexRuleGroupWebsite = $reindexRuleGroupWebsite ?: ObjectManager::getInstance()->get(
-            \Magento\CatalogRule\Model\Indexer\ReindexRuleGroupWebsite::class
+        $this->reindexRuleGroupWebsite = $reindexRuleGroupWebsite ?? ObjectManager::getInstance()->get(
+            ReindexRuleGroupWebsite::class
         );
-        $this->ruleProductsSelectBuilder = $ruleProductsSelectBuilder ?: ObjectManager::getInstance()->get(
-            \Magento\CatalogRule\Model\Indexer\RuleProductsSelectBuilder::class
+        $this->ruleProductsSelectBuilder = $ruleProductsSelectBuilder ?? ObjectManager::getInstance()->get(
+            RuleProductsSelectBuilder::class
         );
-        $this->reindexRuleProductPrice = $reindexRuleProductPrice ?: ObjectManager::getInstance()->get(
-            \Magento\CatalogRule\Model\Indexer\ReindexRuleProductPrice::class
+        $this->reindexRuleProductPrice = $reindexRuleProductPrice ?? ObjectManager::getInstance()->get(
+            ReindexRuleProductPrice::class
         );
-        $this->pricesPersistor = $pricesPersistor ?: ObjectManager::getInstance()->get(
-            \Magento\CatalogRule\Model\Indexer\RuleProductPricesPersistor::class
+        $this->pricesPersistor = $pricesPersistor ?? ObjectManager::getInstance()->get(
+            RuleProductPricesPersistor::class
         );
-        $this->activeTableSwitcher = $activeTableSwitcher ?: ObjectManager::getInstance()->get(
+        $this->activeTableSwitcher = $activeTableSwitcher ?? ObjectManager::getInstance()->get(
             \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher::class
         );
-        $this->productLoader = $productLoader ?:
-            ObjectManager::getInstance()->get(ProductLoader::class);
+        $this->productLoader = $productLoader ?? ObjectManager::getInstance()->get(
+            ProductLoader::class
+        );
     }
 
     /**
@@ -432,7 +432,7 @@ protected function getTable($tableName)
      * @param Rule $rule
      * @return $this
      * @deprecated 100.2.0
-     * @see \Magento\CatalogRule\Model\Indexer\ReindexRuleProduct::execute
+     * @see ReindexRuleProduct::execute
      */
     protected function updateRuleProductData(Rule $rule)
     {
@@ -458,8 +458,8 @@ protected function updateRuleProductData(Rule $rule)
      * @throws \Exception
      * @return $this
      * @deprecated 100.2.0
-     * @see \Magento\CatalogRule\Model\Indexer\ReindexRuleProductPrice::execute
-     * @see \Magento\CatalogRule\Model\Indexer\ReindexRuleGroupWebsite::execute
+     * @see ReindexRuleProductPrice::execute
+     * @see ReindexRuleGroupWebsite::execute
      */
     protected function applyAllRules(Product $product = null)
     {
@@ -473,7 +473,7 @@ protected function applyAllRules(Product $product = null)
      *
      * @return $this
      * @deprecated 100.2.0
-     * @see \Magento\CatalogRule\Model\Indexer\ReindexRuleGroupWebsite::execute
+     * @see ReindexRuleGroupWebsite::execute
      */
     protected function updateCatalogRuleGroupWebsiteData()
     {
@@ -497,7 +497,7 @@ protected function deleteOldData()
      * @param null $productData
      * @return float
      * @deprecated 100.2.0
-     * @see \Magento\CatalogRule\Model\Indexer\ProductPriceCalculator::calculate
+     * @see ProductPriceCalculator::calculate
      */
     protected function calcRuleProductPrice($ruleData, $productData = null)
     {
@@ -510,7 +510,7 @@ protected function calcRuleProductPrice($ruleData, $productData = null)
      * @return \Zend_Db_Statement_Interface
      * @throws \Magento\Framework\Exception\LocalizedException
      * @deprecated 100.2.0
-     * @see \Magento\CatalogRule\Model\Indexer\RuleProductsSelectBuilder::build
+     * @see RuleProductsSelectBuilder::build
      */
     protected function getRuleProductsStmt($websiteId, Product $product = null)
     {
@@ -522,7 +522,7 @@ protected function getRuleProductsStmt($websiteId, Product $product = null)
      * @return $this
      * @throws \Exception
      * @deprecated 100.2.0
-     * @see \Magento\CatalogRule\Model\Indexer\RuleProductPricesPersistor::execute
+     * @see RuleProductPricesPersistor::execute
      */
     protected function saveRuleProductPrices($arrData)
     {