MC-6273: Mysql url_rewrite select make on product view page 170+ times per request

- changes after CR

Author: vgoncharenko

app/code/Magento/Config/App/Config/Type/System.php

@@ -231,8 +231,8 @@ private function loadAllData()
         return $this->lockQuery->lockedLoadData(
             self::$lockName,
             $loadAction,
-            [$this, 'readData'],
-            [$this, 'cacheData']
+            \Closure::fromCallable([$this, 'readData']),
+            \Closure::fromCallable([$this, 'cacheData'])
         );
     }
 
@@ -256,8 +256,8 @@ private function loadDefaultScopeData($scopeType)
         return $this->lockQuery->lockedLoadData(
             self::$lockName,
             $loadAction,
-            [$this, 'readData'],
-            [$this, 'cacheData']
+            \Closure::fromCallable([$this, 'readData']),
+            \Closure::fromCallable([$this, 'cacheData'])
         );
     }
 
@@ -295,8 +295,8 @@ private function loadScopeData($scopeType, $scopeId)
         return $this->lockQuery->lockedLoadData(
             self::$lockName,
             $loadAction,
-            [$this, 'readData'],
-            [$this, 'cacheData']
+            \Closure::fromCallable([$this, 'readData']),
+            \Closure::fromCallable([$this, 'cacheData'])
         );
     }
 

lib/internal/Magento/Framework/Cache/LockGuardedCacheLoader.php

@@ -52,7 +52,13 @@ public function __construct(
     }
 
     /**
-     * @inheritdoc
+     * Load data.
+     *
+     * @param string $lockName
+     * @param callable $dataLoader
+     * @param callable $dataCollector
+     * @param callable $dataSaver
+     * @return array
      */
     public function lockedLoadData(
         string $lockName,