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

AVoskoboinikov · AVoskoboinikov · commit 3a51ae20111b · 2017-06-26T15:06:31.000+03:00
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/BaseSelectStrategy/BaseSelectAttributesSearchStrategy.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/BaseSelectStrategy/BaseSelectAttributesSearchStrategy.php
@@ -4,8 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\CatalogSearch\Model\Search\BaseSelectStrategy;
+namespace Magento\CatalogSearch\Model\Adapter\Mysql\BaseSelectStrategy;
 
+use Magento\CatalogSearch\Model\Search\BaseSelectStrategy\BaseSelectStrategyInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/BaseSelectStrategy/BaseSelectFullTextSearchStrategy.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/BaseSelectStrategy/BaseSelectFullTextSearchStrategy.php
@@ -4,8 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\CatalogSearch\Model\Search\BaseSelectStrategy;
+namespace Magento\CatalogSearch\Model\Adapter\Mysql\BaseSelectStrategy;
 
+use Magento\CatalogSearch\Model\Search\BaseSelectStrategy\BaseSelectStrategyInterface;
 use Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainer;
 use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
 use Magento\Framework\App\ResourceConnection;
diff --git a/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php b/app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php
@@ -8,7 +8,6 @@
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ResourceModel\Eav\Attribute;
-use Magento\CatalogInventory\Model\Stock;
 use Magento\CatalogSearch\Model\Search\TableMapper;
 use Magento\Eav\Model\Config;
 use Magento\Framework\App\Config\ScopeConfigInterface;
@@ -20,9 +19,9 @@
 use Magento\Framework\Search\Adapter\Mysql\ConditionManager;
 use Magento\Framework\Search\Adapter\Mysql\Filter\PreprocessorInterface;
 use Magento\Framework\Search\Request\FilterInterface;
-use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\Store;
 use Magento\Customer\Model\Session;
+use Magento\CatalogSearch\Model\Search\FilterMapper\VisibilityFilter;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -166,7 +165,7 @@ private function processQueryWithField(FilterInterface $filter, $isNegation, $qu
                 $this->connection->quoteIdentifier($alias . '.' . $attribute->getAttributeCode()),
                 $query
             );
