-
Notifications
You must be signed in to change notification settings - Fork 9.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #94 from magento-goinc/MAGETWO-23764
[GoInc+Nord] Bugfixing (part3)
- Loading branch information
Showing
10 changed files
with
200 additions
and
41 deletions.
There are no files selected for viewing
76 changes: 76 additions & 0 deletions
76
app/code/Magento/Catalog/Model/ResourceModel/MaxHeapTableSizeProcessor.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © 2015 Magento. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| namespace Magento\Catalog\Model\ResourceModel; | ||
|
|
||
| use Magento\Framework\App\ResourceConnection; | ||
|
|
||
| class MaxHeapTableSizeProcessor | ||
| { | ||
| /** | ||
| * Database connection adapter | ||
| * | ||
| * @var \Magento\Framework\DB\Adapter\AdapterInterface | ||
| */ | ||
| protected $connection; | ||
|
|
||
| /** | ||
| * @var int | ||
| */ | ||
| protected $defaultMaxHeapTableSie; | ||
|
|
||
| /** | ||
| * Current max_heap_table_size value (in Bytes) | ||
| * | ||
| * @var int | ||
| */ | ||
| protected $currentMaxHeapTableSize = null; | ||
|
|
||
| /** | ||
| * @param ResourceConnection $resource | ||
| */ | ||
| public function __construct(ResourceConnection $resource) | ||
| { | ||
| $this->connection = $resource->getConnection(); | ||
| $this->defaultMaxHeapTableSie = 1024 * 1024 * 64; | ||
| } | ||
|
|
||
| /** | ||
| * Set max_heap_table_size value in Bytes. By default value is 64M | ||
| * | ||
| * @param int|null $maxHeapTableSize | ||
| * @throws \InvalidArgumentException | ||
| * @throws \RuntimeException | ||
| * @return void | ||
| */ | ||
| public function set($maxHeapTableSize = null) | ||
| { | ||
| $maxHeapTableSize = (int) (null === $maxHeapTableSize ? $this->defaultMaxHeapTableSie : $maxHeapTableSize); | ||
| if (!$maxHeapTableSize) { | ||
| throw new \InvalidArgumentException('Wrong max_heap_table_size parameter'); | ||
| } | ||
|
|
||
| $this->currentMaxHeapTableSize = (int)$this->connection->fetchOne('SELECT @@session.max_heap_table_size'); | ||
| if (!$this->currentMaxHeapTableSize) { | ||
| throw new \RuntimeException('Can not extract max_heap_table_size'); | ||
| } | ||
|
|
||
| $this->connection->query('SET SESSION max_heap_table_size = ' . $maxHeapTableSize); | ||
| } | ||
|
|
||
| /** | ||
| * Restore max_heap_table_size value | ||
| * | ||
| * @throws \RuntimeException | ||
| * @return void | ||
| */ | ||
| public function restore() | ||
| { | ||
| if (null === $this->currentMaxHeapTableSize) { | ||
| throw new \RuntimeException('max_heap_table_size parameter is not set'); | ||
| } | ||
| $this->connection->query('SET SESSION max_heap_table_size = ' . $this->currentMaxHeapTableSize); | ||
| } | ||
| } |
61 changes: 61 additions & 0 deletions
61
.../Catalog/Plugin/Model/Indexer/Category/Product/MaxHeapTableSizeProcessorOnFullReindex.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © 2015 Magento. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
|
|
||
| namespace Magento\Catalog\Plugin\Model\Indexer\Category\Product; | ||
|
|
||
| use Magento\Catalog\Model\Indexer\Category\Product\Action\Full; | ||
| use Magento\Catalog\Model\ResourceModel\MaxHeapTableSizeProcessor; | ||
| use Psr\Log\LoggerInterface; | ||
|
|
||
| class MaxHeapTableSizeProcessorOnFullReindex | ||
| { | ||
| /** | ||
| * @var MaxHeapTableSizeProcessor | ||
| */ | ||
| protected $maxHeapTableSizeProcessor; | ||
|
|
||
| /** | ||
| * @param MaxHeapTableSizeProcessor $maxHeapTableSizeProcessor | ||
| * @param LoggerInterface $logger | ||
| */ | ||
| public function __construct( | ||
| MaxHeapTableSizeProcessor $maxHeapTableSizeProcessor, | ||
| LoggerInterface $logger | ||
| ) { | ||
| $this->maxHeapTableSizeProcessor = $maxHeapTableSizeProcessor; | ||
| $this->logger = $logger; | ||
| } | ||
|
|
||
| /** | ||
| * @param Full $subject | ||
| * @return void | ||
| * @SuppressWarnings(PHPMD.UnusedFormalParameter) | ||
| */ | ||
| public function beforeExecute(Full $subject) | ||
| { | ||
| try { | ||
| $this->maxHeapTableSizeProcessor->set(); | ||
| } catch (\Exception $e) { | ||
| $this->logger->error($e); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * @param Full $subject | ||
| * @param Full $result | ||
| * @return Full | ||
| * @SuppressWarnings(PHPMD.UnusedFormalParameter) | ||
| */ | ||
| public function afterExecute(Full $subject, Full $result) | ||
| { | ||
| try { | ||
| $this->maxHeapTableSizeProcessor->restore(); | ||
| } catch (\Exception $e) { | ||
| $this->logger->error($e); | ||
| } | ||
| return $result; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters