MAGETWO-66515: [Performance] Reduce queries to stock_status_index on Category Page

Author: Yaroslav Onischenko

app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php

@@ -1270,15 +1270,13 @@ public function getSalableUsedProducts(\Magento\Catalog\Model\Product $product,
      * @param \Magento\Catalog\Model\Product $product
      * @param string $cacheKey
      * @param bool $salableOnly
-     * @return ProductInterface[]|null
+     * @return ProductInterface[]
      */
     private function loadUsedProducts(\Magento\Catalog\Model\Product $product, $cacheKey, $salableOnly = false)
     {
-        \Magento\Framework\Profiler::start(
-            'CONFIGURABLE:' . __METHOD__,
-            ['group' => 'CONFIGURABLE', 'method' => __METHOD__]
-        );
-        if (!$product->hasData($this->usedSalableProducts)) {
+        $dataFieldName = $salableOnly ? $this->usedSalableProducts : $this->_usedProducts;
+        $hasData = $product->hasData($dataFieldName);
+        if (!$hasData) {
             $usedProducts = $this->readUsedProductsCacheData($cacheKey);
             if ($usedProducts === null) {
                 $collection = $this->getConfiguredUsedProductCollection($product);
@@ -1288,11 +1286,11 @@ private function loadUsedProducts(\Magento\Catalog\Model\Product $product, $cach
                 $usedProducts = $collection->getItems();
                 $this->saveUsedProductsCacheData($product, $usedProducts, $cacheKey);
             }
-            $product->setData($this->usedSalableProducts, $usedProducts);
+            $product->setData($dataFieldName, $usedProducts);
         }
-        \Magento\Framework\Profiler::stop('CONFIGURABLE:' . __METHOD__);
+        $child = $product->getData($dataFieldName);
 
-        return $product->getData($this->usedSalableProducts);
+        return $child;
     }
 
     /**

app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/ConfigurableTest.php

@@ -822,18 +822,20 @@ public function testSetImageFromChildProduct()
         $childProductMock = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->entityMetadata->expects($this->any())
+            ->method('getLinkField')
+            ->willReturn('link');
+        $productMock->expects($this->any())->method('hasData')
+            ->withConsecutive(['store_id'], ['_cache_instance_products'])
+            ->willReturnOnConsecutiveCalls(true, true);
+
+        $productMock->expects($this->any())->method('getData')
+            ->withConsecutive(['image'], ['image'], ['link'], ['store_id'], ['_cache_instance_products'])
+            ->willReturnOnConsecutiveCalls('no_selection', 'no_selection', 1, 1, [$childProductMock]);
 
-        $productMock->expects($this->at(0))->method('getData')->with('image')->willReturn('no_selection');
-        $productMock->expects($this->at(1))->method('getData')->with('image')->willReturn('no_selection');
-        $productMock->expects($this->once())->method('hasData')->with('_cache_instance_products')->willReturn(true);
-        $productMock->expects($this->at(3))
-            ->method('getData')
-            ->with('_cache_instance_products')
-            ->willReturn([$childProductMock]);
         $childProductMock->expects($this->any())->method('getData')->with('image')->willReturn('image_data');
         $productMock->expects($this->once())->method('setImage')->with('image_data')->willReturnSelf();
 
         $this->_model->setImageFromChildProduct($productMock);
     }
 }
-