MCLOUD-6659: Update Redis L2 cache patch (magento#74)

BaDos · web-flow · commit e47d6b0de356 · 2020-08-10T12:18:37.000-05:00
diff --git a/patches.json b/patches.json
@@ -254,7 +254,8 @@
       "2.3.3": "MCLOUD-6139_MCLOUD-6211__redis_improvement_patches__2.3.3.patch",
       ">=2.3.3-p1 <2.3.4": "MCLOUD-6139_MCLOUD-6211__redis_improvement_patches__2.3.3-p1.patch",
       ">=2.3.4 <2.3.5": "MCLOUD-6139_MCLOUD-6211__redis_improvement_patches__2.3.4.patch",
-      ">=2.3.5 <2.3.6": "MCLOUD-6211__redis_improvement_patches__2.3.5.patch"
+      ">=2.3.5 <2.3.6": "MCLOUD-6211__redis_improvement_patches__2.3.5.patch",
+      ">=2.4.0 <2.4.1": "MCLOUD-6659__fix_L2_redis_cache__2.4.0.patch"
     }
   },
   "magento/module-paypal": {
diff --git a/patches/MCLOUD-6139_MCLOUD-6211__redis_improvement_patches__2.3.0.patch b/patches/MCLOUD-6139_MCLOUD-6211__redis_improvement_patches__2.3.0.patch
@@ -1798,7 +1798,7 @@ diff -Nuar a/vendor/magento/framework/Cache/Backend/RemoteSynchronizedCache.php
 +        $dataToSave = $data;
 +        $remHash = $this->loadRemoteDataVersion($id);
 +
-+        if ($remHash !== false) {
++        if ($remHash !== false && $this->getDataVersion($data) === $remHash) {
 +            $dataToSave = $this->remote->load($id);
 +        } else {
 +            $this->remote->save($data, $id, $tags, $specificLifetime);
diff --git a/patches/MCLOUD-6139_MCLOUD-6211__redis_improvement_patches__2.3.1.patch b/patches/MCLOUD-6139_MCLOUD-6211__redis_improvement_patches__2.3.1.patch
@@ -1742,7 +1742,7 @@ diff -Nuar a/vendor/magento/framework/Cache/Backend/RemoteSynchronizedCache.php
 +        $dataToSave = $data;
 +        $remHash = $this->loadRemoteDataVersion($id);
 +
-+        if ($remHash !== false) {
++        if ($remHash !== false && $this->getDataVersion($data) === $remHash) {
 +            $dataToSave = $this->remote->load($id);
 +        } else {
 +            $this->remote->save($data, $id, $tags, $specificLifetime);
diff --git a/patches/MCLOUD-6139_MCLOUD-6211__redis_improvement_patches__2.3.2.patch b/patches/MCLOUD-6139_MCLOUD-6211__redis_improvement_patches__2.3.2.patch
@@ -843,7 +843,7 @@ diff -Nuar a/vendor/magento/framework/Cache/Backend/RemoteSynchronizedCache.php
 +        $dataToSave = $data;
 +        $remHash = $this->loadRemoteDataVersion($id);
 +
-+        if ($remHash !== false) {
++        if ($remHash !== false && $this->getDataVersion($data) === $remHash) {
 +            $dataToSave = $this->remote->load($id);
 +        } else {
 +            $this->remote->save($data, $id, $tags, $specificLifetime);
diff --git a/patches/MCLOUD-6139_MCLOUD-6211__redis_improvement_patches__2.3.3-p1.patch b/patches/MCLOUD-6139_MCLOUD-6211__redis_improvement_patches__2.3.3-p1.patch
@@ -844,7 +844,7 @@ diff -Nuar a/vendor/magento/framework/Cache/Backend/RemoteSynchronizedCache.php
 +        $dataToSave = $data;
 +        $remHash = $this->loadRemoteDataVersion($id);
 +
-+        if ($remHash !== false) {
++        if ($remHash !== false && $this->getDataVersion($data) === $remHash) {
 +            $dataToSave = $this->remote->load($id);
 +        } else {
 +            $this->remote->save($data, $id, $tags, $specificLifetime);
diff --git a/patches/MCLOUD-6139_MCLOUD-6211__redis_improvement_patches__2.3.3.patch b/patches/MCLOUD-6139_MCLOUD-6211__redis_improvement_patches__2.3.3.patch
@@ -844,7 +844,7 @@ diff -Nuar a/vendor/magento/framework/Cache/Backend/RemoteSynchronizedCache.php
 +        $dataToSave = $data;
 +        $remHash = $this->loadRemoteDataVersion($id);
 +
-+        if ($remHash !== false) {
++        if ($remHash !== false && $this->getDataVersion($data) === $remHash) {
 +            $dataToSave = $this->remote->load($id);
 +        } else {
 +            $this->remote->save($data, $id, $tags, $specificLifetime);
diff --git a/patches/MCLOUD-6139_MCLOUD-6211__redis_improvement_patches__2.3.4.patch b/patches/MCLOUD-6139_MCLOUD-6211__redis_improvement_patches__2.3.4.patch
@@ -558,7 +558,7 @@ diff -Nuar a/vendor/magento/framework/Cache/Backend/RemoteSynchronizedCache.php
 +        $dataToSave = $data;
 +        $remHash = $this->loadRemoteDataVersion($id);
 +
-+        if ($remHash !== false) {
++        if ($remHash !== false && $this->getDataVersion($data) === $remHash) {
 +            $dataToSave = $this->remote->load($id);
 +        } else {
 +            $this->remote->save($data, $id, $tags, $specificLifetime);
diff --git a/patches/MCLOUD-6211__redis_improvement_patches__2.3.5.patch b/patches/MCLOUD-6211__redis_improvement_patches__2.3.5.patch
@@ -380,3 +380,15 @@ diff -Nuar a/setup/src/Magento/Setup/Model/ConfigOptionsList/PageCache.php b/set
 +        return substr(\hash('sha256', dirname(__DIR__, 6)), 0, 3) . '_';
      }
  }
+diff -Nuar a/vendor/magento/framework/Cache/Backend/RemoteSynchronizedCache.php b/vendor/magento/framework/Cache/Backend/RemoteSynchronizedCache.php
+--- a/vendor/magento/framework/Cache/Backend/RemoteSynchronizedCache.php
++++ b/vendor/magento/framework/Cache/Backend/RemoteSynchronizedCache.php
+@@ -205,7 +205,7 @@ class RemoteSynchronizedCache extends \Zend_Cache_Backend implements \Zend_Cache
+         $dataToSave = $data;
+         $remHash = $this->loadRemoteDataVersion($id);
+
+-        if ($remHash !== false) {
++        if ($remHash !== false && $this->getDataVersion($data) === $remHash) {
+             $dataToSave = $this->remote->load($id);
+         } else {
+             $this->remote->save($data, $id, $tags, $specificLifetime);
diff --git a/patches/MCLOUD-6659__fix_L2_redis_cache__2.4.0.patch b/patches/MCLOUD-6659__fix_L2_redis_cache__2.4.0.patch
@@ -0,0 +1,12 @@
+diff -Nuar a/vendor/magento/framework/Cache/Backend/RemoteSynchronizedCache.php b/vendor/magento/framework/Cache/Backend/RemoteSynchronizedCache.php
+--- a/vendor/magento/framework/Cache/Backend/RemoteSynchronizedCache.php
++++ b/vendor/magento/framework/Cache/Backend/RemoteSynchronizedCache.php
+@@ -205,7 +205,7 @@ class RemoteSynchronizedCache extends \Zend_Cache_Backend implements \Zend_Cache
+         $dataToSave = $data;
+         $remHash = $this->loadRemoteDataVersion($id);
+
+-        if ($remHash !== false) {
++        if ($remHash !== false && $this->getDataVersion($data) === $remHash) {
+             $dataToSave = $this->remote->load($id);
+         } else {
+             $this->remote->save($data, $id, $tags, $specificLifetime);
diff --git a/src/Test/Functional/Acceptance/AcceptanceCest.php b/src/Test/Functional/Acceptance/AcceptanceCest.php
@@ -8,7 +8,7 @@
 namespace Magento\CloudPatches\Test\Functional\Acceptance;
 
 /**
- * @group php73
+ * @group php74
  */
 class AcceptanceCest extends AbstractCest
 {

Original file line number	Diff line number	Diff line change
`@@ -1798,7 +1798,7 @@ diff -Nuar a/vendor/magento/framework/Cache/Backend/RemoteSynchronizedCache.php`
`1798`	`1798`	`+ $dataToSave = $data;`
`1799`	`1799`	`+ $remHash = $this->loadRemoteDataVersion($id);`
`1800`	`1800`	`+`
`1801`		`-+ if ($remHash !== false) {`
	`1801`	`++ if ($remHash !== false && $this->getDataVersion($data) === $remHash) {`
`1802`	`1802`	`+ $dataToSave = $this->remote->load($id);`
`1803`	`1803`	`+ } else {`
`1804`	`1804`	`+ $this->remote->save($data, $id, $tags, $specificLifetime);`
Original file line number	Diff line number	Diff line change
`@@ -1742,7 +1742,7 @@ diff -Nuar a/vendor/magento/framework/Cache/Backend/RemoteSynchronizedCache.php`
`1742`	`1742`	`+ $dataToSave = $data;`
`1743`	`1743`	`+ $remHash = $this->loadRemoteDataVersion($id);`
`1744`	`1744`	`+`
`1745`		`-+ if ($remHash !== false) {`
	`1745`	`++ if ($remHash !== false && $this->getDataVersion($data) === $remHash) {`
`1746`	`1746`	`+ $dataToSave = $this->remote->load($id);`
`1747`	`1747`	`+ } else {`
`1748`	`1748`	`+ $this->remote->save($data, $id, $tags, $specificLifetime);`
Original file line number	Diff line number	Diff line change
`@@ -843,7 +843,7 @@ diff -Nuar a/vendor/magento/framework/Cache/Backend/RemoteSynchronizedCache.php`
`843`	`843`	`+ $dataToSave = $data;`
`844`	`844`	`+ $remHash = $this->loadRemoteDataVersion($id);`
`845`	`845`	`+`
`846`		`-+ if ($remHash !== false) {`
	`846`	`++ if ($remHash !== false && $this->getDataVersion($data) === $remHash) {`
`847`	`847`	`+ $dataToSave = $this->remote->load($id);`
`848`	`848`	`+ } else {`
`849`	`849`	`+ $this->remote->save($data, $id, $tags, $specificLifetime);`
Original file line number	Diff line number	Diff line change
`@@ -844,7 +844,7 @@ diff -Nuar a/vendor/magento/framework/Cache/Backend/RemoteSynchronizedCache.php`
`844`	`844`	`+ $dataToSave = $data;`
`845`	`845`	`+ $remHash = $this->loadRemoteDataVersion($id);`
`846`	`846`	`+`
`847`		`-+ if ($remHash !== false) {`
	`847`	`++ if ($remHash !== false && $this->getDataVersion($data) === $remHash) {`
`848`	`848`	`+ $dataToSave = $this->remote->load($id);`
`849`	`849`	`+ } else {`
`850`	`850`	`+ $this->remote->save($data, $id, $tags, $specificLifetime);`
Original file line number	Diff line number	Diff line change
`@@ -558,7 +558,7 @@ diff -Nuar a/vendor/magento/framework/Cache/Backend/RemoteSynchronizedCache.php`
`558`	`558`	`+ $dataToSave = $data;`
`559`	`559`	`+ $remHash = $this->loadRemoteDataVersion($id);`
`560`	`560`	`+`
`561`		`-+ if ($remHash !== false) {`
	`561`	`++ if ($remHash !== false && $this->getDataVersion($data) === $remHash) {`
`562`	`562`	`+ $dataToSave = $this->remote->load($id);`
`563`	`563`	`+ } else {`
`564`	`564`	`+ $this->remote->save($data, $id, $tags, $specificLifetime);`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`namespace Magento\CloudPatches\Test\Functional\Acceptance;`
`9`	`9`
`10`	`10`	`/**`
`11`		`- * @group php73`
	`11`	`+ * @group php74`
`12`	`12`	`*/`
`13`	`13`	`class AcceptanceCest extends AbstractCest`
`14`	`14`	`{`