MAGETWO-52836: Enable EAV attributes caching

Author: akaplya

app/code/Magento/Customer/Model/Metadata/CachedMetadata.php

@@ -32,26 +32,6 @@ class CachedMetadata implements MetadataInterface
      */
     protected $metadata;
 
-    /**
-     * @var array
-     */
-    protected $attributeMetadataCache = [];
-
-    /**
-     * @var array
-     */
-    protected $attributesCache = [];
-
-    /**
-     * @var \Magento\Customer\Api\Data\AttributeMetadataInterface[]
-     */
-    protected $allAttributeMetadataCache = null;
-
-    /**
-     * @var \Magento\Customer\Api\Data\AttributeMetadataInterface[]
-     */
-    protected $customAttributesMetadataCache = null;
-
     /**
      * Initialize dependencies.
      *
@@ -67,69 +47,55 @@ public function __construct(MetadataInterface $metadata)
      */
     public function getAttributes($formCode)
     {
-        $key = $formCode;
-        if (isset($this->attributesCache[$key])) {
-            return $this->attributesCache[$key];
+        $attributes = $this->getCache()->getAttributes($this->entityType, $formCode);
+        if ($attributes !== false) {
+            return $attributes;
         }
-
-        $value = $this->metadata->getAttributes($formCode);
-        $this->attributesCache[$key] = $value;
-
-        return $value;
+        $attributes = $this->metadata->getAttributes($formCode);
+        $this->getCache()->saveAttributes($this->entityType, $attributes, $formCode);
+        return $attributes;
     }
 
     /**
      * {@inheritdoc}
      */
     public function getAttributeMetadata($attributeCode)
     {
-        $key = $attributeCode;
-        if (isset($this->attributeMetadataCache[$key])) {
-            return $this->attributeMetadataCache[$key];
+        $metadata = $this->getCache()->getAttributes($this->entityType, $attributeCode);
+        if ($metadata) {
+            return $metadata;
         }
-
-        $value = $this->metadata->getAttributeMetadata($attributeCode);
-        $this->attributeMetadataCache[$key] = $value;
-
-        return $value;
+        $metadata = $this->metadata->getAttributeMetadata($attributeCode);
+        $this->getCache()->saveAttributes($this->entityType, $metadata, $attributeCode);
+        return $metadata;
     }
 
     /**
      * {@inheritdoc}
      */
     public function getAllAttributesMetadata()
     {
-        if ($this->allAttributeMetadataCache !== null) {
-            return $this->allAttributeMetadataCache;
-        }
         $attributes = $this->getCache()->getAttributes($this->entityType, 'all');
-        if ($attributes) {
-            $this->allAttributeMetadataCache = $attributes;
-            return $this->allAttributeMetadataCache;
+        if ($attributes !== false) {
+            return $attributes;
         }
-
-
-        $this->allAttributeMetadataCache = $this->metadata->getAllAttributesMetadata();
-        $this->getCache()->saveAttributes($this->entityType, $this->allAttributeMetadataCache, 'all');
-        return $this->allAttributeMetadataCache;
+        $attributes = $this->metadata->getCustomAttributesMetadata();
+        $this->getCache()->saveAttributes($this->entityType, $attributes, 'all');
+        return $attributes;
     }
 
     /**
      * {@inheritdoc}
      */
     public function getCustomAttributesMetadata($dataObjectClassName = null)
     {
-        if ($this->customAttributesMetadataCache !== null) {
-            return $this->customAttributesMetadataCache;
-        }
         $attributes = $this->getCache()->getAttributes($this->entityType, 'custom');
-        if ($attributes) {
-            $this->customAttributesMetadataCache = $attributes;
-            return $this->customAttributesMetadataCache;
+        if ($attributes !== false) {
+            return $attributes;
         }
-        $this->customAttributesMetadataCache = $this->metadata->getCustomAttributesMetadata();
+        $attributes = $this->metadata->getCustomAttributesMetadata();
         $this->getCache()->saveAttributes($this->entityType, $attributes, 'custom');
-        return $this->customAttributesMetadataCache;
+        return $attributes;
     }
 
     /**