MAGETWO-93671: [Forwardport] Implement parallelization for Search Indexer

Author: slopukhov

app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php

@@ -10,6 +10,7 @@
 use Magento\CatalogSearch\Model\ResourceModel\Fulltext as FulltextResource;
 use Magento\Framework\Indexer\Dimension\DimensionProviderInterface;
 use Magento\Store\Model\StoreDimensionProvider;
+use Magento\Indexer\Model\ProcessManager;
 
 /**
  * Provide functionality for Fulltext Search indexing.
@@ -62,14 +63,20 @@ class Fulltext implements
      */
     private $dimensionProvider;
 
+    /**
+     * @var ProcessManager
+     */
+    private $processManager;
+
     /**
      * @param FullFactory $fullActionFactory
      * @param IndexerHandlerFactory $indexerHandlerFactory
      * @param FulltextResource $fulltextResource
-     * @param array $data
      * @param IndexSwitcherInterface $indexSwitcher
      * @param StateFactory $indexScopeStateFactory
      * @param DimensionProviderInterface $dimensionProvider
+     * @param ProcessManager $processManager
+     * @param array $data
      */
     public function __construct(
         FullFactory $fullActionFactory,
@@ -78,6 +85,7 @@ public function __construct(
         IndexSwitcherInterface $indexSwitcher,
         StateFactory $indexScopeStateFactory,
         DimensionProviderInterface $dimensionProvider,
+        ProcessManager $processManager,
         array $data
     ) {
         $this->fullAction = $fullActionFactory->create(['data' => $data]);
@@ -87,6 +95,7 @@ public function __construct(
         $this->indexSwitcher = $indexSwitcher;
         $this->indexScopeState = $indexScopeStateFactory->create();
         $this->dimensionProvider = $dimensionProvider;
+        $this->processManager = $processManager;
     }
 
     /**
@@ -145,9 +154,13 @@ public function executeByDimension(array $dimensions, \Traversable $entityIds =
      */
     public function executeFull()
     {
+        $userFunctions = [];
         foreach ($this->dimensionProvider->getIterator() as $dimension) {
-            $this->executeByDimension($dimension);
+            $userFunctions[] = function () use ($dimension) {
+                $this->executeByDimension($dimension);
+            };
         }
+        $this->processManager->execute($userFunctions);
     }
 
     /**

app/code/Magento/CatalogSearch/Test/Unit/Model/Indexer/FulltextTest.php

@@ -44,6 +44,11 @@ class FulltextTest extends \PHPUnit\Framework\TestCase
      */
     private $dimensionProviderMock;
 
+    /**
+     * @var \Magento\Indexer\Model\ProcessManager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $processManager;
+
     protected function setUp()
     {
         $this->fullAction = $this->getClassMock(\Magento\CatalogSearch\Model\Indexer\Fulltext\Action\Full::class);
@@ -70,6 +75,11 @@ protected function setUp()
         $stateMock = $this->getMockBuilder(\Magento\CatalogSearch\Model\Indexer\Scope\State::class)
             ->getMock();
         $objectManagerHelper = new ObjectManagerHelper($this);
+
+        $this->processManager = new \Magento\Indexer\Model\ProcessManager(
+            $this->getClassMock(\Magento\Framework\App\ResourceConnection::class)
+        );
+
         $this->model = $objectManagerHelper->getObject(
             \Magento\CatalogSearch\Model\Indexer\Fulltext::class,
             [
@@ -80,6 +90,7 @@ protected function setUp()
                 'indexSwitcher' => $this->indexSwitcher,
                 'dimensionProvider' => $this->dimensionProviderMock,
                 'indexScopeState' => $stateMock,
+                'processManager' => $this->processManager,
             ]
         );
     }

app/code/Magento/CatalogSearch/composer.json

@@ -9,6 +9,7 @@
         "magento/framework": "*",
         "magento/module-backend": "*",
         "magento/module-catalog": "*",
+        "magento/module-indexer": "100.2.*",
         "magento/module-catalog-inventory": "*",
         "magento/module-customer": "*",
         "magento/module-directory": "*",

app/code/Magento/CatalogSearch/etc/module.xml

@@ -10,6 +10,7 @@
         <sequence>
             <module name="Magento_Search"/>
             <module name="Magento_Catalog"/>
+            <module name="Magento_Indexer"/>
             <module name="Magento_CatalogRule" />
             <module name="Magento_CatalogInventory" />
         </sequence>