MAGETWO-62691: [Performance] EAV attributes caching optimization

Author: kandy

app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php

@@ -715,7 +715,6 @@ public function testGetList()
             '',
             false
         );
-        $extendedSearchCriteriaMock = $this->getMock(\Magento\Framework\Api\SearchCriteria::class, [], [], '', false);
         $productAttributeSearchResultsMock = $this->getMockBuilder(ProductAttributeInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(['getItems'])
@@ -729,14 +728,8 @@ public function testGetList()
         );
 
         $this->collectionFactoryMock->expects($this->once())->method('create')->willReturn($collectionMock);
-        $this->searchCriteriaBuilderMock->expects($this->once())->method('create')
-            ->willReturn($extendedSearchCriteriaMock);
-        $this->metadataServiceMock->expects($this->once())->method('getList')->with($extendedSearchCriteriaMock)
-            ->willReturn($productAttributeSearchResultsMock);
-        $productAttributeSearchResultsMock->expects($this->once())->method('getItems')
-            ->willReturn([$productAttributeMock]);
-        $productAttributeMock->expects($this->once())->method('getAttributeCode')->willReturn($attributeCode);
-        $collectionMock->expects($this->once())->method('addAttributeToSelect')->with($attributeCode);
+
+        $collectionMock->expects($this->once())->method('addAttributeToSelect')->with('*');
         $collectionMock->expects($this->exactly(2))->method('joinAttribute')->withConsecutive(
             ['status', 'catalog_product/status', 'entity_id', null, 'inner'],
             ['visibility', 'catalog_product/visibility', 'entity_id', null, 'inner']

app/code/Magento/Customer/Test/Unit/Model/Attribute/Data/PostcodeTest.php

@@ -64,7 +64,7 @@ protected function setUp()
     public function testValidateValue($value, $expected, $countryId, $isOptional)
     {
         $storeLabel = 'Zip/Postal Code';
-        $this->attributeMock->expects($this->once())
+        $this->attributeMock->expects($this->any())
             ->method('getStoreLabel')
             ->willReturn($storeLabel);
 

app/code/Magento/Eav/Model/Attribute/Data/Date.php

@@ -40,7 +40,6 @@ public function validateValue($value)
         $errors = [];
         $attribute = $this->getAttribute();
 
-
         if ($value === false) {
             // try to load original value and validate it
             $value = $this->getEntity()->getDataUsingMethod($attribute->getAttributeCode());

app/code/Magento/Eav/Model/Attribute/Data/Text.php

@@ -62,7 +62,6 @@ public function validateValue($value)
         $errors = [];
         $attribute = $this->getAttribute();
 
-
         if ($value === false) {
             // try to load original value and validate it
             $value = $this->getEntity()->getDataUsingMethod($attribute->getAttributeCode());

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

@@ -471,7 +471,7 @@ protected function _initAttributes($entityType)
      * Get attributes by entity type
      *
      * @deprecated
-     *  @see \Magento\Eav\Model\Config::getEntityAttributes
+     * @see \Magento\Eav\Model\Config::getEntityAttributes
      *
      * @param string $entityType
      * @return AbstractAttribute[]
@@ -540,7 +540,7 @@ private function createAttribute($model)
      * Get codes of all entity type attributes
      *
      * @deprecated
-     *  @see \Magento\Eav\Model\Config::getEntityAttributes
+     * @see \Magento\Eav\Model\Config::getEntityAttributes
      *
      * @param  mixed $entityType
      * @param  \Magento\Framework\DataObject $object
@@ -572,7 +572,6 @@ public function getEntityAttributes($entityType, $object = null)
         }
         $cacheKey = self::ATTRIBUTES_CACHE_ID . '-' . $entityType->getId() . '-' . $storeId . '-' . $attributeSetId;
 
-
         if (isset($this->attributesPerSet[$cacheKey])) {
             return $this->attributesPerSet[$cacheKey];
         }
@@ -581,7 +580,6 @@ public function getEntityAttributes($entityType, $object = null)
             ? $this->serializer->unserialize($attributes)
             : null;
 
-
         $attributes = [];
         if ($attributesData === null) {
             if ($attributeSetId) {

app/code/Magento/Eav/Test/Unit/Model/ConfigTest.php

@@ -120,8 +120,7 @@ public function testGetAttributeCache($cacheEnabled, $loadCalls, $unserializeCal
             ->willReturnSelf();
         $entityAttributeMock->expects($this->atLeastOnce())->method('loadByCode')
             ->willReturnSelf();
-        $entityAttributeMock->expects($this->atLeastOnce())->method('toArray')
-            ->willReturn($attributeData);
+
         $factoryCalls = [
             [
                 Collection::class,
@@ -135,22 +134,6 @@ public function testGetAttributeCache($cacheEnabled, $loadCalls, $unserializeCal
             ],
         ];
 
-        $this->cacheStateMock
-            ->expects($this->atLeastOnce())
-            ->method('isEnabled')
-            ->with(Cache::TYPE_IDENTIFIER)
-            ->willReturn($cacheEnabled);
-        $this->cacheMock
-            ->expects($this->exactly($loadCalls))
-            ->method('load')
-            ->with(Config::ATTRIBUTES_CACHE_ID . 'entity_type_code')
-            ->willReturn($cachedValue);
-        $this->serializerMock
-            ->expects($this->exactly($unserializeCalls))
-            ->method('unserialize')
-            ->with($cachedValue)
-            ->willReturn([$attributeData]);
-
         $entityTypeData = [
             'entity_type_id' => 'entity_type_id',
             'entity_type_code' => 'entity_type_code'
@@ -265,16 +248,6 @@ public function testGetAttributes($cacheEnabled, $loadCalls, $unserializeCalls,
             ->method('isEnabled')
             ->with(Cache::TYPE_IDENTIFIER)
             ->willReturn($cacheEnabled);
-        $this->cacheMock
-            ->expects($this->exactly($loadCalls))
-            ->method('load')
-            ->with(Config::ATTRIBUTES_CACHE_ID . 'entity_type_code')
-            ->willReturn($cachedValue);
-        $this->serializerMock
-            ->expects($this->exactly($unserializeCalls))
-            ->method('unserialize')
-            ->with($cachedValue)
-            ->willReturn([$attributeData]);
 
         $entityTypeData = [
             'entity_type_id' => 'entity_type_id',