MAGETWO-54682: Fast load of product options

mslabko · mslabko · commit 3c51b1211369 · 2016-07-22T19:13:53.000+03:00
- MAGETWO-55756: Porting to 2.1
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/LinkedProductSelectBuilderByIndexPrice.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\Catalog\Model\ResourceModel\Product\Indexer;
 
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Framework\DB\Select;
 use Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderInterface;
@@ -26,33 +27,51 @@ class LinkedProductSelectBuilderByIndexPrice implements LinkedProductSelectBuild
      */
     private $customerSession;
 
+    /**
+     * @var \Magento\Framework\EntityManager\MetadataPool
+     */
+    private $metadataPool;
+
     /**
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\ResourceConnection $resourceConnection
      * @param \Magento\Customer\Model\Session $customerSession
+     * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\ResourceConnection $resourceConnection,
-        \Magento\Customer\Model\Session $customerSession
+        \Magento\Customer\Model\Session $customerSession,
+        \Magento\Framework\EntityManager\MetadataPool $metadataPool
     ) {
         $this->storeManager = $storeManager;
         $this->resource = $resourceConnection;
         $this->customerSession = $customerSession;
+        $this->metadataPool = $metadataPool;
     }
 
     /**
      * {@inheritdoc}
      */
     public function build($productId)
     {
+        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
+
         return [$this->resource->getConnection()->select()
-            ->from(['t' => $this->resource->getTableName('catalog_product_index_price')], 'entity_id')
+            ->from(['parent' => 'catalog_product_entity'], '')
             ->joinInner(
                 ['link' => $this->resource->getTableName('catalog_product_relation')],
-                'link.child_id = t.entity_id',
+                "link.parent_id = parent.$linkField",
+                []
+            )->joinInner(
+                ['child' => 'catalog_product_entity'],
+                "child.entity_id = link.child_id",
+                ['entity_id']
+            )->joinInner(
+                ['t' => $this->resource->getTableName('catalog_product_index_price')],
+                't.entity_id = child.entity_id',
                 []
-            )->where('link.parent_id = ? ', $productId)
+            )->where('parent.entity_id = ? ', $productId)
             ->where('t.website_id = ?', $this->storeManager->getStore()->getWebsiteId())
             ->where('t.customer_group_id = ?', $this->customerSession->getCustomerGroupId())
             ->order('t.min_price ' . Select::SQL_ASC)
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByBasePrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByBasePrice.php
@@ -66,12 +66,20 @@ public function build($productId)
         $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
         $priceAttribute = $this->eavConfig->getAttribute(Product::ENTITY, 'price');
         $priceSelect = $this->resource->getConnection()->select()
-            ->from(['t' => $priceAttribute->getBackendTable()], $linkField)
+            ->from(['parent' => 'catalog_product_entity'], '')
             ->joinInner(
                 ['link' => $this->resource->getTableName('catalog_product_relation')],
-                "link.child_id = t.$linkField",
+                "link.parent_id = parent.$linkField",
                 []
-            )->where('link.parent_id = ? ', $productId)
+            )->joinInner(
+                ['child' => 'catalog_product_entity'],
+                "child.entity_id = link.child_id",
+                ['entity_id']
+            )->joinInner(
+                ['t' => $priceAttribute->getBackendTable()],
+                "t.$linkField = child.$linkField",
+                []
+            )->where('parent.entity_id = ? ', $productId)
             ->where('t.attribute_id = ?', $priceAttribute->getAttributeId())
             ->where('t.value IS NOT NULL')
             ->order('t.value ' . Select::SQL_ASC)
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderBySpecialPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderBySpecialPrice.php
@@ -87,27 +87,35 @@ public function build($productId)
         $timestamp = $this->localeDate->scopeTimeStamp($this->storeManager->getStore());
         $currentDate = $this->dateTime->formatDate($timestamp, false);
 
