Merge pull request #3473 from magento-performance/2.3.0-qwerty-perf

[2.3.0] Fix performance issues

Author: Igor Melnikov

app/code/Magento/Backend/Block/Page/Footer.php

@@ -40,7 +40,7 @@ public function __construct(
     }
 
     /**
-     * @return void
+     * @inheritdoc
      */
     protected function _construct()
     {
@@ -57,4 +57,12 @@ public function getMagentoVersion()
     {
         return $this->productMetadata->getVersion();
     }
+
+    /**
+     * @inheritdoc
+     */
+    protected function getCacheLifetime()
+    {
+        return 3600 * 24 * 10;
+    }
 }

app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontCatalogSearchActionGroup.xml

@@ -16,6 +16,7 @@
         <submitForm selector="#search_mini_form" parameterArray="['q' => '{{phrase}}']" stepKey="fillQuickSearch" />
         <seeInCurrentUrl url="{{StorefrontCatalogSearchPage.url}}" stepKey="checkUrl"/>
         <seeInTitle userInput="Search results for: '{{phrase}}'" stepKey="assertQuickSearchTitle"/>
+        <dontSeeInCurrentUrl url="form_key=" stepKey="checkUrlFormKey"/>
         <see userInput="Search results for: '{{phrase}}'" selector="{{StorefrontCatalogSearchMainSection.SearchTitle}}" stepKey="assertQuickSearchName"/>
     </actionGroup>
 

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

@@ -16,6 +16,7 @@
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Store\Model\Config\Processor\Fallback;
 use Magento\Store\Model\ScopeInterface as StoreScope;
+use Magento\Framework\Encryption\Encryptor;
 
 /**
  * System configuration type
@@ -70,6 +71,11 @@ class System implements ConfigTypeInterface
      */
     private $availableDataScopes;
 
