Merge pull request #946 from magento-east/MAGETWO-66401

[EAST-2.1] MAGETWO-66401: [Backport] - [Performance] Bump in stock SQL queries - for 2.1.6

Author: Volodymyr Klymenko

app/code/Magento/ConfigurableProduct/Pricing/Price/LowestPriceOptionsProvider.php

@@ -30,6 +30,13 @@ class LowestPriceOptionsProvider implements LowestPriceOptionsProviderInterface
      */
     private $collectionFactory;
 
+    /**
+     * Key is product id. Value is prepared product collection
+     *
+     * @var array
+     */
+    private $productsMap;
+
     /**
      * @param ResourceConnection $resourceConnection
      * @param LinkedProductSelectBuilderInterface $linkedProductSelectBuilder
@@ -50,14 +57,16 @@ public function __construct(
      */
     public function getProducts(ProductInterface $product)
     {
-        $productIds = $this->resource->getConnection()->fetchCol(
-            '(' . implode(') UNION (', $this->linkedProductSelectBuilder->build($product->getId())) . ')'
-        );
-
-        $lowestPriceChildProducts = $this->collectionFactory->create()
-            ->addAttributeToSelect(['price', 'special_price'])
-            ->addIdFilter($productIds)
-            ->getItems();
-        return $lowestPriceChildProducts;
+        if (!isset($this->productsMap[$product->getId()])) {
+            $productIds = $this->resource->getConnection()->fetchCol(
+                '(' . implode(') UNION (', $this->linkedProductSelectBuilder->build($product->getId())) . ')'
+            );
+
+            $this->productsMap[$product->getId()] = $this->collectionFactory->create()
+                ->addAttributeToSelect(['price', 'special_price'])
+                ->addIdFilter($productIds)
+                ->getItems();
+        }
+        return $this->productsMap[$product->getId()];
     }
 }

dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Price/LowestPriceOptionProviderTest.php

@@ -18,11 +18,6 @@ class LowestPriceOptionProviderTest extends \PHPUnit_Framework_TestCase
      */
     private $storeManager;
 
-    /**
-     * @var LowestPriceOptionsProviderInterface
-     */
-    private $lowestPriceOptionsProvider;
-
     /**
      * @var ProductRepositoryInterface
      */
@@ -32,9 +27,6 @@ protected function setUp()
     {
         $this->storeManager = Bootstrap::getObjectManager()->get(StoreManagerInterface::class);
         $this->productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
-        $this->lowestPriceOptionsProvider = Bootstrap::getObjectManager()->get(
-            LowestPriceOptionsProviderInterface::class
-        );
     }
 
     /**
@@ -43,7 +35,7 @@ protected function setUp()
     public function testGetProductsIfOneOfChildIsDisabled()
     {
         $configurableProduct = $this->productRepository->get('configurable', false, null, true);
-        $lowestPriceChildrenProducts = $this->lowestPriceOptionsProvider->getProducts($configurableProduct);
+        $lowestPriceChildrenProducts = $this->createLowestPriceOptionsProvider()->getProducts($configurableProduct);
         $this->assertCount(1, $lowestPriceChildrenProducts);
         $lowestPriceChildrenProduct = reset($lowestPriceChildrenProducts);
         $this->assertEquals(10, $lowestPriceChildrenProduct->getPrice());
@@ -62,7 +54,8 @@ public function testGetProductsIfOneOfChildIsDisabled()
         $this->productRepository->save($lowestPriceChildProduct);
         $this->storeManager->setCurrentStore($currentStoreId);
 
-        $lowestPriceChildrenProducts = $this->lowestPriceOptionsProvider->getProducts($configurableProduct);
+        $lowestPriceChildrenProducts = $this->createLowestPriceOptionsProvider()->getProducts($configurableProduct);
+
         $this->assertCount(1, $lowestPriceChildrenProducts);
         $lowestPriceChildrenProduct = reset($lowestPriceChildrenProducts);
         $this->assertEquals(20, $lowestPriceChildrenProduct->getPrice());
@@ -74,7 +67,7 @@ public function testGetProductsIfOneOfChildIsDisabled()
     public function testGetProductsIfOneOfChildIsDisabledPerStore()
     {
         $configurableProduct = $this->productRepository->get('configurable', false, null, true);
-        $lowestPriceChildrenProducts = $this->lowestPriceOptionsProvider->getProducts($configurableProduct);
+        $lowestPriceChildrenProducts = $this->createLowestPriceOptionsProvider()->getProducts($configurableProduct);
         $this->assertCount(1, $lowestPriceChildrenProducts);
         $lowestPriceChildrenProduct = reset($lowestPriceChildrenProducts);
         $this->assertEquals(10, $lowestPriceChildrenProduct->getPrice());
@@ -94,7 +87,7 @@ public function testGetProductsIfOneOfChildIsDisabledPerStore()
         $this->productRepository->save($lowestPriceChildProduct);
         $this->storeManager->setCurrentStore($currentStoreId);
 
-        $lowestPriceChildrenProducts = $this->lowestPriceOptionsProvider->getProducts($configurableProduct);
+        $lowestPriceChildrenProducts = $this->createLowestPriceOptionsProvider()->getProducts($configurableProduct);
         $this->assertCount(1, $lowestPriceChildrenProducts);
         $lowestPriceChildrenProduct = reset($lowestPriceChildrenProducts);
         $this->assertEquals(20, $lowestPriceChildrenProduct->getPrice());
@@ -106,7 +99,7 @@ public function testGetProductsIfOneOfChildIsDisabledPerStore()
     public function testGetProductsIfOneOfChildIsOutOfStock()
     {
         $configurableProduct = $this->productRepository->get('configurable', false, null, true);
-        $lowestPriceChildrenProducts = $this->lowestPriceOptionsProvider->getProducts($configurableProduct);
+        $lowestPriceChildrenProducts = $this->createLowestPriceOptionsProvider()->getProducts($configurableProduct);
         $this->assertCount(1, $lowestPriceChildrenProducts);
         $lowestPriceChildrenProduct = reset($lowestPriceChildrenProducts);
         $this->assertEquals(10, $lowestPriceChildrenProduct->getPrice());
@@ -121,10 +114,21 @@ public function testGetProductsIfOneOfChildIsOutOfStock()
         $stockItem = $lowestPriceChildProduct->getExtensionAttributes()->getStockItem();
         $stockItem->setIsInStock(0);
         $this->productRepository->save($lowestPriceChildProduct);
-
-        $lowestPriceChildrenProducts = $this->lowestPriceOptionsProvider->getProducts($configurableProduct);
+        $lowestPriceChildrenProducts = $this->createLowestPriceOptionsProvider()->getProducts($configurableProduct);
         $this->assertCount(1, $lowestPriceChildrenProducts);
         $lowestPriceChildrenProduct = reset($lowestPriceChildrenProducts);
         $this->assertEquals(20, $lowestPriceChildrenProduct->getPrice());
     }
+
+    /**
+     * As LowestPriceOptionsProviderInterface used multiple times in scope
+     * of one test we need to always recreate it and prevent internal caching in property
+     * @return LowestPriceOptionsProviderInterface
+     */
+    private function createLowestPriceOptionsProvider()
+    {
+        return Bootstrap::getObjectManager()->create(
+            LowestPriceOptionsProviderInterface::class
+        );
+    }
 }