MAGETWO-69130: Non effective query for catalog search & layered navigation

Author: AVoskoboinikov

app/code/Magento/Bundle/Model/ResourceModel/Indexer/Stock.php

@@ -16,9 +16,9 @@
 class Stock extends \Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\DefaultStock
 {
     /**
-     * @var \Magento\Indexer\Model\ResourceModel\FrontendResource
+     * @var \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher
      */
-    private $indexerStockFrontendResource;
+    private $activeTableSwitcher;
 
     /**
      * @var \Magento\Bundle\Model\ResourceModel\Indexer\StockStatusSelectBuilder
@@ -37,27 +37,25 @@ class Stock extends \Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\
      * @param \Magento\Framework\Indexer\Table\StrategyInterface $tableStrategy
      * @param \Magento\Eav\Model\Config $eavConfig
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param string $connectionName
-     * @param null|\Magento\Indexer\Model\Indexer\StateFactory $stateFactory
-     * @param null|\Magento\Indexer\Model\ResourceModel\FrontendResource $indexerStockFrontendResource
-     * @param null|StockStatusSelectBuilder $stockStatusSelectBuilder
-     * @param null|BundleOptionStockDataSelectBuilder $bundleOptionStockDataSelectBuilder
+     * @param null $connectionName
+     * @param \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher|null $activeTableSwitcher
+     * @param StockStatusSelectBuilder|null $stockStatusSelectBuilder
+     * @param BundleOptionStockDataSelectBuilder|null $bundleOptionStockDataSelectBuilder
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
         \Magento\Framework\Indexer\Table\StrategyInterface $tableStrategy,
         \Magento\Eav\Model\Config $eavConfig,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         $connectionName = null,
-        \Magento\Indexer\Model\Indexer\StateFactory $stateFactory = null,
-        \Magento\Indexer\Model\ResourceModel\FrontendResource $indexerStockFrontendResource = null,
+        \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher $activeTableSwitcher = null,
         StockStatusSelectBuilder $stockStatusSelectBuilder = null,
         BundleOptionStockDataSelectBuilder $bundleOptionStockDataSelectBuilder = null
     ) {
-        parent::__construct($context, $tableStrategy, $eavConfig, $scopeConfig, $connectionName, $stateFactory);
+        parent::__construct($context, $tableStrategy, $eavConfig, $scopeConfig, $connectionName);
 
-        $this->indexerStockFrontendResource = $indexerStockFrontendResource ?: ObjectManager::getInstance()
-            ->get(\Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\FrontendResource::class);
+        $this->activeTableSwitcher = $activeTableSwitcher ?: ObjectManager::getInstance()
+            ->get(\Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher::class);
 
         $this->stockStatusSelectBuilder = $stockStatusSelectBuilder ?: ObjectManager::getInstance()
             ->get(StockStatusSelectBuilder::class);
@@ -88,8 +86,8 @@ protected function _prepareBundleOptionStockData($entityIds = null, $usePrimaryT
         $this->_cleanBundleOptionStockData();
         $connection = $this->getConnection();
         $table = $this->getActionType() === Full::ACTION_TYPE
-            ? $this->getMainTable()
-            : $this->indexerStockFrontendResource->getMainTable();
+            ? $this->activeTableSwitcher->getAdditionalTableName($this->getMainTable())
+            : $this->getMainTable();
         $idxTable = $usePrimaryTable ? $table : $this->getIdxTable();
         $select = $this->bundleOptionStockDataSelectBuilder->buildSelect($idxTable);
 

app/code/Magento/CatalogInventory/Model/Indexer/Stock/AbstractAction.php

@@ -219,34 +219,6 @@ protected function _deleteOldRelations($tableName)
         $this->_getConnection()->query($sql);
     }
 
-    /**
-     * Delete records by their ids from index table
-     * Used to clean table before re-indexation
-     *
-     * @param array $ids
-     * @return void
-     */
-    protected function _deleteOldRecords(array $ids)
-    {
-        if (count($ids) !== 0) {
-            $this->_getConnection()->delete(
-                $this->indexerStockFrontendResource->getMainTable(),
-                ['product_id in (?)' => $ids]
-            );
-        }
-    }
-
-    /**
-     * Delete all records from index table
-     * Used to clean table before re-indexation
-     *
-     * @return void
-     */
-    protected function _cleanMainTable()
-    {
-        $this->_getConnection()->truncateTable($this->indexerStockFrontendResource->getMainTable());
-    }
-
     /**
      * Refresh entities index
      *
@@ -285,9 +257,6 @@ private function doReindex($productIds = [])
             ->where('entity_id IN(?)', $processIds);
         $pairs = $connection->fetchPairs($select);
 
-        // delete current records from index
-        $this->_deleteOldRecords($processIds);
-
         $byType = [];
         foreach ($pairs as $productId => $typeId) {
             $byType[$typeId][$productId] = $productId;

app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Full.php

@@ -20,6 +20,7 @@
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\CatalogInventory\Model\Indexer\Stock\AbstractAction;
+use Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\StockInterface;
 
 /**
  * Class Full reindex action
@@ -117,7 +118,7 @@ public function execute($ids = null)
     {
         try {
             $this->useIdxTable(false);
-            $this->_cleanMainTable();
+            $this->cleanIndexersTables($this->_getTypeIndexers());
 
             $entityMetadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class);
 
@@ -163,4 +164,26 @@ public function execute($ids = null)
             throw new LocalizedException(__($e->getMessage()), $e);
         }
     }
+
+    /**
+     * Delete all records from index table
+     * Used to clean table before re-indexation
+     *
+     * @return void
+     */
+    private function cleanIndexersTables(array $indexers)
+    {
+        $tables = array_map(
+            function(StockInterface $indexer) {
+                return $this->activeTableSwitcher->getAdditionalTableName($indexer->getMainTable());
+            },
+            $indexers
+        );
+
+        $tables = array_unique($tables);
+
+        foreach ($tables as $table) {
+            $this->_getConnection()->truncateTable($table);
+        }
+    }
 }

