MAGETWO-90572: Optimize retrieving product attributes

Author: mslabko

app/code/Magento/Catalog/Model/Product.php

@@ -12,6 +12,7 @@
 use Magento\Catalog\Model\Product\Attribute\Backend\Media\EntryConverterPool;
 use Magento\Framework\Api\AttributeValueFactory;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DataObject\IdentityInterface;
 use Magento\Framework\Pricing\SaleableInterface;
 
@@ -346,6 +347,11 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      */
     protected $linkTypeProvider;
 
+    /**
+     * @var \Magento\Eav\Model\Config|null
+     */
+    private $eavConfig;
+
     /**
      * Product constructor.
      * @param \Magento\Framework\Model\Context $context
@@ -384,6 +390,7 @@ class Product extends \Magento\Catalog\Model\AbstractModel implements
      * @param \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $joinProcessor
      * @param array $data
      *
+     * @param \Magento\Eav\Model\Config|null $config
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
@@ -422,7 +429,8 @@ public function __construct(
         EntryConverterPool $mediaGalleryEntryConverterPool,
         \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
         \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $joinProcessor,
-        array $data = []
+        array $data = [],
+        \Magento\Eav\Model\Config $config = null
     ) {
         $this->metadataService = $metadataService;
         $this->_itemOptionFactory = $itemOptionFactory;
@@ -461,6 +469,7 @@ public function __construct(
             $resourceCollection,
             $data
         );
+        $this->eavConfig = $config ?? ObjectManager::getInstance()->get(\Magento\Eav\Model\Config::class);
     }
 
     /**
@@ -479,7 +488,10 @@ protected function _construct()
     protected function getCustomAttributesCodes()
     {
         if ($this->customAttributesCodes === null) {
-            $this->customAttributesCodes = $this->getEavAttributesCodes($this->metadataService);
+            $this->customAttributesCodes = array_keys($this->eavConfig->getEntityAttributes(
+                self::ENTITY,
+                $this
+            ));
             $this->customAttributesCodes = array_diff($this->customAttributesCodes, $this->interfaceAttributes);
         }
         return $this->customAttributesCodes;

app/code/Magento/Eav/Model/AttributeRepository.php

@@ -132,14 +132,9 @@ public function getList($entityTypeCode, \Magento\Framework\Api\SearchCriteriaIn
         $attributeCollection->addAttributeGrouping();
 
         $attributes = [];
-        // If search criteria not specified try to load all attributes for speedup
-        if (!$searchCriteria->getFilterGroups()) {
-            $attributes = $this->eavConfig->getEntityAttributes($entityTypeCode);
-        } else {
-            /** @var \Magento\Eav\Api\Data\AttributeInterface $attribute */
-            foreach ($attributeCollection as $attribute) {
-                $attributes[] = $this->get($entityTypeCode, $attribute->getAttributeCode());
-            }
+        /** @var \Magento\Eav\Api\Data\AttributeInterface $attribute */
+        foreach ($attributeCollection as $attribute) {
+            $attributes[] = $this->get($entityTypeCode, $attribute->getAttributeCode());
         }
 
         /** @var \Magento\Eav\Api\Data\AttributeSearchResultsInterface $searchResults */