implemented EAV Cache

OpenMage · Sep 21, 2018 · d5b5f41 · d5b5f41
1 parent c93e134
commit d5b5f41
Show file tree

Hide file tree

Showing 10 changed files with 417 additions and 309 deletions.
diff --git a/app/code/core/Mage/Catalog/Helper/Data.php b/app/code/core/Mage/Catalog/Helper/Data.php
@@ -422,8 +422,7 @@ public function canApplyMsrpToProductType($product)
     {
         if($this->_mapApplyToProductType === null) {
             /** @var $attribute Mage_Catalog_Model_Resource_Eav_Attribute */
-            $attribute = Mage::getModel('catalog/resource_eav_attribute')
-                ->loadByCode(Mage_Catalog_Model_Product::ENTITY, 'msrp_enabled');
+            $attribute = Mage::getSingleton('eav/config')->getAttribute(Mage_Catalog_Model_Product::ENTITY,'msrp_enabled');
             $this->_mapApplyToProductType = $attribute->getApplyTo();
         }
         return empty($this->_mapApplyToProductType) || in_array($product->getTypeId(), $this->_mapApplyToProductType);

diff --git a/app/code/core/Mage/Catalog/Model/Config.php b/app/code/core/Mage/Catalog/Model/Config.php
@@ -256,8 +256,8 @@ public function getSourceOptionId($source, $value)
      */
     public function getProductAttributes()
     {
-        if (is_null($this->_productAttributes)) {
-            $this->_productAttributes = array_keys($this->getAttributesUsedInProductListing());
+        if (null === $this->_usedInProductListing) {
+            $this->_usedInProductListing = Mage::getSingleton('eav/config')->getAttributesUsedInProductListing();
         }
         return $this->_productAttributes;
     }

diff --git a/app/code/core/Mage/Catalog/Model/Layer.php b/app/code/core/Mage/Catalog/Model/Layer.php
@@ -214,24 +214,19 @@ public function getCurrentStore()
      */
     public function getFilterableAttributes()
     {
-//        $entity = Mage::getSingleton('eav/config')
-//            ->getEntityType('catalog_product');
-
         $setIds = $this->_getSetIds();
-        if (!$setIds) {
+        if (false === is_array($setIds) || count($setIds) === 0) {
             return array();
         }
-        /** @var $collection Mage_Catalog_Model_Resource_Product_Attribute_Collection */
-        $collection = Mage::getResourceModel('catalog/product_attribute_collection');
-        $collection
-            ->setItemObjectClass('catalog/resource_eav_attribute')
-            ->setAttributeSetFilter($setIds)
-            ->addStoreLabel(Mage::app()->getStore()->getId())
-            ->setOrder('position', 'ASC');
-        $collection = $this->_prepareAttributeCollection($collection);
-        $collection->load();
-
-        return $collection;
+        /** @var Mage_Eav_Model_Config $eavConfig */
+        $attributes = Mage::getSingleton('eav/config')->getFilterableProductAttributesUsedInSets($setIds);
+        usort($attributes, function ($attributeA, $attributeB){
+            if ((int)$attributeA->getPosition() == (int)$attributeB->getPosition()) {
+                return 0;
+            }
+            return ((int)$attributeA->getPosition() < (int)$attributeB->getPosition()) ? -1 : 1;
+        });
+        return $attributes;
     }
 
     /**

diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Media.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Backend/Media.php
@@ -270,8 +270,7 @@ protected function _getLoadGallerySelect(array $productIds, $storeId, $attribute
      */
     protected function _getAttributeId() {
         if(is_null($this->_attributeId)) {
-            $attribute = Mage::getModel('eav/entity_attribute')
-                ->loadByCode(Mage_Catalog_Model_Product::ENTITY, 'media_gallery');
+            $attribute = Mage::getSingleton('eav/config')->getAttribute(Mage_Catalog_Model_Product::ENTITY, 'media_gallery');
 
             $this->_attributeId = $attribute->getId();
         }

diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php b/app/code/core/Mage/CatalogIndex/Model/Indexer/Minimalprice.php
@@ -65,7 +65,7 @@ public function getTierPriceAttribute()
     {
         $data = $this->getData('tier_price_attribute');
         if (is_null($data)) {
-            $data = Mage::getModel('eav/entity_attribute')->loadByCode(Mage_Catalog_Model_Product::ENTITY, 'tier_price');
+            $data = Mage::getSingleton('eav/config')->getAttribute(Mage_Catalog_Model_Product::ENTITY, 'tier_price');
             $this->setData('tier_price_attribute', $data);
         }
         return $data;
@@ -75,7 +75,7 @@ public function getPriceAttribute()
     {
         $data = $this->getData('price_attribute');
         if (is_null($data)) {
-            $data = Mage::getModel('eav/entity_attribute')->loadByCode(Mage_Catalog_Model_Product::ENTITY, 'price');
+            $data = Mage::getSingleton('eav/config')->getAttribute(Mage_Catalog_Model_Product::ENTITY, 'price');
             $this->setData('price_attribute', $data);
         }
         return $data;

diff --git a/...de/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/...de/core/Mage/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
@@ -73,8 +73,7 @@ public function getPurchasedSeparatelyAttribute()
         if (is_null($this->_purchasedSeparatelyAttribute)) {
             $_attributeCode = 'links_purchased_separately';
 
-            $this->_purchasedSeparatelyAttribute = Mage::getModel('eav/entity_attribute')
-                ->loadByCode(Mage_Catalog_Model_Product::ENTITY, $_attributeCode);
+            $this->_purchasedSeparatelyAttribute = Mage::getSingleton('eav/config')->getAttribute(Mage_Catalog_Model_Product::ENTITY, $_attributeCode);
         }
 
         return $this->_purchasedSeparatelyAttribute;