Merge branch 'develop' of https://github.com/magento-performance/magento2ce into MAGETWO-69130

Author: AVoskoboinikov

app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php

@@ -44,99 +44,6 @@ class Collection extends \Magento\Catalog\Model\ResourceModel\Product\Collection
      */
     private $websiteScopePriceJoined = false;
 
-    /**
-     * @var \Magento\Indexer\Model\ResourceModel\FrontendResource
-     */
-    private $indexerStockFrontendResource;
-
-    /**
-     * Collection constructor.
-     * @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
-     * @param \Psr\Log\LoggerInterface $logger
-     * @param \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy
-     * @param \Magento\Framework\Event\ManagerInterface $eventManager
-     * @param \Magento\Eav\Model\Config $eavConfig
-     * @param \Magento\Framework\App\ResourceConnection $resource
-     * @param \Magento\Eav\Model\EntityFactory $eavEntityFactory
-     * @param \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper
-     * @param \Magento\Framework\Validator\UniversalFactory $universalFactory
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Framework\Module\Manager $moduleManager
-     * @param \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Catalog\Model\Product\OptionFactory $productOptionFactory
-     * @param \Magento\Catalog\Model\ResourceModel\Url $catalogUrl
-     * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
-     * @param \Magento\Customer\Model\Session $customerSession
-     * @param \Magento\Framework\Stdlib\DateTime $dateTime
-     * @param GroupManagementInterface $groupManagement
-     * @param \Magento\Framework\DB\Adapter\AdapterInterface|null $connection
-     * @param ProductLimitationFactory|null $productLimitationFactory
-     * @param MetadataPool|null $metadataPool
-     * @param \Magento\Indexer\Model\ResourceModel\FrontendResource|null $indexerFrontendResource
-     * @param \Magento\Indexer\Model\ResourceModel\FrontendResource|null $categoryProductIndexerFrontend
-     * @param \Magento\Indexer\Model\ResourceModel\FrontendResource|null $indexerStockFrontendResource
-     *
-     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
-     * @SuppressWarnings(Magento.TypeDuplication)
-     */
-    public function __construct(
-        \Magento\Framework\Data\Collection\EntityFactory $entityFactory,
-        \Psr\Log\LoggerInterface $logger,
-        \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
-        \Magento\Framework\Event\ManagerInterface $eventManager,
-        \Magento\Eav\Model\Config $eavConfig,
-        \Magento\Framework\App\ResourceConnection $resource,
-        \Magento\Eav\Model\EntityFactory $eavEntityFactory,
-        \Magento\Catalog\Model\ResourceModel\Helper $resourceHelper,
-        \Magento\Framework\Validator\UniversalFactory $universalFactory,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Framework\Module\Manager $moduleManager,
-        \Magento\Catalog\Model\Indexer\Product\Flat\State $catalogProductFlatState,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Catalog\Model\Product\OptionFactory $productOptionFactory,
-        \Magento\Catalog\Model\ResourceModel\Url $catalogUrl,
-        \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
-        \Magento\Customer\Model\Session $customerSession,
-        \Magento\Framework\Stdlib\DateTime $dateTime,
-        GroupManagementInterface $groupManagement,
-        \Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
-        ProductLimitationFactory $productLimitationFactory = null,
-        MetadataPool $metadataPool = null,
-        \Magento\Indexer\Model\ResourceModel\FrontendResource $indexerFrontendResource = null,
-        \Magento\Indexer\Model\ResourceModel\FrontendResource $categoryProductIndexerFrontend = null,
-        \Magento\Indexer\Model\ResourceModel\FrontendResource $indexerStockFrontendResource = null
-    ) {
-        parent::__construct(
-            $entityFactory,
-            $logger,
-            $fetchStrategy,
-            $eventManager,
-            $eavConfig,
-            $resource,
-            $eavEntityFactory,
-            $resourceHelper,
-            $universalFactory,
-            $storeManager,
-            $moduleManager,
-            $catalogProductFlatState,
-            $scopeConfig,
-            $productOptionFactory,
-            $catalogUrl,
-            $localeDate,
-            $customerSession,
-            $dateTime,
-            $groupManagement,
-            $connection,
-            $productLimitationFactory,
-            $metadataPool,
-            $indexerFrontendResource,
-            $categoryProductIndexerFrontend
-        );
-        $this->indexerStockFrontendResource = $indexerStockFrontendResource ?: ObjectManager::getInstance()
-            ->get(\Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\FrontendResource::class);
-    }
-
     /**
      * Initialize collection
      *
@@ -261,7 +168,7 @@ public function addQuantityFilter()
     {
         $this->getSelect()
             ->joinInner(
-                ['stock' => $this->indexerStockFrontendResource->getMainTable()],
+                ['stock' => $this->getTable('cataloginventory_stock_status')],
                 'selection.product_id = stock.product_id',
                 []
             )

app/code/Magento/Bundle/Test/Unit/Model/ResourceModel/Selection/CollectionTest.php

@@ -6,7 +6,6 @@
 namespace Magento\Bundle\Test\Unit\Model\ResourceModel\Selection;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Indexer\Model\ResourceModel\FrontendResource;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Store\Api\Data\StoreInterface;
 use Magento\Framework\Validator\UniversalFactory;
@@ -17,15 +16,9 @@
 
 /**
  * Class CollectionTest.
- * Unit test for \Magento\Indexer\Model\ResourceModel\FrontendResource.
  */
 class CollectionTest extends \PHPUnit_Framework_TestCase
 {
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    private $frontendResource;
-
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
@@ -64,9 +57,6 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $objectManager = new ObjectManager($this);
-        $this->frontendResource = $this->getMockBuilder(FrontendResource::class)
-            ->disableOriginalConstructor()
-            ->getMock();
         $this->storeManager = $this->getMockBuilder(StoreManagerInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -114,17 +104,16 @@ protected function setUp()
             [
                 'storeManager' => $this->storeManager,
                 'universalFactory' => $this->universalFactory,
-                'productLimitationFactory' => $factory,
-                'indexerStockFrontendResource' => $this->frontendResource
+                'productLimitationFactory' => $factory
             ]
         );
     }
 
     public function testAddQuantityFilter()
     {
         $tableName = 'cataloginventory_stock_status';
-        $this->frontendResource->expects($this->once())
-            ->method('getMainTable')
+        $this->entity->expects($this->once())
+            ->method('getTable')
             ->willReturn($tableName);
         $this->select->expects($this->once())
             ->method('joinInner')

app/code/Magento/Bundle/composer.json

@@ -18,8 +18,7 @@
         "magento/framework": "100.2.*",
         "magento/module-quote": "100.2.*",
         "magento/module-media-storage": "100.2.*",
-        "magento/module-ui": "100.2.*",
-        "magento/module-indexer": "100.2.*"
+        "magento/module-ui": "100.2.*"
     },
     "suggest": {
         "magento/module-webapi": "100.2.*",

app/code/Magento/Bundle/etc/di.xml

@@ -155,19 +155,9 @@
     </type>
     <type name="Magento\CatalogInventory\Model\Indexer\Stock\Action\Full">
         <arguments>
-            <argument name="memoryTablesMinRows" xsi:type="array">
+            <argument name="batchRowsCount" xsi:type="array">
                 <item name="bundle" xsi:type="number">136</item>
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Bundle\Model\ResourceModel\Selection\Collection">
-        <arguments>
-            <argument name="indexerStockFrontendResource" xsi:type="object">Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\FrontendResource</argument>
-        </arguments>
-    </type>
-    <type name="Magento\Bundle\Model\ResourceModel\Indexer\Stock">
-        <arguments>
-            <argument name="indexerStockFrontendResource" xsi:type="object">Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\FrontendResource</argument>
-        </arguments>
-    </type>
 </config>

app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php

@@ -11,7 +11,6 @@
 use Magento\Framework\DB\Query\Generator as QueryGenerator;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\EntityManager\MetadataPool;
-use Magento\Catalog\Model\ResourceModel\Product\Indexer\Category\Product\FrontendResource as CategoryProductFrontend;
 
 /**
  * Class AbstractAction
@@ -112,33 +111,24 @@ abstract class AbstractAction
      */
     private $queryGenerator;
 
-    /**
-     * @var \Magento\Indexer\Model\ResourceModel\FrontendResource|null
-     */
-    private $categoryProductIndexerFrontend;
-
     /**
      * @param ResourceConnection $resource
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Model\Config $config
      * @param QueryGenerator $queryGenerator
-     * @param \Magento\Indexer\Model\ResourceModel\FrontendResource|null $categoryProductIndexerFrontend
      */
     public function __construct(
         \Magento\Framework\App\ResourceConnection $resource,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Model\Config $config,
-        QueryGenerator $queryGenerator = null,
-        \Magento\Indexer\Model\ResourceModel\FrontendResource $categoryProductIndexerFrontend = null
+        QueryGenerator $queryGenerator = null
     ) {
         $this->resource = $resource;
         $this->connection = $resource->getConnection();
         $this->storeManager = $storeManager;
         $this->config = $config;
         $this->queryGenerator = $queryGenerator ?: \Magento\Framework\App\ObjectManager::getInstance()
             ->get(QueryGenerator::class);
-        $this->categoryProductIndexerFrontend = $categoryProductIndexerFrontend
-            ?: \Magento\Framework\App\ObjectManager::getInstance()->get(CategoryProductFrontend::class);
     }
 
     /**
@@ -185,7 +175,7 @@ protected function getTable($table)
      */
     protected function getMainTable()
     {
-        return $this->categoryProductIndexerFrontend->getMainTable();
+        return $this->getTable(self::MAIN_INDEX_TABLE);
     }
 
     /**

app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Catalog\Model\Indexer\Category\Product\Action;
 
+use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
 use Magento\Framework\DB\Query\Generator as QueryGenerator;
 use Magento\Framework\App\ResourceConnection;
 
@@ -26,11 +27,6 @@ class Full extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractActio
      */
     private $batchProvider;
 
-    /**
-     * @var \Magento\Indexer\Model\Indexer\StateFactory
-     */
-    private $indexerStateFactory;
-
     /**
      * @var \Magento\Framework\EntityManager\MetadataPool
      */
@@ -43,6 +39,11 @@ class Full extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractActio
      */
     private $batchRowsCount;
 
+    /**
+     * @var ActiveTableSwitcher
+     */
+    private $activeTableSwitcher;
+
     /**
      * @param ResourceConnection $resource
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -53,6 +54,7 @@ class Full extends \Magento\Catalog\Model\Indexer\Category\Product\AbstractActio
      * @param \Magento\Framework\EntityManager\MetadataPool|null $metadataPool
      * @param \Magento\Indexer\Model\Indexer\StateFactory|null $stateFactory
      * @param int|null $batchRowsCount
+     * @param ActiveTableSwitcher|null $activeTableSwitcher
      */
     public function __construct(
         \Magento\Framework\App\ResourceConnection $resource,
@@ -62,8 +64,8 @@ public function __construct(
         \Magento\Framework\Indexer\BatchSizeManagementInterface $batchSizeManagement = null,
         \Magento\Framework\Indexer\BatchProviderInterface $batchProvider = null,
         \Magento\Framework\EntityManager\MetadataPool $metadataPool = null,
-        \Magento\Indexer\Model\Indexer\StateFactory $stateFactory = null,
-        $batchRowsCount = null
+        $batchRowsCount = null,
+        ActiveTableSwitcher $activeTableSwitcher = null
     ) {
         parent::__construct(
             $resource,
@@ -81,10 +83,8 @@ public function __construct(
         $this->metadataPool = $metadataPool ?: $objectManager->get(
             \Magento\Framework\EntityManager\MetadataPool::class
         );
-        $this->indexerStateFactory = $stateFactory ?: $objectManager->get(
-            \Magento\Indexer\Model\Indexer\StateFactory::class
-        );
         $this->batchRowsCount = $batchRowsCount;
+        $this->activeTableSwitcher = $activeTableSwitcher ?: $objectManager->get(ActiveTableSwitcher::class);
     }
 
     /**
@@ -95,7 +95,7 @@ public function __construct(
     public function execute()
     {
         $this->reindex();
-
+        $this->activeTableSwitcher->switchTable($this->connection, $this->getMainTable());
         return $this;
     }
 
@@ -143,13 +143,13 @@ protected function removeUnnecessaryData()
     protected function publishData()
     {
         $select = $this->connection->select()->from($this->getMainTmpTable());
-
         $columns = array_keys($this->connection->describeTable($this->getMainTable()));
+        $tableName = $this->activeTableSwitcher->getAdditionalTableName($this->getMainTable());
 
         $this->connection->query(
             $this->connection->insertFromSelect(
                 $select,
-                $this->getMainTable(),
+                $tableName,
                 $columns,
                 \Magento\Framework\DB\Adapter\AdapterInterface::INSERT_ON_DUPLICATE
             )
@@ -236,24 +236,4 @@ private function reindexCategoriesBySelect(\Magento\Framework\DB\Select $basicSe
             $this->removeUnnecessaryData();
         }
     }
-
-    /**
-     * This overridden method returns ALTERNATIVE table name to work with.
-     *
-     * When the table used on frontend is 'catalog_category_product_index' this indexer should work
-     * with 'catalog_category_product_index_replica' and vice versa.
-     *
-     * @return string table name which is NOT used on frontend
-     */
-    protected function getMainTable()
-    {
-        $table = $this->getTable(self::MAIN_INDEX_TABLE);
-        $indexerState = $this->indexerStateFactory->create()->loadByIndexer(
-            \Magento\Catalog\Model\Indexer\Category\Product::INDEXER_ID
-        );
-        $destinationTableSuffix = ($indexerState->getTableSuffix() === '')
-            ? \Magento\Framework\Indexer\StateInterface::ADDITIONAL_TABLE_SUFFIX
-            : '';
-        return $table . $destinationTableSuffix;
-    }
 }