MAGETWO-69515: Static files are deployed too slow for multiple locales

Author: Karpenko, Oleksandr

app/code/Magento/Deploy/Package/Processor/PreProcessor/Less.php

@@ -127,23 +127,34 @@ private function hasOverrides(PackageFile $parentFile, Package $package)
             $parentFile->getPackage()->getPath(),
             $parentFile->getExtension()
         );
-        $parentFiles = $this->collectFileMap($parentFile->getFileName(), $map);
-        $currentPackageLessFiles = $package->getFilesByType('less');
-        $currentPackageCssFiles = $package->getFilesByType('css');
         /** @var PackageFile[] $currentPackageFiles */
-        $currentPackageFiles = array_merge($currentPackageLessFiles, $currentPackageCssFiles);
+        $currentPackageFiles = array_merge($package->getFilesByType('less'), $package->getFilesByType('css'));
 
         foreach ($currentPackageFiles as $file) {
-            if (in_array($file->getDeployedFileName(), $parentFiles)) {
+            if ($this->inParentFiles($file->getDeployedFileName(), $parentFile->getFileName(), $map)) {
                 return true;
             }
         }
+        return false;
+    }
 
-        $intersections = array_intersect($parentFiles, array_keys($currentPackageFiles));
-        if ($intersections) {
-            return true;
+    /**
+     * @param string  $fileName
+     * @param string  $parentFile
+     * @param array $map
+     * @return bool
+     */
+    private function inParentFiles($fileName, $parentFile, $map)
+    {
+        if (isset($map[$parentFile])) {
+            if (in_array($fileName, $map[$parentFile])) {
+                return true;
+            } else {
+                foreach ($map[$parentFile] as $pFile) {
+                    return $this->inParentFiles($fileName, $pFile, $map);
+                }
+            }
         }
-
         return false;
     }
 
@@ -186,25 +197,6 @@ private function buildMap($filePath, $packagePath, $contentType)
         return $this->map;
     }
 
-    /**
-     * Flatten map tree into simple array
-     *
-     * Original map file information structure in form of tree,
-     * and to have checking of overridden files simpler we need to flatten that tree
-     *
-     * @param string $fileName
-     * @param array $map
-     * @return array
-     */
-    private function collectFileMap($fileName, array $map)
-    {
-        $result = isset($map[$fileName]) ? $map[$fileName] : [];
-        foreach ($result as $fName) {
-            $result = array_merge($result, $this->collectFileMap($fName, $map));
-        }
-        return array_unique($result);
-    }
-
     /**
      * Return normalized path
      *

app/code/Magento/Deploy/Process/Queue.php

@@ -187,24 +187,15 @@ private function assertAndExecute($name, array & $packages, array $packageJob)
     {
         /** @var Package $package */
         $package = $packageJob['package'];
-        $parentPackagesDeployed = true;
         if ($package->getParent() && $package->getParent() !== $package) {
-            if (!$this->isDeployed($package->getParent())) {
-                $parentPackagesDeployed = false;
-            } else {
-                $dependencies = $packageJob['dependencies'];
-                foreach ($dependencies as $parentPackage) {
-                    if (!$this->isDeployed($parentPackage)) {
-                        $parentPackagesDeployed = false;
-                        break;
-                    }
+            foreach ($packageJob['dependencies'] as $dependencyName => $dependency) {
+                if (!$this->isDeployed($dependency)) {
+                    $this->assertAndExecute($dependencyName, $packages, $packages[$dependencyName]);
                 }
             }
         }
-        if (
-            $parentPackagesDeployed
-            && ($this->maxProcesses < 2 || (count($this->inProgress) < $this->maxProcesses))
-        ) {
+        if (!$this->isDeployed($package)
+            && ($this->maxProcesses < 2 || (count($this->inProgress) < $this->maxProcesses))) {
             unset($packages[$name]);
             $this->execute($package);
         }