MAGETWO-65095: [Performance] Redundant objects created for configurable product

Author: Valeriy Nayda

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

@@ -7,6 +7,7 @@
 
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\Data\ProductInterfaceFactory;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Config;
 use Magento\Framework\App\ObjectManager;
@@ -163,6 +164,11 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
      */
     private $customerSession;
 
+    /**
+     * @var ProductInterfaceFactory
+     */
+    private $productFactory;
+
     /**
      * @codingStandardsIgnoreStart/End
      *
@@ -184,6 +190,7 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $extensionAttributesJoinProcessor
      * @param \Magento\Framework\Serialize\Serializer\Json $serializer
+     * @param ProductInterfaceFactory $productFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -206,7 +213,8 @@ public function __construct(
         \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $extensionAttributesJoinProcessor,
         \Magento\Framework\Cache\FrontendInterface $cache = null,
         \Magento\Customer\Model\Session $customerSession = null,
-        \Magento\Framework\Serialize\Serializer\Json $serializer = null
+        \Magento\Framework\Serialize\Serializer\Json $serializer = null,
+        ProductInterfaceFactory $productFactory = null
     ) {
         $this->typeConfigurableFactory = $typeConfigurableFactory;
         $this->_eavAttributeFactory = $eavAttributeFactory;
@@ -218,6 +226,8 @@ public function __construct(
         $this->extensionAttributesJoinProcessor = $extensionAttributesJoinProcessor;
         $this->cache = $cache;
         $this->customerSession = $customerSession;
+        $this->productFactory = $productFactory ?: ObjectManager::getInstance()
+            ->get(ProductInterfaceFactory::class);
         parent::__construct(
             $catalogProductOption,
             $eavConfig,
@@ -529,15 +539,16 @@ public function getUsedProducts($product, $requiredAttributeIds = null)
                     ]
                 )
             );
-            $collection = $this->getUsedProductCollection($product);
             $data = $this->serializer->unserialize($this->getCache()->load($key));
             if (!empty($data)) {
                 $usedProducts = [];
                 foreach ($data as $item) {
-                    $productItem = $collection->getNewEmptyItem()->setData($item);
+                    $productItem = $this->productFactory->create();
+                    $productItem->setData($item);
                     $usedProducts[] = $productItem;
                 }
             } else {
+                $collection = $this->getUsedProductCollection($product);
                 $collection
                     ->setFlag('has_stock_status_filter', true)
                     ->addAttributeToSelect($this->getCatalogConfig()->getProductAttributes())

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

@@ -110,6 +110,11 @@ class ConfigurableTest extends \PHPUnit_Framework_TestCase
      */
     protected $catalogConfig;
 
+    /**
+     * @var \Magento\Catalog\Api\Data\ProductInterfaceFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $productFactory;
+
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -177,6 +182,10 @@ protected function setUp()
             ->method('getMetadata')
             ->with(ProductInterface::class)
             ->willReturn($this->entityMetadata);
+        $this->productFactory = $this->getMockBuilder(\Magento\Catalog\Api\Data\ProductInterfaceFactory::class)
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->_model = $this->_objectHelper->getObject(
             Configurable::class,
@@ -197,6 +206,7 @@ protected function setUp()
                 'cache' => $this->cache,
                 'catalogConfig' => $this->catalogConfig,
                 'serializer' => $this->serializer,
+                'productFactory' => $this->productFactory,
             ]
         );
         $refClass = new \ReflectionClass(Configurable::class);
@@ -374,6 +384,50 @@ public function testGetUsedProducts()
         $this->_model->getUsedProducts($product);
     }
 
+    public function testGetUsedProductsWithDataInCache()
+    {
+        $product = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $childProduct = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $dataKey = '_cache_instance_products';
+        $usedProductsData = [['first']];
+        $usedProducts = [$childProduct];
+
+        $product->expects($this->once())
+            ->method('hasData')
+            ->with($dataKey)
+            ->willReturn(false);
+        $product->expects($this->once())
+            ->method('setData')
+            ->with($dataKey, $usedProducts);
+        $product->expects($this->any())
+            ->method('getData')
+            ->willReturnOnConsecutiveCalls(1, $usedProducts);
+
+        $childProduct->expects($this->once())
+            ->method('setData')
+            ->with($usedProductsData[0]);
+
+        $this->productFactory->expects($this->once())
+            ->method('create')
+            ->willReturn($childProduct);
+
+        $this->cache->expects($this->once())
+            ->method('load')
+            ->willReturn($usedProductsData);
+
+        $this->serializer->expects($this->once())
+            ->method('unserialize')
+            ->with($usedProductsData)
+            ->willReturn($usedProductsData);
+
+        self::assertEquals($usedProducts, $this->_model->getUsedProducts($product));
+    }
+
     /**
      * @param int $productStore
      *