ACP2E-963: setup:upgrade is changing indexer mode to save from schedule slowing it down immensely

Author: Anna Bukatar

lib/internal/Magento/Framework/Mview/Test/Unit/TriggerCleanerTest.php

@@ -21,7 +21,10 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
-/** test Mview TriggerCleaner functionality
+/**
+ * test Mview TriggerCleaner functionality
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class TriggerCleanerTest extends TestCase
 {
@@ -138,29 +141,4 @@ private function getConnectionMock()
 
         return $connectionMock;
     }
-
-    private function getViewListMock()
-    {
-        $triggerMock = $this->getMockForAbstractClass(Trigger::class);
-        $triggerMock->expects($this->once())
-            ->method('getName')
-            ->willReturn('trg_catalog_category_entity_int_after_insert');
-        $triggerMock->expects($this->once())->method('getStatements')->willReturn(['statement;']);
-
-        $subscriptionMock = $this->getMockForAbstractClass(SubscriptionInterface::class);
-        $subscriptionMock->expects($this->once())->method('create')->willReturn($subscriptionMock);
-        $subscriptionMock->expects($this->once())->method('getTriggers')->willReturn([$triggerMock]);
-
-        $viewMock = $this->getMockForAbstractClass(ViewInterface::class);
-        $viewMock->expects($this->once())
-            ->method('getSubscriptions')
-            ->willReturn(['subscriptionConfig' => []]);
-        $viewMock->expects($this->once())->method('initSubscriptionInstance')->willReturn($subscriptionMock);
-
-        $viewCollectionMock = $this->getMockForAbstractClass(CollectionInterface::class);
-        $viewCollectionMock->expects($this->once())->method('getViewsByStateMode')->willReturn([$viewMock]);
-
-        $viewCollectionFactoryMock = $this->getMockForAbstractClass(CollectionFactory::class);
-        $viewCollectionFactoryMock->expects($this->once())->method('create')->willReturn($viewCollectionMock);
-    }
 }

lib/internal/Magento/Framework/Mview/TriggerCleaner.php

@@ -33,6 +33,16 @@ class TriggerCleaner
      */
     private $viewFactory;
 
+    /**
+     * @var array
+     */
+    private $processedTriggers = [];
+
+    /**
+     * @var array
+     */
+    private $DbTriggers = [];
+
     /**
      * @param CollectionFactory $viewCollectionFactory
      * @param ResourceConnection $resource
@@ -56,9 +66,7 @@ public function __construct(
      */
     public function removeTriggers(): bool
     {
-        //Get all existing triggers from the DB
-        $triggers = $this->getAllTriggers();
-        $processedTriggers = [];
+        $this->getDbTriggers();
 
         // Get list of views that are enabled
         $viewCollection = $this->viewCollectionFactory->create();
@@ -71,26 +79,12 @@ public function removeTriggers(): bool
                 /* @var $subscription Subscription */
                 $subscription = $view->initSubscriptionInstance($subscriptionConfig);
                 $viewTriggers = $subscription->create(false)->getTriggers();
-                foreach ($viewTriggers as $viewTrigger) {
-                    if (array_key_exists($viewTrigger->getName(), $triggers)) {
-                        foreach ($this->getStatementsFromViewTrigger($viewTrigger) as $statement) {
-                            if (!empty($statement) &&
-                                !str_contains($triggers[$viewTrigger->getName()]['ACTION_STATEMENT'],$statement)
-                            ) {
-                                $subscription->saveTrigger($viewTrigger);
-                                break;
-                            }
-                        }
-                    } else {
-                        $subscription->saveTrigger($viewTrigger);
-                    }
-                    $processedTriggers[$viewTrigger->getName()] = true;
-                }
+                $this->processViewTriggers($viewTriggers, $subscription);
             }
         }
 
         // Remove any remaining triggers from db that are not linked to a view
-        $remainingTriggers = array_diff_key($triggers, $processedTriggers);
+        $remainingTriggers = array_diff_key($this->DbTriggers, $this->processedTriggers);
         foreach ($remainingTriggers as $trigger) {
             $view = $this->createViewByTableName($trigger['EVENT_OBJECT_TABLE']);
             $view->unsubscribe();
@@ -100,12 +94,31 @@ public function removeTriggers(): bool
         return true;
     }
 