app/code/Magento/CatalogInventory/Model/ResourceModel/Indexer/Stock/DefaultStock.php

@@ -305,11 +305,28 @@ protected function _updateIndex($entityIds)
                 $data = [];
             }
         }
+
+        $this->deleteOldRecords($entityIds);
         $this->_updateIndexTable($data);
 
         return $this;
     }
 
+    /**
+     * Delete records by their ids from index table
+     * Used to clean table before re-indexation
+     *
+     * @param array $ids
+     * @return void
+     * @throws LocalizedException
+     */
+    private function deleteOldRecords(array $ids)
+    {
+        if (count($ids) !== 0) {
+            $this->getConnection()->delete($this->getMainTable(), ['product_id in (?)' => $ids]);
+        }
+    }
+
     /**
      * Update stock status index table (INSERT ... ON DUPLICATE KEY UPDATE ...)
      *

app/code/Magento/CatalogSearch/Model/Search/BaseSelectStrategy/BaseSelectAttributesSearchStrategy.php

@@ -8,7 +8,6 @@
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Indexer\Model\ResourceModel\FrontendResource;
 use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
 use Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainer;
 
@@ -31,11 +30,6 @@ class BaseSelectAttributesSearchStrategy implements BaseSelectStrategyInterface
      */
     private $storeManager;
 
-    /**
-     * @var FrontendResource
-     */
-    private $indexerEavFrontendResource;
-
     /**
      * @var IndexScopeResolver
      */
@@ -44,18 +38,15 @@ class BaseSelectAttributesSearchStrategy implements BaseSelectStrategyInterface
     /**
      * @param ResourceConnection $resource
      * @param StoreManagerInterface $storeManager
-     * @param FrontendResource $indexerEavFrontendResource
      * @param IndexScopeResolver $scopeResolver
      */
     public function __construct(
         ResourceConnection $resource,
         StoreManagerInterface $storeManager,
-        FrontendResource $indexerEavFrontendResource,
         IndexScopeResolver $scopeResolver
     ) {
         $this->resource = $resource;
         $this->storeManager = $storeManager;
-        $this->indexerEavFrontendResource = $indexerEavFrontendResource;
         $this->scopeResolver = $scopeResolver;
     }
 
