MAGETWO-80789: [Indexer] Search Indexer is scoped & multi-threaded

Author: slopukhov

setup/src/Magento/Setup/Model/Installer.php

@@ -19,7 +19,6 @@
 use Magento\Framework\Config\File\ConfigFilePool;
 use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Filesystem;
-use Magento\Framework\Model\ResourceModel\Db\Context;
 use Magento\Framework\Module\ModuleList\Loader as ModuleLoader;
 use Magento\Framework\Module\ModuleListInterface;
 use Magento\Framework\Setup\FilePermissions;
@@ -173,11 +172,6 @@ class Installer
      */
     private $objectManagerProvider;
 
-    /**
-     * @var Context
-     */
-    private $context;
-
     /**
      * @var SetupConfigModel
      */
@@ -239,7 +233,6 @@ class Installer
      * @param MaintenanceMode $maintenanceMode
      * @param Filesystem $filesystem
      * @param ObjectManagerProvider $objectManagerProvider
-     * @param Context $context
      * @param SetupConfigModel $setupConfigModel
      * @param CleanupFiles $cleanupFiles
      * @param DbValidator $dbValidator
@@ -264,7 +257,6 @@ public function __construct(
         MaintenanceMode $maintenanceMode,
         Filesystem $filesystem,
         ObjectManagerProvider $objectManagerProvider,
-        Context $context,
         SetupConfigModel $setupConfigModel,
         CleanupFiles $cleanupFiles,
         DbValidator $dbValidator,
@@ -287,7 +279,6 @@ public function __construct(
         $this->installInfo[self::INFO_MESSAGE] = [];
         $this->deploymentConfig = $deploymentConfig;
         $this->objectManagerProvider = $objectManagerProvider;
-        $this->context = $context;
         $this->setupConfigModel = $setupConfigModel;
         $this->cleanupFiles = $cleanupFiles;
         $this->dbValidator = $dbValidator;

setup/src/Magento/Setup/Model/InstallerFactory.php

@@ -24,21 +24,14 @@ class InstallerFactory
      */
     protected $serviceLocator;
 
-    /**
-     * @var ResourceFactory
-     */
-    private $resourceFactory;
-
     /**
      * Constructor
      *
      * @param ServiceLocatorInterface $serviceLocator
-     * @param ResourceFactory $resourceFactory
      */
-    public function __construct(ServiceLocatorInterface $serviceLocator, ResourceFactory $resourceFactory)
+    public function __construct(ServiceLocatorInterface $serviceLocator)
     {
         $this->serviceLocator = $serviceLocator;
-        $this->resourceFactory = $resourceFactory;
         // For Setup Wizard we are using our customized error handler
         $handler = new ErrorHandler();
         set_error_handler([$handler, 'handler']);
@@ -65,11 +58,6 @@ public function create(LoggerInterface $log)
             $this->serviceLocator->get(\Magento\Framework\App\MaintenanceMode::class),
             $this->serviceLocator->get(\Magento\Framework\Filesystem::class),
             $this->serviceLocator->get(\Magento\Setup\Model\ObjectManagerProvider::class),
-            new \Magento\Framework\Model\ResourceModel\Db\Context(
-                $this->getResource(),
-                $this->serviceLocator->get(\Magento\Framework\Model\ResourceModel\Db\TransactionManager::class),
-                $this->serviceLocator->get(\Magento\Framework\Model\ResourceModel\Db\ObjectRelationProcessor::class)
-            ),
             $this->serviceLocator->get(\Magento\Setup\Model\ConfigModel::class),
             $this->serviceLocator->get(\Magento\Framework\App\State\CleanupFiles::class),
             $this->serviceLocator->get(\Magento\Setup\Validator\DbValidator::class),
@@ -80,15 +68,4 @@ public function create(LoggerInterface $log)
             $this->serviceLocator->get(\Magento\Setup\Model\PhpReadinessCheck::class)
         );
     }
-
-    /**
-     * creates Resource Factory
-     *
-     * @return Resource
-     */
-    private function getResource()
-    {
-        $deploymentConfig = $this->serviceLocator->get(\Magento\Framework\App\DeploymentConfig::class);
-        return $this->resourceFactory->create($deploymentConfig);
-    }
 }

setup/src/Magento/Setup/Test/Unit/Model/InstallerFactoryTest.php

@@ -23,12 +23,7 @@ public function testCreate()
             ->will($this->returnValueMap($this->getReturnValueMap()));
 
         $log = $this->getMockForAbstractClass(\Magento\Framework\Setup\LoggerInterface::class);