+    /**
+     * @var Encryptor
+     */
+    private $encryptor;
+
     /**
      * @param ConfigSourceInterface $source
      * @param PostProcessorInterface $postProcessor
@@ -79,9 +85,11 @@ class System implements ConfigTypeInterface
      * @param PreProcessorInterface $preProcessor
      * @param int $cachingNestedLevel
      * @param string $configType
-     * @param Reader $reader
+     * @param Reader|null $reader
+     * @param Encryptor|null $encryptor
      *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         ConfigSourceInterface $source,
@@ -92,17 +100,19 @@ public function __construct(
         PreProcessorInterface $preProcessor,
         $cachingNestedLevel = 1,
         $configType = self::CONFIG_TYPE,
-        Reader $reader = null
+        Reader $reader = null,
+        Encryptor $encryptor = null
     ) {
         $this->postProcessor = $postProcessor;
         $this->cache = $cache;
         $this->serializer = $serializer;
         $this->configType = $configType;
         $this->reader = $reader ?: ObjectManager::getInstance()->get(Reader::class);
+        $this->encryptor = $encryptor ?: ObjectManager::getInstance()->get(\Magento\Framework\Encryption\Encryptor::class);
     }
 
     /**
-     * Get config value by path.
+     * Get configuration value by path
      *
      * System configuration is separated by scopes (default, websites, stores). Configuration of a scope is inherited
      * from its parent scope (store inherits website).
@@ -124,40 +134,14 @@ public function __construct(
     public function get($path = '')
     {
         if ($path === '') {
-            $this->data = array_replace_recursive($this->data, $this->loadAllData());
+            $this->data = array_replace_recursive($this->loadAllData(), $this->data);
 
             return $this->data;
         }
 
         return $this->getWithParts($path);
     }
 
-    /**
-     * Merge newly loaded config data into already loaded.
-     *
-     * @param array $newData
-     * @return void
-     */
-    private function mergeData(array $newData): void
-    {
-        if (array_key_exists(ScopeInterface::SCOPE_DEFAULT, $newData)) {
-            //Sometimes new data may contain links to arrays and we don't want that.
-            $this->data[ScopeInterface::SCOPE_DEFAULT] = (array)$newData[ScopeInterface::SCOPE_DEFAULT];
-            unset($newData[ScopeInterface::SCOPE_DEFAULT]);
-        }
-        foreach ($newData as $scopeType => $scopeTypeData) {
-            if (!array_key_exists($scopeType, $this->data)) {
-                //Sometimes new data may contain links to arrays and we don't want that.
-                $this->data[$scopeType] = (array)$scopeTypeData;
-            } else {
-                foreach ($scopeTypeData as $scopeId => $scopeData) {
-                    //Sometimes new data may contain links to arrays and we don't want that.
-                    $this->data[$scopeType][$scopeId] = (array)$scopeData;
-                }
-            }
-        }
-    }
-
     /**
      * Proceed with parts extraction from path.
      *
@@ -170,10 +154,8 @@ private function getWithParts($path)
 
         if (count($pathParts) === 1 && $pathParts[0] !== ScopeInterface::SCOPE_DEFAULT) {
             if (!isset($this->data[$pathParts[0]])) {
-                //First filling data property with unprocessed data for post-processors to be able to use.
                 $data = $this->readData();
-                //Post-processing only the data we know is not yet processed.
-                $this->mergeData($this->postProcessor->process($data));
+                $this->data = array_replace_recursive($data, $this->data);
             }
 
             return $this->data[$pathParts[0]];
@@ -183,11 +165,7 @@ private function getWithParts($path)
 
         if ($scopeType === ScopeInterface::SCOPE_DEFAULT) {
             if (!isset($this->data[$scopeType])) {
-                //Adding unprocessed data to the data property so it can be used in post-processing.
-                $this->mergeData($scopeData = $this->loadDefaultScopeData($scopeType));
-                //Only post-processing the data we know is raw.
-                $scopeData = $this->postProcessor->process($scopeData);
-                $this->mergeData($scopeData);
+                $this->data = array_replace_recursive($this->loadDefaultScopeData($scopeType), $this->data);
             }
 
             return $this->getDataByPathParts($this->data[$scopeType], $pathParts);
@@ -197,11 +175,10 @@ private function getWithParts($path)
 
         if (!isset($this->data[$scopeType][$scopeId])) {
             $scopeData = $this->loadScopeData($scopeType, $scopeId);
-            //Adding unprocessed data to the data property so it can be used in post-processing.
-            $this->mergeData($scopeData);
-            //Only post-processing the data we know is raw.
-            $scopeData = $this->postProcessor->process($scopeData);
-            $this->mergeData($scopeData);
+
+            if (!isset($this->data[$scopeType][$scopeId])) {
+                $this->data = array_replace_recursive($scopeData, $this->data);
+            }
         }
 
         return isset($this->data[$scopeType][$scopeId])
@@ -221,11 +198,10 @@ private function loadAllData()
         if ($cachedData === false) {
             $data = $this->readData();
         } else {
-            $data = $this->serializer->unserialize($cachedData);
-            $this->data = $data;
+            $data = $this->serializer->unserialize($this->encryptor->decrypt($cachedData));
         }
 
-        return $this->postProcessor->process($data);
+        return $data;
     }
 
     /**
@@ -242,7 +218,7 @@ private function loadDefaultScopeData($scopeType)
             $data = $this->readData();
             $this->cacheData($data);
         } else {
-            $data = [$scopeType => $this->serializer->unserialize($cachedData)];
+            $data = [$scopeType => $this->serializer->unserialize($this->encryptor->decrypt($cachedData))];
         }
 
         return $data;
@@ -263,7 +239,8 @@ private function loadScopeData($scopeType, $scopeId)
             if ($this->availableDataScopes === null) {
                 $cachedScopeData = $this->cache->load($this->configType . '_scopes');
                 if ($cachedScopeData !== false) {
-                    $this->availableDataScopes = $this->serializer->unserialize($cachedScopeData);
+                    $serializedCachedData = $this->encryptor->decrypt($cachedScopeData);
+                    $this->availableDataScopes = $this->serializer->unserialize($serializedCachedData);
                 }
             }
             if (is_array($this->availableDataScopes) && !isset($this->availableDataScopes[$scopeType][$scopeId])) {
@@ -272,14 +249,15 @@ private function loadScopeData($scopeType, $scopeId)
             $data = $this->readData();
             $this->cacheData($data);
         } else {
-            $data = [$scopeType => [$scopeId => $this->serializer->unserialize($cachedData)]];
+            $serializedCachedData = $this->encryptor->decrypt($cachedData);
+            $data = [$scopeType => [$scopeId => $this->serializer->unserialize($serializedCachedData)]];
         }
 
         return $data;
     }
 
     /**
-     * Cache configuration data.
+     * Cache configuration data
      *
      * Caches data per scope to avoid reading data for all scopes on every request
      *
@@ -289,12 +267,12 @@ private function loadScopeData($scopeType, $scopeId)
     private function cacheData(array $data)
     {
         $this->cache->save(
-            $this->serializer->serialize($data),
+            $this->encryptor->encryptWithFastestAvailableAlgorithm($this->serializer->serialize($data)),
             $this->configType,
             [self::CACHE_TAG]
         );
         $this->cache->save(
-            $this->serializer->serialize($data['default']),
+            $this->encryptor->encryptWithFastestAvailableAlgorithm($this->serializer->serialize($data['default'])),
             $this->configType . '_default',
             [self::CACHE_TAG]
         );
@@ -303,14 +281,14 @@ private function cacheData(array $data)
             foreach ($data[$curScopeType] ?? [] as $curScopeId => $curScopeData) {
                 $scopes[$curScopeType][$curScopeId] = 1;
                 $this->cache->save(
-                    $this->serializer->serialize($curScopeData),
+                    $this->encryptor->encryptWithFastestAvailableAlgorithm($this->serializer->serialize($curScopeData)),
                     $this->configType . '_' . $curScopeType . '_' . $curScopeId,
                     [self::CACHE_TAG]
                 );
             }
         }
         $this->cache->save(
-            $this->serializer->serialize($scopes),
+            $this->encryptor->encryptWithFastestAvailableAlgorithm($this->serializer->serialize($scopes)),
             $this->configType . '_scopes',
             [self::CACHE_TAG]
         );
@@ -346,6 +324,9 @@ private function getDataByPathParts($data, $pathParts)
     private function readData(): array
     {
         $this->data = $this->reader->read();
+        $this->data = $this->postProcessor->process(
+            $this->data
+        );
 
         return $this->data;
     }

app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Type/Configurable/Product/Collection.php

@@ -41,6 +41,7 @@ protected function _construct()
 
     /**
      * Init select
+     *
      * @return $this|\Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\Collection
      */
     protected function _initSelect()
