MAGETWO-48781: Low catalog performance with Swatches

Author: Oleksii Korshenko

app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php

@@ -327,7 +327,7 @@ protected function getSwatchProductImage(Product $childProduct, $imageType)
      */
     protected function isProductHasImage(Product $product, $imageType)
     {
-        return $product->getData($imageType) !== null && $product->getData($imageType) != SwatchData::EMPTY_IMAGE_VALUE;
+        return $product->getData($imageType) !== null && $product->getData($imageType) != 'no_selection';
     }
 
     /**

app/code/Magento/Swatches/Helper/Data.php

@@ -26,11 +26,6 @@
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
-    /**
-     * When we init media gallery empty image types contain this value.
-     */
-    const EMPTY_IMAGE_VALUE = 'no_selection';
-
     /**
      * Default store ID
      */
@@ -380,11 +375,11 @@ function ($value) {
      */
     public function getProductMediaGallery (Product $product)
     {
-        if (!in_array($product->getData('image'), [null, self::EMPTY_IMAGE_VALUE], true)) {
+        if (!in_array($product->getData('image'), [null, 'no_selection'], true)) {
             $baseImage = $product->getData('image');
         } else {
             $productMediaAttributes = array_filter($product->getMediaAttributeValues(), function ($value) {
-                return $value !== self::EMPTY_IMAGE_VALUE && $value !== null;
+                return $value !== 'no_selection' && $value !== null;
             });
             foreach ($productMediaAttributes as $attributeCode => $value) {
                 if ($attributeCode !== 'swatch_image') {
@@ -645,7 +640,7 @@ private function loadFirstVariation($attributeCode, ModelProduct $configurablePr
             $usedProducts = $configurableProduct->getTypeInstance()->getUsedProducts($configurableProduct);
 
             foreach ($usedProducts as $simpleProduct) {
-                if (!in_array($simpleProduct->getData($attributeCode), [null, self::EMPTY_IMAGE_VALUE], true)
+                if (!in_array($simpleProduct->getData($attributeCode), [null, 'no_selection'], true)
                     && !array_diff_assoc($requiredAttributes, $simpleProduct->getData())
                 ) {
                     return $simpleProduct;