Merge remote-tracking branch '30699/indexer-unsubscribe-drop' into community_prs_march

Author: Indrani Sonawane

app/code/Magento/Indexer/Model/Indexer.php

@@ -326,6 +326,7 @@ public function setScheduled($scheduled)
             $this->getView()->subscribe();
         } else {
             $this->getView()->unsubscribe();
+            $this->invalidate();
         }
         $this->getState()->save();
     }

app/code/Magento/Indexer/Setup/Recurring.php

@@ -121,7 +121,14 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
 
             $indexer = $this->indexerFactory->create()->load($indexerId);
             if ($indexer->isScheduled()) {
-                $indexer->getView()->unsubscribe()->subscribe();
+                // The purpose of the following two lines is to ensure that any
+                // database triggers are correctly set up for this indexer. We
+                // are calling methods on the view directly because we want to
+                // choose to not drop the changelog tables at this time. This
+                // also intentionally bypasses the $indexer->invalidate() call
+                // within $indexer->setScheduled().
+                $indexer->getView()->unsubscribe(false);
+                $indexer->getView()->subscribe();
             }
         }
     }

app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php

@@ -523,12 +523,18 @@ public function testIsScheduled()
      */
     public function testSetScheduled($scheduled, $method)
     {
-        $stateMock = $this->createPartialMock(State::class, ['load', 'save']);
+        $stateMock = $this->createPartialMock(State::class, ['load', 'save', 'setStatus']);
 
         $this->stateFactoryMock->expects($this->once())->method('create')->willReturn($stateMock);
         $this->viewMock->expects($this->once())->method('load')->willReturnSelf();
-        $this->viewMock->expects($this->once())->method($method)->willReturn(true);
-        $stateMock->expects($this->once())->method('save')->willReturnSelf();
+        $this->viewMock->expects($this->once())->method($method)->willReturnSelf();
+        $stateMock->expects($this->atLeastOnce())->method('save')->willReturnSelf();
+        if (!$scheduled) {
+            $stateMock->expects($this->once())
+                ->method('setStatus')
+                ->with(StateInterface::STATUS_INVALID)
+                ->willReturnSelf();
+        }
         $this->model->setScheduled($scheduled);
     }
 

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

@@ -194,7 +194,11 @@ public function testUnsubscribe()
         $this->stateMock->expects($this->once())
             ->method('setMode')
             ->with(StateInterface::MODE_DISABLED)->willReturnSelf();
-        $this->changelogMock->expects($this->never())
+        $this->stateMock->expects($this->once())
+            ->method('setStatus')
+            ->with(StateInterface::STATUS_IDLE)
+            ->willReturnSelf();
+        $this->changelogMock->expects($this->once())
             ->method('drop');
         $subscriptionMock = $this->createPartialMock(Subscription::class, ['remove']);
         $subscriptionMock->expects($this->exactly(1))->method('remove');
@@ -221,6 +225,8 @@ public function testUnsubscribeDisabled()
             ->method('setVersionId');
         $this->stateMock->expects($this->never())
             ->method('setMode');
+        $this->stateMock->expects($this->never())
+            ->method('setStatus');
         $this->changelogMock->expects($this->never())
             ->method('drop');
         $this->subscriptionFactoryMock->expects($this->never())

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

@@ -219,21 +219,32 @@ public function subscribe()
     }
 
     /**
-     * Remove subscriptions
-     *
-     * @return ViewInterface
-     * @throws Exception
+     * @inheritDoc
      */
-    public function unsubscribe()
+    public function unsubscribe(bool $dropTable = true): ViewInterface
     {
         if ($this->getState()->getMode() != View\StateInterface::MODE_DISABLED) {
             // Remove subscriptions
             foreach ($this->getSubscriptions() as $subscriptionConfig) {
                 $this->initSubscriptionInstance($subscriptionConfig)->remove();
             }
 
+            if ($dropTable) {
+                try {
+                    $this->getChangelog()->drop();
+                    // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock.DetectedCatch
+                } catch (ChangelogTableNotExistsException $e) {
+                    // We want the table to not exist, and it doesn't. All done.
+                }
+
+                $this->getState()->setVersionId(0);
+            }
+
             // Update view state
-            $this->getState()->setMode(View\StateInterface::MODE_DISABLED)->save();
+            $this->getState()
+                ->setMode(View\StateInterface::MODE_DISABLED)
+                ->setStatus(View\StateInterface::STATUS_IDLE)
+                ->save();
         }
 
         return $this;

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

@@ -60,12 +60,13 @@ public function load($viewId);
     public function subscribe();
 
     /**
-     * Remove subscriptions
+     * Remove subscriptions and optionally drop the changelog table
      *
+     * @param bool $dropTable
      * @throws \Exception
      * @return ViewInterface
      */
-    public function unsubscribe();
+    public function unsubscribe(bool $dropTable = true): ViewInterface;
 
     /**
      * Materialize view by IDs in changelog