@@ -73,9 +74,9 @@ public function setProductFilter($product)
      *
      * @return $this
      */
-    protected function _beforeLoad()
+    protected function _renderFilters()
     {
-        parent::_beforeLoad();
+        parent::_renderFilters();
         $metadata = $this->getProductEntityMetadata();
         $parentIds = [];
         foreach ($this->products as $product) {
@@ -88,8 +89,7 @@ protected function _beforeLoad()
     }
 
     /**
-     * Retrieve is flat enabled flag
-     * Return always false if magento run admin
+     * Retrieve is flat enabled flag. Return always false if magento run admin
      *
      * @return bool
      */

app/code/Magento/Variable/Model/Source/Variables.php

@@ -23,6 +23,16 @@ class Variables implements \Magento\Framework\Option\ArrayInterface
      */
     private $configVariables = [];
 
+    /**
+     * @var array
+     */
+    private $configPaths = [];
+
+    /**
+     * @var \Magento\Config\Model\Config\Structure\SearchInterface
+     */
+    private $configStructure;
+
     /**
      * Constructor.
      *
@@ -33,25 +43,8 @@ public function __construct(
         \Magento\Config\Model\Config\Structure\SearchInterface $configStructure,
         array $configPaths = []
     ) {
-        foreach ($configPaths as $groupPath => $groupElements) {
-            $groupPathElements = explode('/', $groupPath);
-            $path = [];
-            $labels = [];
-            foreach ($groupPathElements as $groupPathElement) {
-                $path[] = $groupPathElement;
-                $labels[] = __(
-                    $configStructure->getElementByConfigPath(implode('/', $path))->getLabel()
-                );
-            }
-            $this->configVariables[$groupPath]['label'] = implode(' / ', $labels);
-            foreach (array_keys($groupElements) as $elementPath) {
-                $this->configVariables[$groupPath]['elements'][] = [
-                    'value' => $elementPath,
-                    'label' => __($configStructure->getElementByConfigPath($elementPath)->getLabel()),
-                ];
-            }
-        }
-        $this->configVariables;
+        $this->configStructure = $configStructure;
+        $this->configPaths = $configPaths;
     }
 
     /**
@@ -64,7 +57,7 @@ public function toOptionArray($withGroup = false)
     {
         $optionArray = [];
         if ($withGroup) {
-            foreach ($this->configVariables as $configVariableGroup) {
+            foreach ($this->getConfigVariables() as $configVariableGroup) {
                 $group = [
                     'label' => $configVariableGroup['label']
                 ];
@@ -79,7 +72,7 @@ public function toOptionArray($withGroup = false)
                 $optionArray[] = $group;
             }
         } else {
-            foreach ($this->configVariables as $configVariableGroup) {
+            foreach ($this->getConfigVariables() as $configVariableGroup) {
                 foreach ($configVariableGroup['elements'] as $element) {
                     $optionArray[] = [
                         'value' => '{{config path="' . $element['value'] . '"}}',
@@ -110,12 +103,43 @@ public function getData()
     private function getFlatConfigVars()
     {
         $result = [];
-        foreach ($this->configVariables as $configVariableGroup) {
+        foreach ($this->getConfigVariables() as $configVariableGroup) {
             foreach ($configVariableGroup['elements'] as $element) {
                 $element['group_label'] = $configVariableGroup['label'];
                 $result[] = $element;
             }
         }
         return $result;
     }
+
+    /**
+     * Merge config with user defined data
+     *
+     * @return array
+     */
+    private function getConfigVariables()
+    {
+        if (empty($this->configVariables)) {
+            foreach ($this->configPaths as $groupPath => $groupElements) {
+                $groupPathElements = explode('/', $groupPath);
+                $path = [];
+                $labels = [];
+                foreach ($groupPathElements as $groupPathElement) {
+                    $path[] = $groupPathElement;
+                    $labels[] = __(
+                        $this->configStructure->getElementByConfigPath(implode('/', $path))->getLabel()
+                    );
+                }
+                $this->configVariables[$groupPath]['label'] = implode(' / ', $labels);
+                foreach (array_keys($groupElements) as $elementPath) {
+                    $this->configVariables[$groupPath]['elements'][] = [
+                        'value' => $elementPath,
+                        'label' => __($this->configStructure->getElementByConfigPath($elementPath)->getLabel()),
+                    ];
+                }
+            }
+        }
+
+        return $this->configVariables;
+    }
 }