-        $specialPrice = $connection->select()
-            ->from(['t' => $specialPriceAttribute->getBackendTable()], $linkField)
+        $specialPrice = $this->resource->getConnection()->select()
+            ->from(['parent' => 'catalog_product_entity'], '')
             ->joinInner(
                 ['link' => $this->resource->getTableName('catalog_product_relation')],
-                "link.child_id = t.{$linkField}",
+                "link.parent_id = parent.$linkField",
                 []
             )->joinInner(
+                ['child' => 'catalog_product_entity'],
+                "child.entity_id = link.child_id",
+                ['entity_id']
+            )->joinInner(
+                ['t' => $specialPriceAttribute->getBackendTable()],
+                "t.$linkField = child.$linkField",
+                []
+            )->joinLeft(
                 ['special_from' => $specialPriceFromDate->getBackendTable()],
                 $connection->quoteInto(
                     "t.{$linkField} = special_from.{$linkField} AND special_from.attribute_id = ?",
                     $specialPriceFromDate->getAttributeId()
                 ),
                 ''
-            )->joinInner(
+            )->joinLeft(
                 ['special_to' => $specialPriceToDate->getBackendTable()],
                 $connection->quoteInto(
                     "t.{$linkField} = special_to.{$linkField} AND special_to.attribute_id = ?",
                     $specialPriceToDate->getAttributeId()
                 ),
                 ''
-            )->where('link.parent_id = ? ', $productId)
+            )->where('parent.entity_id = ? ', $productId)
             ->where('t.attribute_id = ?', $specialPriceAttribute->getAttributeId())
             ->where('t.value IS NOT NULL')
             ->where(
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByTierPrice.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/LinkedProductSelectBuilderByTierPrice.php
@@ -69,16 +69,24 @@ public function build($productId)
     {
         $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
         $priceSelect = $this->resource->getConnection()->select()
-                ->from(['t' => $this->resource->getTableName('catalog_product_entity_tier_price')], $linkField)
-                ->joinInner(
-                    ['link' => $this->resource->getTableName('catalog_product_relation')],
-                    "link.child_id = t.{$linkField}",
-                    []
-                )->where('link.parent_id = ? ', $productId)
-                ->where('t.all_groups = 1 OR customer_group_id = ?', $this->customerSession->getCustomerGroupId())
-                ->where('t.qty = ?', 1)
-                ->order('t.value ' . Select::SQL_ASC)
-                ->limit(1);
+            ->from(['parent' => 'catalog_product_entity'], '')
+            ->joinInner(
+                ['link' => $this->resource->getTableName('catalog_product_relation')],
+                "link.parent_id = parent.$linkField",
+                []
+            )->joinInner(
+                ['child' => 'catalog_product_entity'],
+                "child.entity_id = link.child_id",
+                ['entity_id']
+            )->joinInner(
+                ['t' => $this->resource->getTableName('catalog_product_entity_tier_price')],
+                "t.$linkField = child.$linkField",
+                []
+            )->where('parent.entity_id = ? ', $productId)
+            ->where('t.all_groups = 1 OR customer_group_id = ?', $this->customerSession->getCustomerGroupId())
+            ->where('t.qty = ?', 1)
+            ->order('t.value ' . Select::SQL_ASC)
+            ->limit(1);
 
         $priceSelectDefault = clone $priceSelect;
         $priceSelectDefault->where('t.website_id = ?', self::DEFAULT_WEBSITE_ID);
diff --git a/app/code/Magento/CatalogInventory/Helper/Stock.php b/app/code/Magento/CatalogInventory/Helper/Stock.php
@@ -154,10 +154,7 @@ public function addIsInStockFilterToCollection($collection)
                 \Magento\Store\Model\ScopeInterface::SCOPE_STORE
             );
             $resource = $this->getStockStatusResource();
-            $resource->addStockDataToCollection(
-                $collection,
-                !$isShowOutOfStock && $collection->getFlag('require_stock_items')
-            );
+            $resource->addStockDataToCollection($collection, !$isShowOutOfStock);
             $collection->setFlag($stockFlag, true);
         }
     }
