MAGETWO-94086: [Forwardport] Run Catalog Search reindex in multithread mode with AdvancedSearch

Author: slopukhov

app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php

@@ -16,6 +16,7 @@
 use Magento\Catalog\Model\Indexer\Category\Product\AbstractAction;
 use Magento\Framework\Search\Request\IndexScopeResolverInterface as TableResolver;
 use Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory;
+use Magento\Store\Model\Indexer\WebsiteDimensionProvider;
 
 /**
  * @api
@@ -47,6 +48,11 @@ class Index extends AbstractDb
      */
     private $dimensionCollectionFactory;
 
+    /**
+     * @var int|null
+     */
+    private $websiteId;
+
     /**
      * Index constructor.
      * @param Context $context
@@ -94,12 +100,17 @@ protected function _getCatalogProductPriceData($productIds = null)
         $catalogProductIndexPriceSelect = [];
 
         foreach ($this->dimensionCollectionFactory->create() as $dimensions) {
-            $catalogProductIndexPriceSelect[] = $connection->select()->from(
-                $this->tableResolver->resolve('catalog_product_index_price', $dimensions),
-                ['entity_id', 'customer_group_id', 'website_id', 'min_price']
-            );
-            if ($productIds) {
-                current($catalogProductIndexPriceSelect)->where('entity_id IN (?)', $productIds);
+            if (!isset($dimensions[WebsiteDimensionProvider::DIMENSION_NAME]) ||
+                $this->websiteId === null ||
+                $dimensions[WebsiteDimensionProvider::DIMENSION_NAME]->getValue() === $this->websiteId) {
+                $select = $connection->select()->from(
+                    $this->tableResolver->resolve('catalog_product_index_price', $dimensions),
+                    ['entity_id', 'customer_group_id', 'website_id', 'min_price']
+                );
+                if ($productIds) {
+                    $select->where('entity_id IN (?)', $productIds);
+                }
+                $catalogProductIndexPriceSelect[] = $select;
             }
         }
 
@@ -123,9 +134,12 @@ protected function _getCatalogProductPriceData($productIds = null)
      */
     public function getPriceIndexData($productIds, $storeId)
     {
+        $websiteId = $this->storeManager->getStore($storeId)->getWebsiteId();
+
+        $this->websiteId = $websiteId;
         $priceProductsIndexData = $this->_getCatalogProductPriceData($productIds);
+        $this->websiteId = null;
 
-        $websiteId = $this->storeManager->getStore($storeId)->getWebsiteId();
         if (!isset($priceProductsIndexData[$websiteId])) {
             return [];
         }

app/code/Magento/Elasticsearch/etc/indexer.xml

@@ -9,6 +9,7 @@
     <indexer id="catalogsearch_fulltext">
         <dependencies>
             <indexer id="cataloginventory_stock" />
+            <indexer id="catalog_product_price" />
         </dependencies>
     </indexer>
 </config>

dev/tests/integration/testsuite/Magento/Catalog/Pricing/Render/FinalPriceBoxTest.php

@@ -125,7 +125,7 @@ protected function setUp()
 
     /**
      * @magentoDataFixture Magento/Catalog/_files/product_has_tier_price_show_as_low_as.php
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      */
     public function testRenderAmountMinimalProductWithTierPricesShouldShowMinTierPrice()
@@ -136,7 +136,7 @@ public function testRenderAmountMinimalProductWithTierPricesShouldShowMinTierPri
 
     /**
      * @magentoDataFixture Magento/Catalog/_files/product_different_store_prices.php
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      * @magentoConfigFixture current_store catalog/frontend/flat_catalog_product 1
      */

dev/tests/integration/testsuite/Magento/Sales/Model/Order/Address/RendererTest.php

@@ -46,7 +46,7 @@ protected function setUp()
 
     /**
      * @magentoDataFixture Magento/Sales/_files/order_fixture_store.php
-     * @magentoDbIsolation enabled
+     * @magentoDbIsolation disabled
      * @magentoAppIsolation enabled
      */
     public function testFormat()