@@ -73,7 +64,7 @@ public function createBaseSelect(SelectContainer $selectContainer)
 
         $select->distinct()
             ->from(
-                [$mainTableAlias => $this->indexerEavFrontendResource->getMainTable()],
+                [$mainTableAlias => $this->resource->getTableName('catalog_product_index_eav')],
                 ['entity_id' => 'entity_id']
             )->where(
                 $this->resource->getConnection()->quoteInto(

app/code/Magento/CatalogSearch/Model/Search/FilterMapper/CustomAttributeFilter.php

@@ -6,11 +6,11 @@
 
 namespace Magento\CatalogSearch\Model\Search\FilterMapper;
 
+use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Search\Adapter\Mysql\ConditionManager;
 use Magento\Framework\DB\Select;
 use Magento\Eav\Model\Config as EavConfig;
 use Magento\Framework\Search\Request\FilterInterface;
-use Magento\Indexer\Model\ResourceModel\FrontendResource;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\CatalogSearch\Model\Adapter\Mysql\Filter\AliasResolver;
 use Magento\Catalog\Model\Product;
@@ -21,6 +21,11 @@
  */
 class CustomAttributeFilter
 {
+    /**
+     * @var ResourceConnection
+     */
+    private $resourceConnection;
+
     /**
      * @var ConditionManager
      */
@@ -36,33 +41,28 @@ class CustomAttributeFilter
      */
     private $storeManager;
 
-    /**
-     * @var FrontendResource
-     */
-    private $indexerEavFrontendResource;
-
     /**
      * @var AliasResolver
      */
     private $aliasResolver;
 
     /**
+     * @param ResourceConnection $resourceConnection
      * @param ConditionManager $conditionManager
      * @param EavConfig $eavConfig
-     * @param FrontendResource $indexerEavFrontendResource
      * @param StoreManagerInterface $storeManager
      * @param AliasResolver $aliasResolver
      */
     public function __construct(
+        ResourceConnection $resourceConnection,
         ConditionManager $conditionManager,
         EavConfig $eavConfig,
-        FrontendResource $indexerEavFrontendResource,
         StoreManagerInterface $storeManager,
         AliasResolver $aliasResolver
     ) {
+        $this->resourceConnection = $resourceConnection;
         $this->conditionManager = $conditionManager;
         $this->eavConfig = $eavConfig;
-        $this->indexerEavFrontendResource = $indexerEavFrontendResource;
         $this->storeManager = $storeManager;
         $this->aliasResolver = $aliasResolver;
     }
@@ -105,7 +105,7 @@ public function apply(Select $select, FilterInterface ... $filters)
             );
 
             $select->joinInner(
-                [$filterJoinAlias => $this->indexerEavFrontendResource->getMainTable()],
+                [$filterJoinAlias => $this->resourceConnection->getTableName('catalog_product_index_eav')],
                 $this->conditionManager->combineQueries($joinConditions, Select::SQL_AND),
                 []
             );
@@ -171,6 +171,7 @@ private function getAttributeIdByCode($field)
      *
      * @param Select $select
      * @return string|null
+     * @throws \Zend_Db_Select_Exception
      */
     private function extractTableAliasFromSelect(Select $select)
     {

app/code/Magento/CatalogSearch/Model/Search/FilterMapper/ExclusionStrategy.php

@@ -7,8 +7,6 @@
 namespace Magento\CatalogSearch\Model\Search\FilterMapper;
 
 use Magento\CatalogSearch\Model\Adapter\Mysql\Filter\AliasResolver;
-use Magento\Framework\App\ObjectManager;
-use Magento\Indexer\Model\ResourceModel\FrontendResource;
 
 /**
  * Strategy which processes exclusions from general rules
@@ -30,16 +28,6 @@ class ExclusionStrategy implements FilterStrategyInterface
      */
     private $storeManager;
 
-    /**
-     * @var FrontendResource
-     */
-    private $indexerFrontendResource;
-
-    /**
-     * @var \Magento\Indexer\Model\ResourceModel\FrontendResource|null
-     */
-    private $categoryProductIndexerFrontend;
-
     /**
      * List of fields that can be processed by exclusion strategy
      * @var array
@@ -50,26 +38,15 @@ class ExclusionStrategy implements FilterStrategyInterface
      * @param \Magento\Framework\App\ResourceConnection $resourceConnection
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param AliasResolver $aliasResolver
-     * @param FrontendResource $indexerFrontendResource
-     * @param FrontendResource $categoryProductIndexerFrontend
-     * @SuppressWarnings(Magento.TypeDuplication)
      */
     public function __construct(
         \Magento\Framework\App\ResourceConnection $resourceConnection,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        AliasResolver $aliasResolver,
-        FrontendResource $indexerFrontendResource = null,
-        FrontendResource $categoryProductIndexerFrontend = null
+        AliasResolver $aliasResolver
     ) {
         $this->resourceConnection = $resourceConnection;
         $this->storeManager = $storeManager;
         $this->aliasResolver = $aliasResolver;
-        $this->indexerFrontendResource = $indexerFrontendResource ?: ObjectManager::getInstance()->get(
-            \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\FrontendResource::class
-        );
-        $this->categoryProductIndexerFrontend = $categoryProductIndexerFrontend ?: ObjectManager::getInstance()->get(
-            \Magento\Catalog\Model\ResourceModel\Product\Indexer\Category\Product\FrontendResource::class
-        );
     }
 
     /**
@@ -102,7 +79,7 @@ private function applyPriceFilter(
         \Magento\Framework\DB\Select $select
     ) {
         $alias = $this->aliasResolver->getAlias($filter);
-        $tableName = $this->indexerFrontendResource->getMainTable();
+        $tableName = $this->resourceConnection->getTableName('catalog_product_index_price');
         $mainTableAlias = $this->extractTableAliasFromSelect($select);
 
         $select->joinInner(
@@ -131,7 +108,7 @@ private function applyCategoryFilter(
         \Magento\Framework\DB\Select $select
     ) {
         $alias = $this->aliasResolver->getAlias($filter);
-        $tableName = $this->categoryProductIndexerFrontend->getMainTable();
+        $tableName = $this->resourceConnection->getTableName('catalog_category_product_index');;
         $mainTableAlias = $this->extractTableAliasFromSelect($select);
 
         $select->joinInner(