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

Author: AVoskoboinikov

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

@@ -24,7 +24,7 @@ public function __construct(
     }
 
     /**
-     * @param $idxTable
+     * @param string $idxTable
      * @return Select
      */
     public function buildSelect($idxTable)

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

@@ -169,12 +169,13 @@ public function execute($ids = null)
      * Delete all records from index table
      * Used to clean table before re-indexation
      *
+     * @param array $indexers
      * @return void
      */
     private function cleanIndexersTables(array $indexers)
     {
         $tables = array_map(
-            function(StockInterface $indexer) {
+            function (StockInterface $indexer) {
                 return $this->activeTableSwitcher->getAdditionalTableName($indexer->getMainTable());
             },
             $indexers

app/code/Magento/CatalogInventory/Test/Unit/Model/Indexer/Stock/Action/FullTest.php

@@ -24,6 +24,10 @@ public function testExecuteWithAdapterErrorThrowsException()
         $productTypeMock = $this->getMock(\Magento\Catalog\Model\Product\Type::class, [], [], '', false);
         $connectionMock = $this->getMock(\Magento\Framework\DB\Adapter\AdapterInterface::class);
 
+        $productTypeMock
+            ->method('getTypesByPriority')
+            ->willReturn([]);
+
         $exceptionMessage = 'exception message';
 
         $resourceMock->expects($this->any())

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

@@ -108,7 +108,7 @@ private function applyCategoryFilter(
         \Magento\Framework\DB\Select $select
     ) {
         $alias = $this->aliasResolver->getAlias($filter);
-        $tableName = $this->resourceConnection->getTableName('catalog_category_product_index');;
+        $tableName = $this->resourceConnection->getTableName('catalog_category_product_index');
         $mainTableAlias = $this->extractTableAliasFromSelect($select);
 
         $select->joinInner(

dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Search/FilterMapper/StockStatusFilterTest.php

@@ -170,7 +170,7 @@ private function getExpectedSelectForGeneralFilter($withOutOfStock)
             ['some_index' => 'some_table'],
             ['entity_id' => 'entity_id']
         )->joinInner(
-            ['stock_index' => $this->resource->getTableName('catalog_product_index_eav')],
+            ['stock_index' => $this->resource->getTableName('cataloginventory_stock_status')],
             $this->conditionManager->combineQueries(
                 [
                     'stock_index.product_id = some_index.entity_id',
@@ -208,7 +208,7 @@ private function getExpectedSelectForFullFilter($withOutOfStock)
     {
         $select = $this->getExpectedSelectForGeneralFilter($withOutOfStock);
         $select->joinInner(
-            ['sub_products_stock_index' => $this->resource->getTableName('catalog_product_index_eav')],
+            ['sub_products_stock_index' => $this->resource->getTableName('cataloginventory_stock_status')],
             $this->conditionManager->combineQueries(
                 [
                     'sub_products_stock_index.product_id = some_index.source_id',