MC-38806: Wrong table comment after reindex

Author: OlgaVasyltsun

app/code/Magento/Catalog/Model/ResourceModel/Indexer/ActiveTableSwitcher.php

@@ -36,25 +36,13 @@ class ActiveTableSwitcher
     public function switchTable(\Magento\Framework\DB\Adapter\AdapterInterface $connection, array $tableNames)
     {
         $toRename = [];
-        $tableComment = '';
-        $replicaComment = '';
         foreach ($tableNames as $tableName) {
             $outdatedTableName = $tableName . $this->outdatedTableSuffix;
             $replicaTableName = $tableName . $this->additionalTableSuffix;
 
-            $tableCreateQuery = 'SHOW CREATE TABLE ' . $tableName;
-            $tableCreateResult = $connection->fetchRow($tableCreateQuery);
+            $tableComment = $connection->showTableStatus($tableName)['Comment'];
 
-            if (is_array($tableCreateResult)) {
-                $tableComment = $this->getTableComment($tableCreateResult);
-            }
-
-            $replicaCreateQuery = 'SHOW CREATE TABLE ' . $replicaTableName;
-            $replicaCreateResult = $connection->fetchRow($replicaCreateQuery);
-
-            if (is_array($replicaCreateResult)) {
-                $replicaComment = $this->getTableComment($replicaCreateResult);
-            }
+            $replicaComment = $connection->showTableStatus($replicaTableName)['Comment'];
 
             $renameBatch = [
                 [
@@ -71,15 +59,14 @@ public function switchTable(\Magento\Framework\DB\Adapter\AdapterInterface $conn
                 ]
             ];
 
-            $toRename = $this->mergeRenameTables($renameBatch, $toRename);
+            $toRename[] = $renameBatch;
 
             if (!empty($toRename) && $replicaComment !== '' && $tableComment !== $replicaComment) {
-                $changeTableComment   = sprintf("ALTER TABLE %s COMMENT=%s", $tableName, $replicaComment);
-                $connection->query($changeTableComment);
-                $changeReplicaComment = sprintf("ALTER TABLE %s COMMENT=%s", $replicaTableName, $tableComment);
-                $connection->query($changeReplicaComment);
+                $connection->changeTableComment($tableName, $replicaComment);
+                $connection->changeTableComment($replicaTableName, $tableComment);
             }
         }
+        $toRename = array_merge([], ...$toRename);
 
         if (!empty($toRename)) {
             $connection->renameTablesBatch($toRename);
@@ -96,37 +83,4 @@ public function getAdditionalTableName($tableName)
     {
         return $tableName . $this->additionalTableSuffix;
     }
-
-    /**
-     * Returns table comment
-     *
-     * @param array $tableCreateResult
-     * @return string
-     */
-    private function getTableComment($tableCreateResult)
-    {
-        $tableComment = '';
-        $replicaCommentPosition = strpos((string )end($tableCreateResult), "COMMENT=");
-        if ($replicaCommentPosition) {
-            $tableComment = substr((string )end($tableCreateResult), $replicaCommentPosition + 8);
-        }
-        return $tableComment;
-    }
-
-    /**
-     * Merges two arrays
-     *
-     * @param array $renameBatch
-     * @param array $toRename
-     * @return array
-     */
-    private function mergeRenameTables($renameBatch, $toRename)
-    {
-        foreach ($renameBatch as $batch) {
-            if (!in_array($batch, $toRename)) {
-                array_push($toRename, $batch);
-            }
-        }
-        return $toRename;
-    }
 }

app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Indexer/ActiveTableSwitcherTest.php

@@ -26,9 +26,21 @@ protected function setUp(): void
     public function testSwitch()
     {
         $connectionMock = $this->getMockBuilder(AdapterInterface::class)
+            ->addMethods(['changeTableComment'])
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
         $tableName = 'tableName';
+        $tableData = ['Comment' => 'Table comment'];
+        $replicaName = 'tableName_replica';
+        $replicaData = ['Comment' => 'Table comment replica'];
+
+        $connectionMock->expects($this->any())->method('showTableStatus')->willReturn($replicaData);
+
+        $connectionMock->expects($this->any())->method('showTableStatus')->willReturn($tableData);
+
+        $connectionMock->expects($this->any())->method('changeTableComment')->with($tableName, $replicaData['Comment']);
+
+        $connectionMock->expects($this->any())->method('changeTableComment')->with($replicaName, $tableData['Comment']);
 
         $connectionMock->expects($this->once())->method('renameTablesBatch')->with(
             [