Merge pull request #2854 from magento-earl-grey/MAGETWO-91606

[earl] MAGETWO-91606: Upgrade to 2.2.2 and above took long time

Author: cpartica

app/code/Magento/Catalog/Setup/Patch/Data/UpgradeWebsiteAttributes.php

@@ -156,6 +156,21 @@ private function processAttributeValues(array $attributeValueItems, $tableName)
      */
     private function fetchAttributeValues($tableName)
     {
+        //filter store groups which have more than 1 store
+        $multipleStoresInWebsite = array_values(
+            array_reduce(
+                array_filter($this->getGroupedStoreViews(), function ($storeViews) {
+                    return is_array($storeViews) && count($storeViews) > 1;
+                }),
+                'array_merge',
+                []
+            )
+        );
+
+        if (count($multipleStoresInWebsite) < 1) {
+            return [];
+        }
+
         $connection = $this->moduleDataSetup->getConnection();
         $batchSelectIterator = $this->batchQueryGenerator->generate(
             'value_id',
@@ -184,9 +199,10 @@ private function fetchAttributeValues($tableName)
                     self::ATTRIBUTE_WEBSITE
                 )
                 ->where(
-                    'cpei.store_id <> ?',
-                    self::GLOBAL_STORE_VIEW_ID
-                )
+                    'cpei.store_id IN (?)',
+                    $multipleStoresInWebsite
+                ),
+            1000
         );
 
         foreach ($batchSelectIterator as $select) {

app/code/Magento/CatalogSearch/Setup/Patch/Data/SetInitialSearchWeightForAttributes.php

@@ -6,6 +6,7 @@
 
 namespace Magento\CatalogSearch\Setup\Patch\Data;
 
+use Magento\Framework\App\State;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
 use Magento\Framework\Setup\Patch\PatchVersionInterface;
 use Magento\Framework\Indexer\IndexerInterfaceFactory;
@@ -27,17 +28,25 @@ class SetInitialSearchWeightForAttributes implements DataPatchInterface, PatchVe
      */
     private $attributeRepository;
 
+    /**
+     * @var State
+     */
+    private $state;
+
     /**
      * SetInitialSearchWeightForAttributes constructor.
      * @param IndexerInterfaceFactory $indexerFactory
      * @param ProductAttributeRepositoryInterface $attributeRepository
+     * @param State $state
      */
     public function __construct(
         IndexerInterfaceFactory $indexerFactory,
-        ProductAttributeRepositoryInterface $attributeRepository
+        ProductAttributeRepositoryInterface $attributeRepository,
+        State $state
     ) {
         $this->indexerFactory = $indexerFactory;
         $this->attributeRepository = $attributeRepository;
+        $this->state = $state;
     }
 
     /**
@@ -47,6 +56,13 @@ public function apply()
     {
         $this->setWeight('sku', 6);
         $this->setWeight('name', 5);
+        $indexer = $this->indexerFactory->create()->load('catalogsearch_fulltext');
+        $this->state->emulateAreaCode(
+            \Magento\Framework\App\Area::AREA_CRONTAB,
+            function () use ($indexer) {
+                $indexer->reindexAll();
+            }
+        );
     }
 
     /**
@@ -76,8 +92,9 @@ public function getAliases()
     /**
      * Set attribute search weight.
      *
-     * @param $attributeCode
-     * @param $weight
+     * @param string $attributeCode
+     * @param int $weight
+     * @return void
      */
     private function setWeight($attributeCode, $weight)
     {