MAGETWO-65145: Performance degradation on front end on configurable products with huge amount of variation

Author: serhii-balko

app/code/Magento/ConfigurableProduct/Model/AttributeOptionProvider.php

@@ -12,7 +12,7 @@
 use Magento\Framework\DB\Select;
 
 /**
- * Class AttributeOptionProvider.
+ * Provider for retrieving configurable options.
  */
 class AttributeOptionProvider implements AttributeOptionProviderInterface
 {
@@ -29,23 +29,21 @@ class AttributeOptionProvider implements AttributeOptionProviderInterface
     /**
      * @var OptionSelectBuilderInterface
      */
-    private $optionSelectBuilderInterface;
+    private $optionSelectBuilder;
 
     /**
-     * AttributeOptionProvider constructor.
-     * 
      * @param Attribute $attributeResource
      * @param ScopeResolverInterface $scopeResolver,
-     * @param OptionSelectBuilderInterface $optionSelectBuilderInterface
+     * @param OptionSelectBuilderInterface $optionSelectBuilder
      */
     public function __construct(
         Attribute $attributeResource,
         ScopeResolverInterface $scopeResolver,
-        OptionSelectBuilderInterface $optionSelectBuilderInterface
+        OptionSelectBuilderInterface $optionSelectBuilder
     ) {
         $this->attributeResource = $attributeResource;
         $this->scopeResolver = $scopeResolver;
-        $this->optionSelectBuilderInterface = $optionSelectBuilderInterface;
+        $this->optionSelectBuilder = $optionSelectBuilder;
     }
 
     /**
@@ -54,7 +52,7 @@ public function __construct(
     public function getAttributeOptions(AbstractAttribute $superAttribute, $productId)
     {
         $scope  = $this->scopeResolver->getScope();
-        $select = $this->optionSelectBuilderInterface->getSelect($superAttribute, $productId, $scope);
+        $select = $this->optionSelectBuilder->getSelect($superAttribute, $productId, $scope);
 
         return $this->attributeResource->getConnection()->fetchAll($select);
     }

app/code/Magento/ConfigurableProduct/Model/ResourceModel/Attribute/OptionSelectBuilder.php

@@ -11,7 +11,7 @@
 use Magento\Framework\DB\Select;
 
 /**
- * Class AttributeOptionSelectBuilder.
+ * Build select object for retrieving configurable options.
  */
 class OptionSelectBuilder implements OptionSelectBuilderInterface
 {
@@ -30,8 +30,6 @@ class OptionSelectBuilder implements OptionSelectBuilderInterface
     private $attributeOptionProvider;
 
     /**
-     * Constructor.
-     * 
      * @param Attribute $attributeResource
      * @param OptionProvider $attributeOptionProvider
      */
@@ -44,7 +42,7 @@ public function __construct(Attribute $attributeResource, OptionProvider $attrib
     /**
      * {@inheritdoc}
      */
-    public function getSelect(AbstractAttribute $superAttribute, $productId, ScopeInterface $scope)
+    public function getSelect(AbstractAttribute $superAttribute, int $productId, ScopeInterface $scope)
     {
         $select = $this->attributeResource->getConnection()->select()->from(
             ['super_attribute' => $this->attributeResource->getTable('catalog_product_super_attribute')],

app/code/Magento/ConfigurableProduct/Model/ResourceModel/Attribute/OptionSelectBuilderInterface.php

@@ -10,17 +10,17 @@
 use Magento\Framework\DB\Select;
 
 /**
- * AttributeOptionSelectBuilderInterface
+ * Interface to build select for retrieving configurable options.
  */
 interface OptionSelectBuilderInterface
 {
     /**
-     * Get load options for attribute select
+     * Get load options for attribute select.
      *
      * @param AbstractAttribute $superAttribute
      * @param int $productId
      * @param ScopeInterface $scope
      * @return Select
      */
-    public function getSelect(AbstractAttribute $superAttribute, $productId, ScopeInterface $scope);
+    public function getSelect(AbstractAttribute $superAttribute, int $productId, ScopeInterface $scope);
 }

app/code/Magento/ConfigurableProduct/Plugin/Model/ResourceModel/Attribute/OptionSelectBuilderInterface.php renamed to app/code/Magento/ConfigurableProduct/Plugin/Model/ResourceModel/Attribute/InStockOptionSelectBuilder.php

@@ -6,14 +6,13 @@
 namespace Magento\ConfigurableProduct\Plugin\Model\ResourceModel\Attribute;
 
 use Magento\CatalogInventory\Model\ResourceModel\Stock\Status;
-use Magento\ConfigurableProduct\Model\ResourceModel\Attribute\OptionSelectBuilderInterface as OptionSelectBuilder;
+use Magento\ConfigurableProduct\Model\ResourceModel\Attribute\OptionSelectBuilderInterface;
 use Magento\Framework\DB\Select;
 
-
 /**
  * Plugin for Class OptionSelectBuilderInterface.
  */
-class OptionSelectBuilderInterface
+class InStockOptionSelectBuilder
 {
     /**
      * CatalogInventory Stock Status Resource Model
@@ -33,13 +32,13 @@ public function __construct(Status $stockStatusResource)
     /**
      * Add stock status filter to select.
      *
-     * @param OptionSelectBuilder $subject
+     * @param OptionSelectBuilderInterface $subject
      * @param Select $select
      * @return Select
      * 
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function afterGetSelect(OptionSelectBuilder $subject, Select $select)
+    public function afterGetSelect(OptionSelectBuilderInterface $subject, Select $select)
     {
         $select->joinInner(
             ['stock' => $this->stockStatusResource->getMainTable()],

app/code/Magento/ConfigurableProduct/Test/Unit/Model/AttributeOptionProviderTest.php

@@ -64,7 +64,7 @@ class AttributeOptionProviderTest extends \PHPUnit_Framework_TestCase
     /**
      * @var OptionSelectBuilderInterface|\PHPUnit_Framework_MockObject_MockObject
      */
-    private $optionSelectBuilderInterface;
+    private $optionSelectBuilder;
 
     protected function setUp()
     {
@@ -89,7 +89,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->optionSelectBuilderInterface = $this->getMockBuilder(OptionSelectBuilderInterface::class)
+        $this->optionSelectBuilder = $this->getMockBuilder(OptionSelectBuilderInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
 
@@ -104,7 +104,7 @@ protected function setUp()
             [
                 'attributeResource' => $this->attributeResource,
                 'scopeResolver' => $this->scopeResolver,
-                'optionSelectBuilderInterface' => $this->optionSelectBuilderInterface,
+                'optionSelectBuilder' => $this->optionSelectBuilder,
             ]
         );
     }
@@ -119,7 +119,7 @@ public function testGetAttributeOptions(array $options)
             ->method('getScope')
             ->willReturn($this->scope);
 
-        $this->optionSelectBuilderInterface->expects($this->any())
+        $this->optionSelectBuilder->expects($this->any())
             ->method('getSelect')
             ->with($this->abstractAttribute, 4, $this->scope)
             ->willReturn($this->select);

app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/Model/ResourceModel/Attribute/OptionSelectBuilderInterfaceTest.php renamed to app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/Model/ResourceModel/Attribute/InStockOptionSelectBuilderTest.php

@@ -8,17 +8,14 @@
 
 use Magento\CatalogInventory\Model\ResourceModel\Stock\Status;
 use Magento\ConfigurableProduct\Model\ResourceModel\Attribute\OptionSelectBuilder;
-use Magento\ConfigurableProduct\Plugin\Model\ResourceModel\Attribute\OptionSelectBuilderInterface;
+use Magento\ConfigurableProduct\Plugin\Model\ResourceModel\Attribute\InStockOptionSelectBuilder;
 use Magento\Framework\DB\Select;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
-/**
- * Class OptionSelectBuilderInterfaceTest.
- */
-class OptionSelectBuilderInterfaceTest extends \PHPUnit_Framework_TestCase
+class InStockOptionSelectBuilderTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var OptionSelectBuilderInterface
+     * @var InStockOptionSelectBuilder
      */
     private $model;
 
@@ -59,7 +56,7 @@ protected function setUp()
 
         $this->objectManagerHelper = new ObjectManager($this);
         $this->model = $this->objectManagerHelper->getObject(
-            OptionSelectBuilderInterface::class,
+            InStockOptionSelectBuilder::class,
             [
                 'stockStatusResource' => $this->stockStatusResourceMock,
             ]

app/code/Magento/ConfigurableProduct/etc/frontend/di.xml

@@ -15,6 +15,6 @@
         </arguments>
     </type>
     <type name="Magento\ConfigurableProduct\Model\ResourceModel\Attribute\OptionSelectBuilderInterface">
-        <plugin name="Magento_ConfigurableProduct_Plugin_Model_ResourceModel_Attribute_OptionSelectBuilderInterface" type="Magento\ConfigurableProduct\Plugin\Model\ResourceModel\Attribute\OptionSelectBuilderInterface"/>
+        <plugin name="Magento_ConfigurableProduct_Plugin_Model_ResourceModel_Attribute_InStockOptionSelectBuilder" type="Magento\ConfigurableProduct\Plugin\Model\ResourceModel\Attribute\InStockOptionSelectBuilder"/>
     </type>
 </config>