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

Author: AVoskoboinikov

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

@@ -57,7 +57,7 @@ public function buildSelect($idxTable)
             []
         )->group(
             ['product.entity_id', 'cis.website_id', 'cis.stock_id', 'bo.option_id']
-        )->columns(['option_id' => 'bo.option_id','status' => new \Zend_Db_Expr('MAX('. $statusExpression. ')')]);
+        )->columns(['option_id' => 'bo.option_id']);
 
         return $select;
     }

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

@@ -40,7 +40,8 @@ class Stock extends \Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\
      * @param string $connectionName
      * @param null|\Magento\Indexer\Model\Indexer\StateFactory $stateFactory
      * @param null|\Magento\Indexer\Model\ResourceModel\FrontendResource $indexerStockFrontendResource
-     * @param null|\Magento\Bundle\Model\ResourceModel\Indexer\StockStatusSelectBuilder $stockStatusSelectBuilder
+     * @param null|StockStatusSelectBuilder $stockStatusSelectBuilder
+     * @param null|BundleOptionStockDataSelectBuilder $bundleOptionStockDataSelectBuilder
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,

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

@@ -31,6 +31,7 @@ public function __construct(
     /**
      * @param Select $select
      * @return Select
+     * @throws \Exception
      */
     public function buildSelect(Select $select)
     {
@@ -39,7 +40,7 @@ public function buildSelect(Select $select)
         $linkField = $metadata->getLinkField();
 
         $select->reset(
-            \Magento\Framework\DB\Select::COLUMNS
+            Select::COLUMNS
         )->columns(
             ['e.entity_id', 'cis.website_id', 'cis.stock_id']
         )->joinLeft(

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

@@ -230,29 +230,24 @@ protected function _deleteOldRelations($tableName)
 
     /**
      * Delete records by their ids from index table
-     * Is used to clean table before re-indexation
+     * Used to clean table before re-indexation
      *
      * @param array $ids
-     *
-     * @return bool
+     * @return void
      */
     protected function _deleteOldRecords(array $ids)
     {
-        if (count($ids) === 0) {
-            return false;
+        if (count($ids) !== 0) {
+            $this->_getConnection()->delete(
+                $this->indexerStockFrontendResource->getMainTable(),
+                ['product_id in (?)' => $ids]
+            );
         }
-
-        $result = $this->_getConnection()->delete(
-            $this->indexerStockFrontendResource->getMainTable(),
-            ['product_id in (?)' => $ids]
-        );
-
-        return (bool) $result;
     }
 
     /**
      * Delete all records from index table
-     * Is used to clean table before re-indexation
+     * Used to clean table before re-indexation
      *
      * @return void
      */

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

@@ -84,7 +84,7 @@ public function clean(array $productIds, callable $reindex)
         $productStatusesBefore = $this->getProductStockStatuses($productIds);
         $reindex();
         $productStatusesAfter = $this->getProductStockStatuses($productIds);
-        $productIds = $this->getProductIds($productStatusesBefore, $productStatusesAfter);
+        $productIds = $this->getProductIdsForCacheClean($productStatusesBefore, $productStatusesAfter);
         if ($productIds) {
             $this->cacheContext->registerEntities(Product::CACHE_TAG, $productIds);
             $this->eventManager->dispatch('clean_cache_by_tags', ['object' => $this->cacheContext]);
@@ -113,11 +113,13 @@ private function getProductStockStatuses(array $productIds)
     }
 
     /**
+     * Return list of product ids that need to be flushed from cache
+     *
      * @param array $productStatusesBefore
      * @param array $productStatusesAfter
      * @return array
      */
-    private function getProductIds(array $productStatusesBefore, array $productStatusesAfter)
+    private function getProductIdsForCacheClean(array $productStatusesBefore, array $productStatusesAfter)
     {
         $disabledProductsIds = array_diff(array_keys($productStatusesBefore), array_keys($productStatusesAfter));
         $enabledProductsIds = array_diff(array_keys($productStatusesAfter), array_keys($productStatusesBefore));