MAGETWO-65480: [Backport] - [Performance] Image metadata caching - for 2.1.6

Author: zakdma

app/code/Magento/Catalog/Block/Product/ImageBlockBuilder.php

@@ -8,12 +8,19 @@
 use Magento\Catalog\Model\View\Asset\ImageFactory as AssetImageFactory;
 use Magento\Framework\View\ConfigInterface;
 use Magento\Catalog\Model\Product\Image\ParamsBuilder;
+use Magento\Framework\App\CacheInterface;
+use Magento\Catalog\Model\View\Asset\Image as AssetImage;
 
 /**
  * Used to build product image blocks in product list blocks.
  */
 class ImageBlockBuilder
 {
+    /**
+     * @var string
+     */
+    private $cachePrefix = 'IMG_INFO';
+
     /**
      * @var ConfigInterface
      */
@@ -34,22 +41,52 @@ class ImageBlockBuilder
      */
     private $imageParamsBuilder;
 
+    /**
+     * @var CacheInterface
+     */
+    private $cache;
+
     /**
      * @param ConfigInterface $presentationConfig
      * @param AssetImageFactory $viewAssetImageFactory
      * @param ImageFactory $imageBlockFactory
      * @param ParamsBuilder $imageParamsBuilder
+     * @param CacheInterface $cache
      */
     public function __construct(
         ConfigInterface $presentationConfig,
         AssetImageFactory $viewAssetImageFactory,
         ImageFactory $imageBlockFactory,
-        ParamsBuilder $imageParamsBuilder
+        ParamsBuilder $imageParamsBuilder,
+        CacheInterface $cache
     ) {
         $this->presentationConfig = $presentationConfig->getViewConfig();
         $this->viewAssetImageFactory = $viewAssetImageFactory;
         $this->imageBlockFactory = $imageBlockFactory;
         $this->imageParamsBuilder = $imageParamsBuilder;
+        $this->cache = $cache;
+    }
+
+    /**
+     * Get image size
+     *
+     * @param AssetImage $imageAsset
+     * @return array
+     */
+    private function getImageSize(AssetImage $imageAsset)
+    {
+        $key = $this->cachePrefix . $imageAsset->getPath();
+        $size = $this->cache->load($key);
+        if (!$size) {
+            $size = getimagesize($imageAsset->getPath());
+            $this->cache->save(
+                serialize(['width' => $size[0], 'height' => $size[1]]),
+                $key
+            );
+        } else {
+            $size = unserialize($size);
+        }
+        return $size;
     }
 
     /**
@@ -99,10 +136,10 @@ public function buildBlock($product, $displayArea)
         $height = $image['image_height'];
 
         try {
-            $resizedInfo = getimagesize($imageAsset->getPath());
+            $resizedInfo = $this->getImageSize($imageAsset);
         } catch (\Exception $e) {
-            $resizedInfo[0] = $width;
-            $resizedInfo[1] = $height;
+            $resizedInfo['width'] = $width;
+            $resizedInfo['height'] = $height;
         }
 
         $data = [
@@ -112,9 +149,9 @@ public function buildBlock($product, $displayArea)
                 'width' => $width,
                 'height' => $height,
                 'label' => $label,
-                'ratio' =>  ($width && $height) ? $height/$width : 1,
-                'resized_image_width' => !empty($resizedInfo[0]) ? $resizedInfo[0] : $resizedInfo[0],
-                'resized_image_height' => !empty($resizedInfo[1]) ? $resizedInfo[1] : $resizedInfo[1],
+                'ratio' => ($width && $height) ? $height / $width : 1,
+                'resized_image_width' => $resizedInfo['width'],
+                'resized_image_height' => $resizedInfo['height'],
             ],
         ];
 

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

@@ -26,6 +26,11 @@
  */
 class Image extends \Magento\Framework\Model\AbstractModel
 {
+    /**
+     * @var string
+     */
+    private $cachePrefix = 'IMG_INFO';
+
     /**
      * @var int
      */
@@ -662,6 +667,7 @@ public function setWatermark(
     }
 
     /**
+     * Save image file
      * @return $this
      */
     public function saveFile()
@@ -672,9 +678,23 @@ public function saveFile()
         $filename = $this->getBaseFile() ? $this->imageAsset->getPath() : null;
         $this->getImageProcessor()->save($filename);
         $this->_coreFileStorageDatabase->saveFile($filename);
+        $this->saveImageSize();
+
         return $this;
     }
 
+    /**
+     * Save size to cache
+     * @return void
+     */
+    private function saveImageSize()
+    {
+        $this->_cacheManager->save(
+            serialize(['width' => $this->getWidth(), 'height' => $this->getHeight()]),
+            $this->cachePrefix . $this->imageAsset->getPath()
+        );
+    }
+
     /**
      * @return string
      */

app/code/Magento/Catalog/Test/Unit/Model/Product/ImageTest.php

@@ -175,12 +175,21 @@ protected function setUp()
         //Settings for backward compatible property
         $objectManagerHelper = new ObjectManagerHelper($this);
         $this->imageAsset = $this->getMockBuilder(\Magento\Framework\View\Asset\LocalInterface::class)
+            ->disableOriginalConstructor()
             ->getMockForAbstractClass();
         $objectManagerHelper->setBackwardCompatibleProperty(
             $this->image,
             'imageAsset',
             $this->imageAsset
         );
+        $cacheManager = $this->getMockBuilder(\Magento\Framework\App\CacheInterface::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $objectManagerHelper->setBackwardCompatibleProperty(
+            $this->image,
+            '_cacheManager',
+            $cacheManager
+        );
     }
 
     public function testSetGetQuality()
@@ -370,7 +379,9 @@ public function testSaveFile()
         )->disableOriginalConstructor()->getMock();
         $this->image->setImageProcessor($imageProcessor);
         $this->coreFileHelper->expects($this->once())->method('saveFile')->will($this->returnValue(true));
-
+        $this->imageAsset->expects($this->any())
+            ->method('getPath')
+            ->willReturn('specific_path');
         $this->image->saveFile();
     }