-        $resourceFactoryMock = $this->createMock(\Magento\Setup\Module\ResourceFactory::class);
-        $resourceFactoryMock
-            ->expects($this->any())
-            ->method('create')
-            ->will($this->returnValue($this->createMock(\Magento\Framework\App\ResourceConnection::class)));
-        $installerFactory = new InstallerFactory($serviceLocatorMock, $resourceFactoryMock);
+        $installerFactory = new InstallerFactory($serviceLocatorMock);
         $installer = $installerFactory->create($log);
         $this->assertInstanceOf(\Magento\Setup\Model\Installer::class, $installer);
     }

setup/src/Magento/Setup/Test/Unit/Model/InstallerTest.php

@@ -148,11 +148,6 @@ class InstallerTest extends \PHPUnit\Framework\TestCase
         ConfigOptionsListConstants::KEY_PASSWORD => '',
     ];
 
-    /**
-     * @var \Magento\Framework\Model\ResourceModel\Db\Context|\PHPUnit_Framework_MockObject_MockObject
-     */
-    private $contextMock;
-
     protected function setUp()
     {
         $this->filePermissions = $this->createMock(\Magento\Framework\Setup\FilePermissions::class);
@@ -177,8 +172,6 @@ protected function setUp()
         $this->maintenanceMode = $this->createMock(\Magento\Framework\App\MaintenanceMode::class);
         $this->filesystem = $this->createMock(\Magento\Framework\Filesystem::class);
         $this->objectManager = $this->getMockForAbstractClass(\Magento\Framework\ObjectManagerInterface::class);
-        $this->contextMock =
-            $this->createMock(\Magento\Framework\Model\ResourceModel\Db\Context::class);
         $this->configModel = $this->createMock(\Magento\Setup\Model\ConfigModel::class);
         $this->cleanupFiles = $this->createMock(\Magento\Framework\App\State\CleanupFiles::class);
         $this->dbValidator = $this->createMock(\Magento\Setup\Validator\DbValidator::class);
@@ -223,7 +216,6 @@ private function createObject($connectionFactory = false, $objectManagerProvider
             $this->maintenanceMode,
             $this->filesystem,
             $objectManagerProvider,
-            $this->contextMock,
             $this->configModel,
             $this->cleanupFiles,
             $this->dbValidator,
@@ -262,9 +254,6 @@ public function testInstall()
         $table->expects($this->any())->method('setComment')->willReturn($table);
         $table->expects($this->any())->method('addIndex')->willReturn($table);
         $connection->expects($this->any())->method('newTable')->willReturn($table);
-        $resource = $this->createMock(\Magento\Framework\App\ResourceConnection::class);
-        $this->contextMock->expects($this->any())->method('getResources')->willReturn($resource);
-        $resource->expects($this->any())->method('getConnection')->will($this->returnValue($connection));
         $dataSetup = $this->createMock(\Magento\Setup\Module\DataSetup::class);
         $cacheManager = $this->createMock(\Magento\Framework\App\Cache\Manager::class);
         $cacheManager->expects($this->any())->method('getAvailableTypes')->willReturn(['foo', 'bar']);
@@ -277,19 +266,22 @@ public function testInstall()
         $appState->expects($this->once())
             ->method('setAreaCode')
             ->with(\Magento\Framework\App\Area::AREA_GLOBAL);
-        $this->setupFactory->expects($this->atLeastOnce())->method('create')->with($resource)->willReturn($setup);
+        $moduleResource = $this->createMock(\Magento\Framework\Module\ModuleResource::class);
+        $this->setupFactory->expects($this->atLeastOnce())->method('create')->willReturn($setup);
         $this->dataSetupFactory->expects($this->atLeastOnce())->method('create')->willReturn($dataSetup);
         $this->objectManager->expects($this->any())
             ->method('create')
             ->will($this->returnValueMap([
                 [\Magento\Framework\App\Cache\Manager::class, [], $cacheManager],
                 [\Magento\Framework\App\State::class, [], $appState],
+                [\Magento\Framework\Module\ModuleResource::class, [], $moduleResource]
             ]));
         $this->objectManager->expects($this->any())
             ->method('get')
             ->will($this->returnValueMap([
                 [\Magento\Framework\App\State::class, $appState],
-                [\Magento\Framework\App\Cache\Manager::class, $cacheManager]
+                [\Magento\Framework\App\Cache\Manager::class, $cacheManager],
+                [\Magento\Framework\Module\ModuleResource::class, [], $moduleResource]
             ]));
         $this->adminFactory->expects($this->once())->method('create')->willReturn(
             $this->createMock(\Magento\Setup\Model\AdminAccount::class)