MCLOUD-5953: Backport Redis patches (magento#46)

Author: BaDos

patches.json

@@ -244,6 +244,14 @@
     },
     "Fix load balancer issue": {
       ">=2.3.4 <2.3.6": "MCLOUD-5837__fix_filesystem_load_balancer_issue__2.3.4.patch"
+    },
+    "Cache Locking performance issue": {
+      "2.3.3": "MDVA-27538__fix_performance_issue_in_cache_locking_mechanism__2.3.3.patch",
+      ">=2.3.3-p1 <2.3.4": "MDVA-27538__fix_performance_issue_in_cache_locking_mechanism__2.3.3-p1.patch",
+      ">=2.3.4 <2.3.5": "MDVA-26795__fix_performance_issue_in_cache_locking_mechanism__2.3.4.patch"
+    },
+    "Large amount of Keys Block Cache": {
+      ">=2.3.1 <2.3.5": "MDVA-22950__large_amount_of_keys_block_cache__2.3.1.patch"
     }
   },
   "magento/module-paypal": {

patches/MDVA-22950__large_amount_of_keys_block_cache__2.3.1.patch

@@ -0,0 +1,45 @@
+diff -Nuar a/vendor/magento/module-swatches/Block/Product/Renderer/Listing/Configurable.php b/vendor/magento/module-swatches/Block/Product/Renderer/Listing/Configurable.php
+--- a/vendor/magento/module-swatches/Block/Product/Renderer/Listing/Configurable.php
++++ b/vendor/magento/module-swatches/Block/Product/Renderer/Listing/Configurable.php
+@@ -9,7 +9,6 @@ use Magento\Catalog\Block\Product\Context;
+ use Magento\Catalog\Helper\Product as CatalogProduct;
+ use Magento\Catalog\Model\Product;
+ use Magento\Catalog\Model\Layer\Resolver;
+-use Magento\Catalog\Model\Layer\Category as CategoryLayer;
+ use Magento\ConfigurableProduct\Helper\Data;
+ use Magento\ConfigurableProduct\Model\ConfigurableAttributeData;
+ use Magento\Customer\Helper\Session\CurrentCustomer;
+@@ -244,9 +243,12 @@ class Configurable extends \Magento\Swatches\Block\Product\Renderer\Configurable
+
+         $layeredAttributes = [];
+
+-        $configurableAttributes = array_map(function ($attribute) {
+-            return $attribute->getAttributeCode();
+-        }, $configurableAttributes);
++        $configurableAttributes = array_map(
++            function ($attribute) {
++                return $attribute->getAttributeCode();
++            },
++            $configurableAttributes
++        );
+
+         $commonAttributeCodes = array_intersect(
+             $configurableAttributes,
+@@ -259,17 +261,4 @@ class Configurable extends \Magento\Swatches\Block\Product\Renderer\Configurable
+
+         return $layeredAttributes;
+     }
+-
+-    /**
+-     * @inheritdoc
+-     * @since 100.3.1
+-     */
+-    public function getCacheKeyInfo()
+-    {
+-        $cacheKeyInfo = parent::getCacheKeyInfo();
+-        /** @var CategoryLayer $catalogLayer */
+-        $catalogLayer = $this->layerResolver->get();
+-        $cacheKeyInfo[] = $catalogLayer->getStateKey();
+-        return $cacheKeyInfo;
+-    }
+ }