Merge remote-tracking branch 'folks/MAGETWO-64518' into PRS

Author: slavvka

app/code/Magento/Catalog/Model/Indexer/Category/Product/Action/Full.php

@@ -95,7 +95,7 @@ public function __construct(
     public function execute()
     {
         $this->reindex();
-        $this->activeTableSwitcher->switchTable($this->connection, $this->getMainTable());
+        $this->activeTableSwitcher->switchTable($this->connection, [$this->getMainTable()]);
         return $this;
     }
 

app/code/Magento/Catalog/Model/Indexer/Product/Eav/Action/Full.php

@@ -97,7 +97,7 @@ public function execute($ids = null)
                         $this->syncData($indexer, $mainTable);
                     }
                 }
-                $this->activeTableSwitcher->switchTable($indexer->getConnection(), $indexer->getMainTable());
+                $this->activeTableSwitcher->switchTable($indexer->getConnection(), [$indexer->getMainTable()]);
             }
         } catch (\Exception $e) {
             throw new \Magento\Framework\Exception\LocalizedException(__($e->getMessage()), $e);

app/code/Magento/Catalog/Model/Indexer/Product/Price/Action/Full.php

@@ -150,7 +150,7 @@ public function execute($ids = null)
             }
             $this->activeTableSwitcher->switchTable(
                 $this->_defaultIndexerResource->getConnection(),
-                $this->_defaultIndexerResource->getMainTable()
+                [$this->_defaultIndexerResource->getMainTable()]
             );
         } catch (\Exception $e) {
             throw new \Magento\Framework\Exception\LocalizedException(__($e->getMessage()), $e);

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

@@ -20,16 +20,17 @@ class ActiveTableSwitcher
      * Switch index tables from replica to active.
      *
      * @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
-     * @param string $tableName
+     * @param array $tableNames
      * @return void
      */
-    public function switchTable(\Magento\Framework\DB\Adapter\AdapterInterface $connection, $tableName)
+    public function switchTable(\Magento\Framework\DB\Adapter\AdapterInterface $connection, array $tableNames)
     {
-        $outdatedTableName = $tableName . $this->outdatedTableSuffix;
-        $replicaTableName = $tableName . $this->additionalTableSuffix;
+        $toRename = [];
+        foreach ($tableNames as $tableName) {
+            $outdatedTableName = $tableName . $this->outdatedTableSuffix;
+            $replicaTableName = $tableName . $this->additionalTableSuffix;
 
-        $connection->renameTablesBatch(
-            [
+            $renameBatch = [
                 [
                     'oldName' => $tableName,
                     'newName' => $outdatedTableName
@@ -42,8 +43,13 @@ public function switchTable(\Magento\Framework\DB\Adapter\AdapterInterface $conn
                     'oldName' => $outdatedTableName,
                     'newName' => $replicaTableName
                 ]
-            ]
-        );
+            ];
+            $toRename = array_merge($toRename, $renameBatch);
+        }
+
+        if (!empty($toRename)) {
+            $connection->renameTablesBatch($toRename);
+        }
     }
 
     /**

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

@@ -42,7 +42,7 @@ public function testSwitch()
             ]
         );
 
-        $this->model->switchTable($connectionMock, $tableName);
+        $this->model->switchTable($connectionMock, [$tableName]);
     }
 
     public function testGetAdditionalTableName()

app/code/Magento/CatalogInventory/Model/Indexer/Stock/Action/Full.php

@@ -159,7 +159,7 @@ public function execute($ids = null)
                     }
                 }
             }
-            $this->activeTableSwitcher->switchTable($indexer->getConnection(), $indexer->getMainTable());
+            $this->activeTableSwitcher->switchTable($indexer->getConnection(), [$indexer->getMainTable()]);
         } catch (\Exception $e) {
             throw new LocalizedException(__($e->getMessage()), $e);
         }