MC-16239: Search result page contain 24k results

magento · May 21, 2019 · 9ab466d · 9ab466d
1 parent b651a26
commit 9ab466d
Show file tree

Hide file tree

Showing 35 changed files with 357 additions and 518 deletions.
diff --git a/app/code/Magento/Backend/Block/Context.php b/app/code/Magento/Backend/Block/Context.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Backend\Block;
 
+use Magento\Framework\Cache\LockGuardedCacheLoader;
+
 /**
  * Constructor modification point for Magento\Backend\Block\AbstractBlock.
  *
@@ -44,8 +46,9 @@ class Context extends \Magento\Framework\View\Element\Context
      * @param \Magento\Framework\Escaper $escaper
      * @param \Magento\Framework\Filter\FilterManager $filterManager
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
-     * @param \Magento\Framework\AuthorizationInterface $authorization
      * @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
+     * @param LockGuardedCacheLoader $lockQuery
+     * @param \Magento\Framework\AuthorizationInterface $authorization
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -67,6 +70,7 @@ public function __construct(
         \Magento\Framework\Filter\FilterManager $filterManager,
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
         \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
+        LockGuardedCacheLoader $lockQuery,
         \Magento\Framework\AuthorizationInterface $authorization
     ) {
         $this->_authorization = $authorization;
@@ -87,7 +91,8 @@ public function __construct(
             $escaper,
             $filterManager,
             $localeDate,
-            $inlineTranslation
+            $inlineTranslation,
+            $lockQuery
         );
     }
 

diff --git a/app/code/Magento/Backend/Block/Template/Context.php b/app/code/Magento/Backend/Block/Template/Context.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Backend\Block\Template;
 
+use Magento\Framework\Cache\LockGuardedCacheLoader;
+
 /**
  * Constructor modification point for Magento\Backend\Block\Template.
  *
@@ -72,6 +74,7 @@ class Context extends \Magento\Framework\View\Element\Template\Context
      * @param \Magento\Framework\Filter\FilterManager $filterManager
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
+     * @param LockGuardedCacheLoader $lockQuery
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Framework\View\FileSystem $viewFileSystem
      * @param \Magento\Framework\View\TemplateEnginePool $enginePool
@@ -106,6 +109,7 @@ public function __construct(
         \Magento\Framework\Filter\FilterManager $filterManager,
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
         \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
+        LockGuardedCacheLoader $lockQuery,
         \Magento\Framework\Filesystem $filesystem,
         \Magento\Framework\View\FileSystem $viewFileSystem,
         \Magento\Framework\View\TemplateEnginePool $enginePool,
@@ -143,6 +147,7 @@ public function __construct(
             $filterManager,
             $localeDate,
             $inlineTranslation,
+            $lockQuery,
             $filesystem,
             $viewFileSystem,
             $enginePool,

diff --git a/app/code/Magento/Backend/Block/Widget/Context.php b/app/code/Magento/Backend/Block/Widget/Context.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Backend\Block\Widget;
 
+use Magento\Framework\Cache\LockGuardedCacheLoader;
+
 /**
  * Constructor modification point for Magento\Backend\Block\Widget.
  *
@@ -55,6 +57,7 @@ class Context extends \Magento\Backend\Block\Template\Context
      * @param \Magento\Framework\Filter\FilterManager $filterManager
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
+     * @param LockGuardedCacheLoader $lockQuery
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Framework\View\FileSystem $viewFileSystem
      * @param \Magento\Framework\View\TemplateEnginePool $enginePool
@@ -91,6 +94,7 @@ public function __construct(
         \Magento\Framework\Filter\FilterManager $filterManager,
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
         \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
+        LockGuardedCacheLoader $lockQuery,
         \Magento\Framework\Filesystem $filesystem,
         \Magento\Framework\View\FileSystem $viewFileSystem,
         \Magento\Framework\View\TemplateEnginePool $enginePool,
@@ -125,6 +129,7 @@ public function __construct(
             $filterManager,
             $localeDate,
             $inlineTranslation,
+            $lockQuery,
             $filesystem,
             $viewFileSystem,
             $enginePool,

diff --git a/app/code/Magento/Catalog/Block/Product/Context.php b/app/code/Magento/Catalog/Block/Product/Context.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Catalog\Block\Product;
 
+use Magento\Framework\Cache\LockGuardedCacheLoader;
+
 /**
  * Constructor modification point for Magento\Catalog\Block\Product\AbstractProduct.
  *
@@ -104,6 +106,7 @@ class Context extends \Magento\Framework\View\Element\Template\Context
      * @param \Magento\Framework\Filter\FilterManager $filterManager
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
+     * @param LockGuardedCacheLoader $lockQuery
      * @param \Magento\Framework\Filesystem $filesystem
      * @param \Magento\Framework\View\FileSystem $viewFileSystem
      * @param \Magento\Framework\View\TemplateEnginePool $enginePool
@@ -145,6 +148,7 @@ public function __construct(
         \Magento\Framework\Filter\FilterManager $filterManager,
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
         \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
+        LockGuardedCacheLoader $lockQuery,
         \Magento\Framework\Filesystem $filesystem,
         \Magento\Framework\View\FileSystem $viewFileSystem,
         \Magento\Framework\View\TemplateEnginePool $enginePool,
@@ -196,6 +200,7 @@ public function __construct(
             $filterManager,
             $localeDate,
             $inlineTranslation,
+            $lockQuery,
             $filesystem,
             $viewFileSystem,
             $enginePool,
@@ -208,6 +213,8 @@ public function __construct(
     }
 
     /**
+     * Get Stock registry.
+     *
      * @return \Magento\CatalogInventory\Api\StockRegistryInterface
      */
     public function getStockRegistry()