-        } elseif ($filter->getField() === 'visibility') {
+        } elseif ($filter->getField() === VisibilityFilter::VISIBILITY_FILTER_FIELD) {
             return '';
         } elseif ($filter->getType() === FilterInterface::TYPE_TERM &&
             in_array($attribute->getFrontendInput(), ['select', 'multiselect'], true)
diff --git a/app/code/Magento/CatalogSearch/Model/Search/BaseSelectStrategy/StrategyMapper.php b/app/code/Magento/CatalogSearch/Model/Search/BaseSelectStrategy/StrategyMapper.php
@@ -6,6 +6,8 @@
 namespace Magento\CatalogSearch\Model\Search\BaseSelectStrategy;
 
 use Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainer;
+use Magento\CatalogSearch\Model\Adapter\Mysql\BaseSelectStrategy\BaseSelectFullTextSearchStrategy;
+use Magento\CatalogSearch\Model\Adapter\Mysql\BaseSelectStrategy\BaseSelectAttributesSearchStrategy;
 
 /**
  * Class StrategyMapper
diff --git a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterContext.php b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/FilterContext.php
@@ -27,29 +27,18 @@ class FilterContext implements FilterStrategyInterface
      */
     private $eavConfig;
 
-    /**
-     * @var TermDropdownStrategy
-     * @deprecated
-     */
-    private $termDropdownStrategy;
-
     /**
      * @var StaticAttributeStrategy
      */
     private $staticAttributeStrategy;
 
-    /**
-     * @var AliasResolver
-     * @deprecated
-     */
-    private $aliasResolver;
-
     /**
      * @param EavConfig $eavConfig
      * @param AliasResolver $aliasResolver
      * @param ExclusionStrategy $exclusionStrategy
      * @param TermDropdownStrategy $termDropdownStrategy
      * @param StaticAttributeStrategy $staticAttributeStrategy
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         EavConfig $eavConfig,
@@ -59,9 +48,7 @@ public function __construct(
         StaticAttributeStrategy $staticAttributeStrategy
     ) {
         $this->eavConfig = $eavConfig;
-        $this->aliasResolver = $aliasResolver;
         $this->exclusionStrategy = $exclusionStrategy;
-        $this->termDropdownStrategy = $termDropdownStrategy;
         $this->staticAttributeStrategy = $staticAttributeStrategy;
     }
 
diff --git a/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/VisibilityFilter.php b/app/code/Magento/CatalogSearch/Model/Search/FilterMapper/VisibilityFilter.php
@@ -19,6 +19,11 @@
  */
 class VisibilityFilter
 {
+    /**
+     * Name of the field that is used for visibility filtering
+     */
+    const VISIBILITY_FILTER_FIELD = 'visibility';
+
     /**
      * Defines strategies of how filter should be applied
      */
@@ -172,7 +177,10 @@ private function applyFilterByWhere(FilterInterface $filter, Select $select)
      */
     private function getVisibilityAttributeId()
     {
-        $attr = $this->eavConfig->getAttribute(\Magento\Catalog\Model\Product::ENTITY, 'visibility');
+        $attr = $this->eavConfig->getAttribute(
+            \Magento\Catalog\Model\Product::ENTITY,
+            self::VISIBILITY_FILTER_FIELD
+        );
 
         if ($attr === null) {
             throw new \InvalidArgumentException('Wrong id for visibility attribute');
diff --git a/app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php b/app/code/Magento/CatalogSearch/Model/Search/IndexBuilder.php
@@ -29,48 +29,6 @@
  */
 class IndexBuilder implements IndexBuilderInterface
 {
-    /**
-     * @var Resource
-     * @deprecated
-     */
-    private $resource;
-
-    /**
-     * @var ScopeConfigInterface
-     * @deprecated
-     */
-    private $config;
-
-    /**
-     * @var StoreManagerInterface
-     * @deprecated
-     */
-    private $storeManager;
-
-    /**
-     * @var IndexScopeResolver
-     * @deprecated
-     */
-    private $scopeResolver;
-
-    /**
-     * @var ConditionManager
-     * @deprecated
-     */
-    private $conditionManager;
-
-    /**
-     * @var ScopeResolverInterface
-     * @deprecated
-     */
-    private $dimensionScopeResolver;
-
-    /**
-     * @var TableMapper
-     * @deprecated
-     */
-    private $tableMapper;
-
     /**
      * @var DimensionsProcessor
      */
@@ -104,6 +62,7 @@ class IndexBuilder implements IndexBuilderInterface
      * @param BaseSelectStrategyMapper|null $baseSelectStrategyMapper
      * @param FilterMapper|null $filterMapper
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         ResourceConnection $resource,
@@ -118,14 +77,6 @@ public function __construct(
         BaseSelectStrategyMapper $baseSelectStrategyMapper = null,
         FilterMapper $filterMapper = null
     ) {
-        $this->resource = $resource;
-        $this->config = $config;
-        $this->storeManager = $storeManager;
-        $this->conditionManager = $conditionManager;
-        $this->scopeResolver = $scopeResolver;
-        $this->dimensionScopeResolver = $dimensionScopeResolver;
-        $this->tableMapper = $tableMapper;
-
         $this->dimensionsProcessor = $dimensionsProcessor ?: ObjectManager::getInstance()
             ->get(DimensionsProcessor::class);
 
diff --git a/app/code/Magento/CatalogSearch/Model/Search/SelectContainer/SelectContainerBuilder.php b/app/code/Magento/CatalogSearch/Model/Search/SelectContainer/SelectContainerBuilder.php
@@ -12,6 +12,7 @@
 use Magento\Framework\Search\RequestInterface;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Store\Model\ScopeInterface;
+use Magento\CatalogSearch\Model\Search\FilterMapper\VisibilityFilter;
 
 /**
  * Class SelectContainerBuilder
@@ -90,7 +91,7 @@ public function buildByRequest(RequestInterface $request)
 
         foreach ($this->filtersExtractor->extractFiltersFromQuery($request->getQuery()) as $filter) {
             if ($this->customAttributeFilterCheck->isCustom($filter)) {
-                if ($filter->getField() === 'visibility') {
+                if ($filter->getField() === VisibilityFilter::VISIBILITY_FILTER_FIELD) {
                     $visibilityFilter = $filter;
                 } else {
                     $customAttributesFilters[] = $filter;
diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/BaseSelectStrategy/StrategyMapperTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/Search/BaseSelectStrategy/StrategyMapperTest.php
@@ -6,8 +6,8 @@
 
 namespace Magento\CatalogSearch\Test\Unit\Model\Search\BaseSelectStrategy;
 
-use \Magento\CatalogSearch\Model\Search\BaseSelectStrategy\BaseSelectAttributesSearchStrategy;
-use \Magento\CatalogSearch\Model\Search\BaseSelectStrategy\BaseSelectFullTextSearchStrategy;
+use Magento\CatalogSearch\Model\Adapter\Mysql\BaseSelectStrategy\BaseSelectAttributesSearchStrategy;
+use Magento\CatalogSearch\Model\Adapter\Mysql\BaseSelectStrategy\BaseSelectFullTextSearchStrategy;
 use \Magento\CatalogSearch\Model\Search\BaseSelectStrategy\StrategyMapper;
 use \Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainer;
 
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Adapter/Mysql/BaseSelectStrategy/BaseSelectAttributesSearchStrategyTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Adapter/Mysql/BaseSelectStrategy/BaseSelectAttributesSearchStrategyTest.php
@@ -4,11 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\CatalogSearch\Model\Search\BaseSelectStrategy;
+namespace Magento\CatalogSearch\Model\Adapter\Mysql\BaseSelectStrategy;
 
 use Magento\Framework\App\ResourceConnection;
 use Magento\Store\Model\StoreManagerInterface;
-use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\FrontendResource;
 use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
 use Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainerFactory;
 
@@ -29,11 +28,6 @@ class BaseSelectAttributesSearchStrategyTest extends \PHPUnit_Framework_TestCase
      */
     private $resource;
 
-    /**
-     * @var FrontendResource
-     */
-    private $indexerEavFrontendResource;
-
     /**
      * @var StoreManagerInterface
      */
@@ -55,9 +49,6 @@ protected function setUp()
         $this->resource = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->create(ResourceConnection::class);
 
-        $this->indexerEavFrontendResource = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-            ->create(FrontendResource::class);
-
         $this->storeManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
             ->create(StoreManagerInterface::class);
 
@@ -90,7 +81,7 @@ private function getMainSelect()
         $select = $this->resource->getConnection()->select();
         $select->distinct()
             ->from(
-                ['search_index' => $this->indexerEavFrontendResource->getMainTable()],
+                ['search_index' => $this->resource->getTableName('catalog_product_index_eav')],
                 ['entity_id' => 'entity_id']
             )->where(
                 $this->resource->getConnection()->quoteInto(
@@ -107,7 +98,7 @@ private function getFulltextSelect()
         $select = $this->resource->getConnection()->select();
         $select->distinct()
             ->from(
-                ['eav_index' => $this->indexerEavFrontendResource->getMainTable()],
+                ['eav_index' => $this->resource->getTableName('catalog_product_index_eav')],
                 ['entity_id' => 'entity_id']
             )->where(
                 $this->resource->getConnection()->quoteInto(
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Adapter/Mysql/BaseSelectStrategy/BaseSelectFullTextSearchStrategyTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Adapter/Mysql/BaseSelectStrategy/BaseSelectFullTextSearchStrategyTest.php
@@ -4,10 +4,9 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\CatalogSearch\Model\Search\BaseSelectStrategy;
+namespace Magento\CatalogSearch\Model\Adapter\Mysql\BaseSelectStrategy;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\FrontendResource;
 use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
 use Magento\CatalogSearch\Model\Search\SelectContainer\SelectContainerFactory;
 
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Search/FilterMapper/CustomAttributeFilterTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Search/FilterMapper/CustomAttributeFilterTest.php
@@ -11,7 +11,6 @@
 use Magento\Eav\Model\Config as EavConfig;
 use Magento\Catalog\Model\Product;
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
-use Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\FrontendResource;
 use Magento\Framework\Search\Adapter\Mysql\ConditionManager;
 use Magento\Framework\DB\Select;
 
@@ -29,9 +28,6 @@ class CustomAttributeFilterTest extends \PHPUnit_Framework_TestCase
     /** @var EavConfig|\PHPUnit_Framework_MockObject_MockObject */
     private $eavConfigMock;
 
-    /** @var FrontendResource */
-    private $indexerEavFrontendResource;
-
     /** @var StoreManagerInterface */
     private $storeManager;
 
@@ -42,7 +38,6 @@ protected function setUp()
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         $this->resource = $this->objectManager->create(ResourceConnection::class);
-        $this->indexerEavFrontendResource = $this->objectManager->create(FrontendResource::class);
         $this->storeManager = $this->objectManager->create(StoreManagerInterface::class);
         $this->conditionManager = $this->objectManager->create(ConditionManager::class);
 
@@ -170,7 +165,7 @@ private function getSqlForOneAttributeSearch()
             ['some_index' => 'some_table'],
             ['entity_id' => 'entity_id']
         )->joinInner(
-            ['field1_filter' => $this->indexerEavFrontendResource->getMainTable()],
+            ['field1_filter' => $this->resource->getTableName('catalog_product_index_eav')],
             $this->conditionManager->combineQueries($joinConditions, Select::SQL_AND),
             []
         )->where(sprintf('`some_index`.`attribute_id` = %s', $firstAttribute->getId()))
@@ -204,11 +199,11 @@ private function getSqlForTwoAttributeSearch()
             ['some_index' => 'some_table'],
             ['entity_id' => 'entity_id']
         )->joinInner(
-            ['field1_filter' => $this->indexerEavFrontendResource->getMainTable()],
+            ['field1_filter' => $this->resource->getTableName('catalog_product_index_eav')],
             $this->conditionManager->combineQueries($joinConditions1, Select::SQL_AND),
             []
         )->joinInner(
-            ['field2_filter' => $this->indexerEavFrontendResource->getMainTable()],
+            ['field2_filter' => $this->resource->getTableName('catalog_product_index_eav')],
             $this->conditionManager->combineQueries($joinConditions2, Select::SQL_AND),
             []
         );
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Search/FilterMapper/StockStatusFilterTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Search/FilterMapper/StockStatusFilterTest.php
@@ -8,7 +8,6 @@
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Search\Adapter\Mysql\ConditionManager;
 use Magento\Framework\DB\Select;
-use Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\FrontendResource;
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
 use Magento\CatalogInventory\Api\StockRegistryInterface;
 use Magento\CatalogInventory\Model\Stock;
@@ -30,9 +29,6 @@ class StockStatusFilterTest extends \PHPUnit_Framework_TestCase
     /** @var ConditionManager */
     private $conditionManager;
 
-    /** @var FrontendResource */
-    private $indexerStockFrontendResource;
-
     /** @var StockConfigurationInterface */
     private $stockConfiguration;
 
@@ -47,7 +43,6 @@ protected function setUp()
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
         $this->resource = $this->objectManager->create(ResourceConnection::class);
         $this->conditionManager = $this->objectManager->create(ConditionManager::class);
-        $this->indexerStockFrontendResource = $this->objectManager->create(FrontendResource::class);
         $this->stockConfiguration = $this->objectManager->create(StockConfigurationInterface::class);
         $this->stockRegistry = $this->objectManager->create(StockRegistryInterface::class);
         $this->stockStatusFilter = $this->objectManager->create(StockStatusFilter::class);
@@ -175,7 +170,7 @@ private function getExpectedSelectForGeneralFilter($withOutOfStock)
             ['some_index' => 'some_table'],
             ['entity_id' => 'entity_id']
         )->joinInner(
-            ['stock_index' => $this->indexerStockFrontendResource->getMainTable()],
+            ['stock_index' => $this->resource->getTableName('catalog_product_index_eav')],
             $this->conditionManager->combineQueries(
                 [
                     'stock_index.product_id = some_index.entity_id',
@@ -213,7 +208,7 @@ private function getExpectedSelectForFullFilter($withOutOfStock)
     {
         $select = $this->getExpectedSelectForGeneralFilter($withOutOfStock);
         $select->joinInner(
-            ['sub_products_stock_index' => $this->indexerStockFrontendResource->getMainTable()],
+            ['sub_products_stock_index' => $this->resource->getTableName('catalog_product_index_eav')],
             $this->conditionManager->combineQueries(
                 [
                     'sub_products_stock_index.product_id = some_index.source_id',
diff --git a/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Search/FilterMapper/VisibilityFilterTest.php b/dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Search/FilterMapper/VisibilityFilterTest.php