diff --git a/app/code/Magento/CatalogRule/Model/ResourceModel/Product/LinkedProductSelectBuilderByCatalogRulePrice.php b/app/code/Magento/CatalogRule/Model/ResourceModel/Product/LinkedProductSelectBuilderByCatalogRulePrice.php
@@ -5,6 +5,7 @@
  */
 namespace Magento\CatalogRule\Model\ResourceModel\Product;
 
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Framework\DB\Select;
 use Magento\Catalog\Model\ResourceModel\Product\LinkedProductSelectBuilderInterface;
@@ -36,25 +37,33 @@ class LinkedProductSelectBuilderByCatalogRulePrice implements LinkedProductSelec
      */
     private $localeDate;
 
+    /**
+     * @var \Magento\Framework\EntityManager\MetadataPool
+     */
+    private $metadataPool;
+
     /**
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\App\ResourceConnection $resourceConnection
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
+     * @param \Magento\Framework\EntityManager\MetadataPool $metadataPool
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\App\ResourceConnection $resourceConnection,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Framework\Stdlib\DateTime $dateTime,
-        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
+        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
+        \Magento\Framework\EntityManager\MetadataPool $metadataPool
     ) {
         $this->storeManager = $storeManager;
         $this->resource = $resourceConnection;
         $this->customerSession = $customerSession;
         $this->dateTime = $dateTime;
         $this->localeDate = $localeDate;
+        $this->metadataPool = $metadataPool;
     }
 
     /**
@@ -64,14 +73,23 @@ public function build($productId)
     {
         $timestamp = $this->localeDate->scopeTimeStamp($this->storeManager->getStore());
         $currentDate = $this->dateTime->formatDate($timestamp, false);
+        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
 
         return [$this->resource->getConnection()->select()
-            ->from(['t' => $this->resource->getTableName('catalogrule_product_price')], 'product_id')
-            ->joinInner(
-                ['link' => $this->resource->getTableName('catalog_product_relation')],
-                'link.child_id = t.product_id',
-                []
-            )->where('link.parent_id = ? ', $productId)
+                ->from(['parent' => 'catalog_product_entity'], '')
+                ->joinInner(
+                    ['link' => $this->resource->getTableName('catalog_product_relation')],
+                    "link.parent_id = parent.$linkField",
+                    []
+                )->joinInner(
+                    ['child' => 'catalog_product_entity'],
+                    "child.entity_id = link.child_id",
+                    ['entity_id']
+                )->joinInner(
+                    ['t' => $this->resource->getTableName('catalogrule_product_price')],
+                    't.product_id = child.entity_id',
+                    []
+                )->where('parent.entity_id = ? ', $productId)
             ->where('t.website_id = ?', $this->storeManager->getStore()->getWebsiteId())
             ->where('t.customer_group_id = ?', $this->customerSession->getCustomerGroupId())
             ->where('t.rule_date = ?', $currentDate)
diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableOptionsProvider.php b/app/code/Magento/ConfigurableProduct/Pricing/Price/ConfigurableOptionsProvider.php
@@ -76,8 +76,8 @@ public function getProducts(ProductInterface $product)
                 );
 
                 $this->products[$product->getId()] = $this->collectionFactory->create()
-                    ->addIdFilter($productIds)
-                    ->addPriceData();
+                    ->addAttributeToSelect(['price', 'special_price'])
+                    ->addIdFilter($productIds);
             } else {
                 $this->products[$product->getId()] = $this->configurable->getUsedProducts($product);
             }

Original file line number	Diff line number	Diff line change
`@@ -154,10 +154,7 @@ public function addIsInStockFilterToCollection($collection)`
`154`	`154`	`\Magento\Store\Model\ScopeInterface::SCOPE_STORE`
`155`	`155`	`);`
`156`	`156`	`$resource = $this->getStockStatusResource();`
`157`		`- $resource->addStockDataToCollection(`
`158`		`- $collection,`
`159`		`- !$isShowOutOfStock && $collection->getFlag('require_stock_items')`
`160`		`- );`
	`157`	`+ $resource->addStockDataToCollection($collection, !$isShowOutOfStock);`
`161`	`158`	`$collection->setFlag($stockFlag, true);`
`162`	`159`	`}`
`163`	`160`	`}`