MAGETWO-64954: [Performance] Fix innodb_lock_wait_timeout in the application

Author: AVoskoboinikov

lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php

@@ -356,6 +356,7 @@ public function convertDateTime($datetime)
      *
      * @return void
      * @throws \Zend_Db_Adapter_Exception
+     * @throws \Zend_Db_Statement_Exception
      */
     protected function _connect()
     {
@@ -399,7 +400,10 @@ protected function _connect()
         $this->_connection->query("SET time_zone = '+00:00'");
 
         if (isset($this->_config['initStatements'])) {
-            $this->query($this->_config['initStatements']);
+            $statements = $this->_splitMultiQuery($this->_config['initStatements']);
+            foreach ($statements as $statement) {
+                $this->_query($statement);
+            }
         }
 
         if (!$this->_connectionFlagsSet) {

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

@@ -299,6 +299,8 @@ public function testUpdate()
         $currentVersionId = 3;
         $lastVersionId = 1;
         $listId = [2, 3];
+        $defaultBatchSize = 1000;
+
         $this->stateMock->expects($this->any())
             ->method('getViewId')
             ->will($this->returnValue(1));
@@ -331,7 +333,7 @@ public function testUpdate()
             'getList'
         )->with(
             $lastVersionId,
-            $currentVersionId
+            $lastVersionId + $defaultBatchSize
         )->will(
             $this->returnValue($listId)
         );
@@ -361,6 +363,8 @@ public function testUpdateWithException()
         $currentVersionId = 3;
         $lastVersionId = 1;
         $listId = [2, 3];
+        $defaultBatchSize = 1000;
+
         $this->stateMock->expects($this->any())
             ->method('getViewId')
             ->will($this->returnValue(1));
@@ -392,7 +396,7 @@ public function testUpdateWithException()
             'getList'
         )->with(
             $lastVersionId,
-            $currentVersionId
+            $lastVersionId + $defaultBatchSize
         )->will(
             $this->returnValue($listId)
         );

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

@@ -46,6 +46,21 @@ class View extends \Magento\Framework\DataObject implements ViewInterface
      */
     protected $state;
 
+    /**
+     * @var array
+     */
+    protected $changelogBatchSize = [
+        'default_size' => 1000,
+        'catalog_category_product' => 1000,
+        'catalog_product_category' => 1000,
+        'catalog_product_price' => 1000,
+        'catalog_product_attribute' => 1000,
+        'cataloginventory_stock' => 1000,
+        'catalogrule_rule' => 1000,
+        'catalogrule_product' => 1000,
+        'catalogsearch_fulltext' => 1000,
+    ];
+
     /**
      * @param ConfigInterface $config
      * @param ActionFactory $actionFactory
@@ -253,26 +268,36 @@ public function update()
             } catch (ChangelogTableNotExistsException $e) {
                 return;
             }
-            $lastVersionId = $this->getState()->getVersionId();
-            $ids = $this->getChangelog()->getList($lastVersionId, $currentVersionId);
-            if ($ids) {
-                $action = $this->actionFactory->get($this->getActionClass());
+            $lastVersionId = (int) $this->getState()->getVersionId();
+            $action = $this->actionFactory->get($this->getActionClass());
+
+            try {
                 $this->getState()->setStatus(View\StateInterface::STATUS_WORKING)->save();
-                try {
-                    $action->execute($ids);
-                    $this->getState()->loadByView($this->getId());
-                    $statusToRestore = $this->getState()->getStatus() == View\StateInterface::STATUS_SUSPENDED
-                        ? View\StateInterface::STATUS_SUSPENDED
-                        : View\StateInterface::STATUS_IDLE;
-                    $this->getState()->setVersionId($currentVersionId)->setStatus($statusToRestore)->save();
-                } catch (\Exception $exception) {
-                    $this->getState()->loadByView($this->getId());
-                    $statusToRestore = $this->getState()->getStatus() == View\StateInterface::STATUS_SUSPENDED
-                        ? View\StateInterface::STATUS_SUSPENDED
-                        : View\StateInterface::STATUS_IDLE;
-                    $this->getState()->setStatus($statusToRestore)->save();
-                    throw $exception;
+
+                $batchSize = isset($this->changelogBatchSize[$this->getChangelog()->getViewId()])
+                    ? $this->changelogBatchSize[$this->getChangelog()->getViewId()]
+                    : $this->changelogBatchSize['default_size'];
+
+                for ($versionFrom = $lastVersionId; $versionFrom < $currentVersionId; $versionFrom += $batchSize) {
+                    $ids = $this->getChangelog()->getList($versionFrom, $versionFrom + $batchSize);
+
+                    if (!empty($ids)) {
+                        $action->execute($ids);
+                    }
                 }
+
+                $this->getState()->loadByView($this->getId());
+                $statusToRestore = $this->getState()->getStatus() == View\StateInterface::STATUS_SUSPENDED
+                    ? View\StateInterface::STATUS_SUSPENDED
+                    : View\StateInterface::STATUS_IDLE;
+                $this->getState()->setVersionId($currentVersionId)->setStatus($statusToRestore)->save();
+            } catch (\Exception $exception) {
+                $this->getState()->loadByView($this->getId());
+                $statusToRestore = $this->getState()->getStatus() == View\StateInterface::STATUS_SUSPENDED
+                    ? View\StateInterface::STATUS_SUSPENDED
+                    : View\StateInterface::STATUS_IDLE;
+                $this->getState()->setStatus($statusToRestore)->save();
+                throw $exception;
             }
         }
     }