+    private function processViewTriggers(array $viewTriggers, Subscription $subscription): void
+    {
+        foreach ($viewTriggers as $viewTrigger) {
+            if (array_key_exists($viewTrigger->getName(), $this->DbTriggers)) {
+                foreach ($this->getStatementsFromViewTrigger($viewTrigger) as $statement) {
+                    if (!empty($statement) &&
+                        !str_contains($this->DbTriggers[$viewTrigger->getName()]['ACTION_STATEMENT'], $statement)
+                    ) {
+                        $subscription->saveTrigger($viewTrigger);
+                        break;
+                    }
+                }
+            } else {
+                $subscription->saveTrigger($viewTrigger);
+            }
+            $this->processedTriggers[$viewTrigger->getName()] = true;
+        }
+    }
+
     /**
-     * Retrieve list of table names that have triggers
+     * Retrieve list of all triggers from DB
      *
-     * @return array
+     * @return void
      */
-    private function getAllTriggers(): array
+    private function getDbTriggers(): void
     {
         $connection = $this->resource->getConnection();
         $dbName = $this->resource->getSchemaName(ResourceConnection::DEFAULT_CONNECTION);
@@ -115,7 +128,7 @@ private function getAllTriggers(): array
                 ['TRIGGER_NAME', 'ACTION_STATEMENT', 'EVENT_OBJECT_TABLE']
             )
             ->where('TRIGGER_SCHEMA = ?', $dbName);
-        return $connection->fetchAssoc($sql);
+        $this->DbTriggers = $connection->fetchAssoc($sql);
     }
 
     /**

lib/internal/Magento/Framework/Mview/View.php

@@ -28,7 +28,7 @@ class View extends DataObject implements ViewInterface
     /**
      * Default batch size for partial reindex
      */
-    const DEFAULT_BATCH_SIZE = 1000;
+    public const DEFAULT_BATCH_SIZE = 1000;
 
     /**
      * @var string

lib/internal/Magento/Framework/Mview/View/Subscription.php

@@ -11,6 +11,7 @@
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Ddl\Trigger;
 use Magento\Framework\DB\Ddl\TriggerFactory;
+use Magento\Framework\Exception\ConfigurationMismatchException;
 use Magento\Framework\Mview\Config;
 use Magento\Framework\Mview\ViewInterface;
 
@@ -71,6 +72,8 @@ class Subscription implements SubscriptionInterface
     /**
      * List of columns that can be updated in a specific subscribed table
      * for a specific view without creating a new change log entry
+     *
+     * @var array
      */
     private $ignoredUpdateColumnsBySubscription = [];
 
@@ -126,6 +129,7 @@ public function __construct(
     /**
      * Create subscription
      *
+     * @param bool $save
      * @return SubscriptionInterface
      */
     public function create(bool $save = true)
@@ -252,7 +256,8 @@ protected function prepareColumns(ViewInterface $view, string $event): array
     {
         $changelog = $view->getChangelog();
         $prefix = $event === Trigger::EVENT_DELETE ? 'OLD.' : 'NEW.';
-        $subscriptionData = $this->mviewConfig->getView($changelog->getViewId())['subscriptions'][$this->getTableName()];
+        $subscriptionData = $this->mviewConfig
+            ->getView($changelog->getViewId())['subscriptions'][$this->getTableName()];
         $columns = [
             'column_names' => [
                 'entity_id' => $this->connection->quoteIdentifier($changelog->getColumnName())
@@ -332,7 +337,7 @@ protected function buildStatement(string $event, ViewInterface $view): string
      * Instantiate and retrieve additional columns processor
      *
      * @return AdditionalColumnProcessorInterface
-     * @throws \Exception
+     * @throws ConfigurationMismatchException
      */
     private function getProcessor(): AdditionalColumnProcessorInterface
     {
@@ -341,15 +346,17 @@ private function getProcessor(): AdditionalColumnProcessorInterface
         $processor = ObjectManager::getInstance()->get($processorClass);
 
         if (!$processor instanceof AdditionalColumnProcessorInterface) {
-            throw new \Exception(
-                'Processor should implements ' . AdditionalColumnProcessorInterface::class
+            throw new ConfigurationMismatchException(
+                'Processor should implement ' . AdditionalColumnProcessorInterface::class
             );
         }
 
         return $processor;
     }
 
     /**
+     * Get subscription column for a view
+     *
      * @param string $prefix
      * @param ViewInterface $view
      * @return string