@@ -216,6 +223,8 @@ public function getStockRegistry()
     }
 
     /**
+     * Get cart helper.
+     *
      * @return \Magento\Checkout\Helper\Cart
      */
     public function getCartHelper()
@@ -224,6 +233,8 @@ public function getCartHelper()
     }
 
     /**
+     * Get catalog config.
+     *
      * @return \Magento\Catalog\Model\Config
      */
     public function getCatalogConfig()
@@ -232,6 +243,8 @@ public function getCatalogConfig()
     }
 
     /**
+     * Get catalog helper.
+     *
      * @return \Magento\Catalog\Helper\Data
      */
     public function getCatalogHelper()
@@ -240,6 +253,8 @@ public function getCatalogHelper()
     }
 
     /**
+     * Get compare product.
+     *
      * @return \Magento\Catalog\Helper\Product\Compare
      */
     public function getCompareProduct()
@@ -248,6 +263,8 @@ public function getCompareProduct()
     }
 
     /**
+     * Get image helper.
+     *
      * @return \Magento\Catalog\Helper\Image
      */
     public function getImageHelper()
@@ -256,6 +273,8 @@ public function getImageHelper()
     }
 
     /**
+     * Get image builder.
+     *
      * @return \Magento\Catalog\Block\Product\ImageBuilder
      */
     public function getImageBuilder()
@@ -264,6 +283,8 @@ public function getImageBuilder()
     }
 
     /**
+     *  Get math random.
+     *
      * @return \Magento\Framework\Math\Random
      */
     public function getMathRandom()
@@ -272,6 +293,8 @@ public function getMathRandom()
     }
 
     /**
+     * Get registry.
+     *
      * @return \Magento\Framework\Registry
      */
     public function getRegistry()
@@ -280,6 +303,8 @@ public function getRegistry()
     }
 
     /**
+     * Get tax data.
+     *
      * @return \Magento\Tax\Helper\Data
      */
     public function getTaxData()
@@ -288,6 +313,8 @@ public function getTaxData()
     }
 
     /**
+     * Get wishlist helper.
+     *
      * @return \Magento\Wishlist\Helper\Data
      */
     public function getWishlistHelper()
@@ -296,6 +323,8 @@ public function getWishlistHelper()
     }
 
     /**
+     * Get review renderer.
+     *
      * @return \Magento\Catalog\Block\Product\ReviewRendererInterface
      */
     public function getReviewRenderer()

diff --git a/app/code/Magento/CatalogInventory/Model/AddStockStatusToCollection.php b/app/code/Magento/CatalogInventory/Model/AddStockStatusToCollection.php
@@ -7,8 +7,6 @@
 namespace Magento\CatalogInventory\Model;
 
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
-use Magento\Framework\Search\EngineResolverInterface;
-use Magento\Search\Model\EngineResolver;
 
 /**
  * Catalog inventory module plugin
@@ -20,21 +18,13 @@ class AddStockStatusToCollection
      */
     protected $stockHelper;
 
-    /**
-     * @var EngineResolverInterface
-     */
-    private $engineResolver;
-
     /**
      * @param \Magento\CatalogInventory\Helper\Stock $stockHelper
-     * @param EngineResolverInterface $engineResolver
      */
     public function __construct(
-        \Magento\CatalogInventory\Helper\Stock $stockHelper,
-        EngineResolverInterface $engineResolver
+        \Magento\CatalogInventory\Helper\Stock $stockHelper
     ) {
         $this->stockHelper = $stockHelper;
-        $this->engineResolver = $engineResolver;
     }
 
     /**
@@ -47,9 +37,7 @@ public function __construct(
      */
     public function beforeLoad(Collection $productCollection, $printQuery = false, $logQuery = false)
     {
-        if ($this->engineResolver->getCurrentSearchEngine() === EngineResolver::CATALOG_SEARCH_MYSQL_ENGINE) {
-            $this->stockHelper->addIsInStockFilterToCollection($productCollection);
-        }
+        $this->stockHelper->addIsInStockFilterToCollection($productCollection);
         return [$printQuery, $logQuery];
     }
 }
diff --git a/app/code/Magento/CatalogInventory/Model/Plugin/Layer.php b/app/code/Magento/CatalogInventory/Model/Plugin/Layer.php