Merge branch '5886/mysql-wait-timeout' into develop

Author: schmengler

src/app/code/community/IntegerNet/Solr/Model/Bridge/LazyCategoryIterator.php

@@ -42,6 +42,11 @@ class IntegerNet_Solr_Model_Bridge_LazyCategoryIterator implements CategoryItera
      */
     protected $_collectionIterator;
 
+    /**
+     * @var IntegerNet_Solr_Model_Resource_Db
+     */
+    protected $_dbResource;
+
     /**
      * @link http://php.net/manual/en/outeriterator.getinneriterator.php
      * @return Iterator The inner iterator for the current entry.
@@ -63,6 +68,7 @@ public function __construct($_storeId, $_categoryIdFilter, $_categorySize)
         $this->_storeId = $_storeId;
         $this->_categoryIdFilter = $_categoryIdFilter;
         $this->_categorySize = $_categorySize;
+        $this->_dbResource = Mage::getResourceModel('integernet_solr/db');
     }
 
     /**
@@ -92,6 +98,7 @@ public function valid()
         } elseif ($this->_currentCategory < $this->_collection->getLastPageNumber()) {
             $this->_currentCategory++;
             $this->_collection = self::getCategoryCollection($this->_storeId, $this->_categoryIdFilter, $this->_categorySize, $this->_currentCategory);
+            $this->_dbResource->disconnectMysql();
             $this->_collectionIterator = $this->_collection->getIterator();
             $this->getInnerIterator()->rewind();
             return $this->getInnerIterator()->valid();
@@ -106,6 +113,7 @@ public function rewind()
     {
         $this->_currentCategory = 1;
         $this->_collection = self::getCategoryCollection($this->_storeId, $this->_categoryIdFilter, $this->_categorySize, $this->_currentCategory);
+        $this->_dbResource->disconnectMysql();
         $this->_collectionIterator = $this->_collection->getIterator();
         $this->_collectionIterator->rewind();
     }

src/app/code/community/IntegerNet/Solr/Model/Bridge/LazyPageIterator.php

@@ -42,6 +42,11 @@ class IntegerNet_Solr_Model_Bridge_LazyPageIterator implements PageIterator, Out
      */
     protected $_collectionIterator;
 
+    /**
+     * @var IntegerNet_Solr_Model_Resource_Db
+     */
+    protected $_dbResource;
+
     /**
      * @link http://php.net/manual/en/outeriterator.getinneriterator.php
      * @return Iterator The inner iterator for the current entry.
@@ -63,6 +68,7 @@ public function __construct($_storeId, $_pageIdFilter, $_pageSize)
         $this->_storeId = $_storeId;
         $this->_pageIdFilter = $_pageIdFilter;
         $this->_pageSize = $_pageSize;
+        $this->_dbResource = Mage::getResourceModel('integernet_solr/db');
     }
 
     /**
@@ -92,6 +98,7 @@ public function valid()
         } elseif ($this->_currentPage < $this->_collection->getLastPageNumber()) {
             $this->_currentPage++;
             $this->_collection = self::getPageCollection($this->_storeId, $this->_pageIdFilter, $this->_pageSize, $this->_currentPage);
+            $this->_dbResource->disconnectMysql();
             $this->_collectionIterator = $this->_collection->getIterator();
             $this->getInnerIterator()->rewind();
             return $this->getInnerIterator()->valid();
@@ -106,6 +113,7 @@ public function rewind()
     {
         $this->_currentPage = 1;
         $this->_collection = self::getPageCollection($this->_storeId, $this->_pageIdFilter, $this->_pageSize, $this->_currentPage);
+        $this->_dbResource->disconnectMysql();
         $this->_collectionIterator = $this->_collection->getIterator();
         $this->_collectionIterator->rewind();
     }

src/app/code/community/IntegerNet/Solr/Model/Bridge/LazyProductIterator.php

@@ -43,6 +43,11 @@ class IntegerNet_Solr_Model_Bridge_LazyProductIterator implements PagedProductIt
      */
     protected $_collectionIterator;
 
+    /**
+     * @var IntegerNet_Solr_Model_Resource_Db
+     */
+    protected $_dbResource;
+
     /**
      * @link http://php.net/manual/en/outeriterator.getinneriterator.php
      * @return Iterator The inner iterator for the current entry.
@@ -61,6 +66,7 @@ public function __construct($_storeId, ProductIdChunks $productIdChunks)
         $this->_bridgeFactory = Mage::getModel('integernet_solr/bridge_factory');
         $this->_storeId = $_storeId;
         $this->_productIdChunks = $productIdChunks;
+        $this->_dbResource = Mage::getResourceModel('integernet_solr/db');
     }
 
     /**
@@ -100,6 +106,7 @@ public function valid()
         } elseif ($this->_currentChunkId < sizeof($this->_productIdChunks) - 1) {
             $this->_currentChunkId++;
             $this->_collection = self::getProductCollection($this->_storeId, $this->_productIdChunks, $this->_currentChunkId);
+            $this->_dbResource->disconnectMysql();
             $this->_collectionIterator = $this->_collection->getIterator();
             $this->getInnerIterator()->rewind();
             return $this->validInner();
@@ -114,6 +121,7 @@ public function rewind()
     {
         $this->_currentChunkId = 0;
         $this->_collection = self::getProductCollection($this->_storeId, $this->_productIdChunks, $this->_currentChunkId);
+        $this->_dbResource->disconnectMysql();
         $this->_collectionIterator = $this->_collection->getIterator();
         $this->_collectionIterator->rewind();
     }
@@ -182,6 +190,7 @@ private function validInner()
     {
         $valid = $this->getInnerIterator()->valid();
         if (! $valid) {
+            $this->_dbResource->disconnectMysql();
             call_user_func($this->_pageCallback, $this);
         }
         return $valid;
@@ -228,5 +237,4 @@ public function subset($ids)
         return $this->_bridgeFactory->createProductIterator($dataCollection);
     }
 
-
 }

src/app/code/community/IntegerNet/Solr/Model/Resource/Db.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * integer_net Magento Module
+ *
+ * @category   IntegerNet
+ * @package    IntegerNet_Solr
+ * @copyright  Copyright (c) 2016 integer_net GmbH (http://www.integer-net.de/)
+ * @author     Fabian Schmengler <fs@integer-net.de>
+ */
+class IntegerNet_Solr_Model_Resource_Db
+{
+    /**
+     * Close all open MySQL connections (will be automatically reopened by Magento if used)
+     *
+     * Can be called during indexing to prevent wait timeout
+     */
+    public function disconnectMysql()
+    {
+        /** @var Zend_Db_Adapter_Abstract $connection */
+        foreach (Mage::getSingleton('core/resource')->getConnections() as $name => $connection) {
+            if ($connection instanceof Zend_Db_Adapter_Abstract) {
+                $connection->closeConnection();
+            }
+        }
+    }
+}