Skip to content

Commit e8ff866

Browse files
Slabko,Michael(mslabko)Slabko,Michael(mslabko)
Slabko,Michael(mslabko)
authored and
Slabko,Michael(mslabko)
committed
Merge pull request #94 from magento-goinc/MAGETWO-23764
[GoInc+Nord] Bugfixing (part3)
2 parents 74f9337 + 02bfce7 commit e8ff866

File tree

10 files changed

+200
-41
lines changed

10 files changed

+200
-41
lines changed

‎app/code/Magento/Catalog/Model/ResourceModel/MaxHeapTableSizeProcessor.php

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
<?php
2+
/**
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\Catalog\Model\ResourceModel;
7+
8+
use Magento\Framework\App\ResourceConnection;
9+
10+
class MaxHeapTableSizeProcessor
11+
{
12+
/**
13+
* Database connection adapter
14+
*
15+
* @var \Magento\Framework\DB\Adapter\AdapterInterface
16+
*/
17+
protected $connection;
18+
19+
/**
20+
* @var int
21+
*/
22+
protected $defaultMaxHeapTableSie;
23+
24+
/**
25+
* Current max_heap_table_size value (in Bytes)
26+
*
27+
* @var int
28+
*/
29+
protected $currentMaxHeapTableSize = null;
30+
31+
/**
32+
* @param ResourceConnection $resource
33+
*/
34+
public function __construct(ResourceConnection $resource)
35+
{
36+
$this->connection = $resource->getConnection();
37+
$this->defaultMaxHeapTableSie = 1024 * 1024 * 64;
38+
}
39+
40+
/**
41+
* Set max_heap_table_size value in Bytes. By default value is 64M
42+
*
43+
* @param int|null $maxHeapTableSize
44+
* @throws \InvalidArgumentException
45+
* @throws \RuntimeException
46+
* @return void
47+
*/
48+
public function set($maxHeapTableSize = null)
49+
{
50+
$maxHeapTableSize = (int) (null === $maxHeapTableSize ? $this->defaultMaxHeapTableSie : $maxHeapTableSize);
51+
if (!$maxHeapTableSize) {
52+
throw new \InvalidArgumentException('Wrong max_heap_table_size parameter');
53+
}
54+
55+
$this->currentMaxHeapTableSize = (int)$this->connection->fetchOne('SELECT @@session.max_heap_table_size');
56+
if (!$this->currentMaxHeapTableSize) {
57+
throw new \RuntimeException('Can not extract max_heap_table_size');
58+
}
59+
60+
$this->connection->query('SET SESSION max_heap_table_size = ' . $maxHeapTableSize);
61+
}
62+
63+
/**
64+
* Restore max_heap_table_size value
65+
*
66+
* @throws \RuntimeException
67+
* @return void
68+
*/
69+
public function restore()
70+
{
71+
if (null === $this->currentMaxHeapTableSize) {
72+
throw new \RuntimeException('max_heap_table_size parameter is not set');
73+
}
74+
$this->connection->query('SET SESSION max_heap_table_size = ' . $this->currentMaxHeapTableSize);
75+
}
76+
}

‎app/code/Magento/Catalog/Plugin/Model/Indexer/Category/Product/MaxHeapTableSizeProcessorOnFullReindex.php

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
<?php
2+
/**
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Catalog\Plugin\Model\Indexer\Category\Product;
8+
9+
use Magento\Catalog\Model\Indexer\Category\Product\Action\Full;
10+
use Magento\Catalog\Model\ResourceModel\MaxHeapTableSizeProcessor;
11+
use Psr\Log\LoggerInterface;
12+
13+
class MaxHeapTableSizeProcessorOnFullReindex
14+
{
15+
/**
16+
* @var MaxHeapTableSizeProcessor
17+
*/
18+
protected $maxHeapTableSizeProcessor;
19+
20+
/**
21+
* @param MaxHeapTableSizeProcessor $maxHeapTableSizeProcessor
22+
* @param LoggerInterface $logger
23+
*/
24+
public function __construct(
25+
MaxHeapTableSizeProcessor $maxHeapTableSizeProcessor,
26+
LoggerInterface $logger
27+
) {
28+
$this->maxHeapTableSizeProcessor = $maxHeapTableSizeProcessor;
29+
$this->logger = $logger;
30+
}
31+
32+
/**
33+
* @param Full $subject
34+
* @return void
35+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
36+
*/
37+
public function beforeExecute(Full $subject)
38+
{
39+
try {
40+
$this->maxHeapTableSizeProcessor->set();
41+
} catch (\Exception $e) {
42+
$this->logger->error($e);
43+
}
44+
}
45+
46+
/**
47+
* @param Full $subject
48+
* @param Full $result
49+
* @return Full
50+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
51+
*/
52+
public function afterExecute(Full $subject, Full $result)
53+
{
54+
try {
55+
$this->maxHeapTableSizeProcessor->restore();
56+
} catch (\Exception $e) {
57+
$this->logger->error($e);
58+
}
59+
return $result;
60+
}
61+
}

‎app/code/Magento/Catalog/etc/adminhtml/di.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
</type>
6363
<type name="Magento\Catalog\Model\Indexer\Category\Product\Action\Full">
6464
<plugin name="invalidate_pagecache_after_full_reindex" type="Magento\Catalog\Plugin\Model\Indexer\Category\Product\Execute" />
65+
<plugin name="max_heap_tablse_size_processor_on_full_reindex" type="Magento\Catalog\Plugin\Model\Indexer\Category\Product\MaxHeapTableSizeProcessorOnFullReindex"/>
6566
</type>
6667
<type name="Magento\Catalog\Model\ResourceModel\Attribute">
6768
<plugin name="invalidate_pagecache_after_attribute_save" type="Magento\Catalog\Plugin\Model\ResourceModel\Attribute\Save" />

‎app/code/Magento/Reports/Test/Unit/Model/ResourceModel/Order/CollectionTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,7 @@ public function testPrepareSummary($useAggregatedData, $mainTable, $isFilter, $g
251251
*/
252252
public function testGetDateRangeFirstPart($range, $customStart, $customEnd, $expectedInterval)
253253
{
254+
$this->markTestIncomplete('MAGETWO-44815');
254255
$result = $this->collection->getDateRange($range, $customStart, $customEnd);
255256
$interval = $result['to']->diff($result['from']);
256257
$intervalResult = $interval->format('%y %m %d %h:%i:%s');

‎app/code/Magento/Sales/Model/Rss/OrderStatus.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,11 @@ public function getRssData()
113113
public function getCacheKey()
114114
{
115115
$order = $this->getOrder();
116-
return 'rss_order_status_data_' . md5($order->getId() . $order->getIncrementId() . $order->getCustomerId());
116+
$key = '';
117+
if ($order !== null) {
118+
$key = md5($order->getId() . $order->getIncrementId() . $order->getCustomerId());
119+
}
120+
return 'rss_order_status_data_' . $key;
117121
}
118122

119123
/**
@@ -150,7 +154,7 @@ protected function getOrder()
150154
$order = $this->orderFactory->create();
151155
$order->load($data['order_id']);
152156

153-
if ($order->getIncrementId() != $data['increment_id'] || $order->getCustomerId() != $data['customer_id']) {
157+
if ($order->getIncrementId() !== $data['increment_id'] || $order->getCustomerId() !== $data['customer_id']) {
154158
$order = null;
155159
}
156160
$this->order = $order;

‎app/code/Magento/Sales/Test/Unit/Model/Rss/OrderStatusTest.php

Lines changed: 47 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -132,12 +132,14 @@ protected function setUp()
132132
]
133133
);
134134
}
135-
public function testGetData()
135+
136+
public function testGetRssData()
136137
{
137-
$this->orderFactory->expects($this->once())->method('create')->will($this->returnValue($this->order));
138-
$this->requestInterface->expects($this->any())->method('getParam')
139-
->with('data')
140-
->will($this->returnValue('eyJvcmRlcl9pZCI6MSwiaW5jcmVtZW50X2lkIjoiMTAwMDAwMDAxIiwiY3VzdG9tZXJfaWQiOjF9'));
138+
$this->orderFactory->expects($this->once())->method('create')->willReturn($this->order);
139+
$requestData = base64_encode('{"order_id":1,"increment_id":"100000001","customer_id":1}');
140+
141+
$this->requestInterface->expects($this->any())->method('getParam')->with('data')->willReturn($requestData);
142+
141143
$resource = $this->getMockBuilder('\Magento\Sales\Model\ResourceModel\Order\Rss\OrderStatus')
142144
->setMethods(['getAllCommentCollection'])
143145
->disableOriginalConstructor()
@@ -148,15 +150,34 @@ public function testGetData()
148150
'created_at' => '2014-10-09 18:25:50',
149151
'comment' => 'Some comment',
150152
];
151-
$resource->expects($this->once())->method('getAllCommentCollection')->will($this->returnValue([$comment]));
152-
$this->orderStatusFactory->expects($this->once())->method('create')->will($this->returnValue($resource));
153+
$resource->expects($this->once())->method('getAllCommentCollection')->willReturn([$comment]);
154+
$this->orderStatusFactory->expects($this->once())->method('create')->willReturn($resource);
153155
$this->urlInterface->expects($this->any())->method('getUrl')
154156
->with('sales/order/view', ['order_id' => 1])
155157
->will($this->returnValue('http://magento.com/sales/order/view/order_id/1'));
156158

157159
$this->assertEquals($this->feedData, $this->model->getRssData());
158160
}
159161

162+
/**
163+
* @expectedException \InvalidArgumentException
164+
* @expectedExceptionMessage Order not found.
165+
*/
166+
public function testGetRssDataWithError()
167+
{
168+
$this->orderFactory->expects($this->once())->method('create')->willReturn($this->order);
169+
170+
$requestData = base64_encode('{"order_id":"1","increment_id":true,"customer_id":true}');
171+
172+
$this->requestInterface->expects($this->any())->method('getParam')->with('data')->willReturn($requestData);
173+
174+
$this->orderStatusFactory->expects($this->never())->method('create');
175+
176+
$this->urlInterface->expects($this->never())->method('getUrl');
177+
178+
$this->assertEquals($this->feedData, $this->model->getRssData());
179+
}
180+
160181
public function testIsAllowed()
161182
{
162183
$this->scopeConfigInterface->expects($this->once())->method('getValue')
@@ -165,13 +186,29 @@ public function testIsAllowed()
165186
$this->assertTrue($this->model->isAllowed());
166187
}
167188

168-
public function testGetCacheKey()
189+
/**
190+
* @param string $requestData
191+
* @param string $result
192+
* @dataProvider getCacheKeyDataProvider
193+
*/
194+
public function testGetCacheKey($requestData, $result)
169195
{
170196
$this->requestInterface->expects($this->any())->method('getParam')
171197
->with('data')
172-
->will($this->returnValue('eyJvcmRlcl9pZCI6MSwiaW5jcmVtZW50X2lkIjoiMTAwMDAwMDAxIiwiY3VzdG9tZXJfaWQiOjF9'));
198+
->will($this->returnValue($requestData));
173199
$this->orderFactory->expects($this->once())->method('create')->will($this->returnValue($this->order));
174-
$this->assertEquals('rss_order_status_data_' . md5('11000000011'), $this->model->getCacheKey());
200+
$this->assertEquals('rss_order_status_data_' . $result, $this->model->getCacheKey());
201+
}
202+
203+
/**
204+
* @return array
205+
*/
206+
public function getCacheKeyDataProvider()
207+
{
208+
return [
209+
[base64_encode('{"order_id":1,"increment_id":"100000001","customer_id":1}'), md5('11000000011')],
210+
[base64_encode('{"order_id":"1","increment_id":true,"customer_id":true}'), '']
211+
];
175212
}
176213

177214
public function testGetCacheLifetime()

‎app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/js.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ require([
265265
setRowVisibility('is_unique', false);
266266
setRowVisibility('frontend_class', false);
267267
break;
268-
<?php $hiddenFields = $block->helper('Magento\Catalog\Helper\Data')->getAttributeHiddenFields() ?>
268+
<?php $hiddenFields = $this->helper('Magento\Catalog\Helper\Data')->getAttributeHiddenFields() ?>
269269
<?php foreach ($hiddenFields as $type => $fields): ?>
270270
<?php if (in_array($type, array('swatch_visual', 'swatch_text'))) continue ?>
271271
case '<?php echo $block->escapeHtml($type); ?>':

‎app/code/Magento/Swatches/view/adminhtml/web/js/text.js

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ define([
2626
template: mageTemplate('#swatch-text-row-template'),
2727
add: function (data, render) {
2828
var isNewOption = false,
29-
element, visibleRadio;
29+
element;
3030

3131
if (typeof data.id == 'undefined') {
3232
data = {
@@ -44,18 +44,8 @@ define([
4444
data: data
4545
});
4646

47-
if (isNewOption) {
48-
visibleRadio = $$('#swatch-text-options-panel [name="defaulttext[]"]').findAll(function (el) {
49-
return el.up().up().visible();
50-
});
51-
52-
if (visibleRadio.length === 1) {
53-
visibleRadio[0].checked = true;
54-
}
55-
56-
if (!this.isReadOnly) {
57-
this.enableNewOptionDeleteButton(data.id);
58-
}
47+
if (isNewOption && !this.isReadOnly) {
48+
this.enableNewOptionDeleteButton(data.id);
5949
}
6050
this.itemCount++;
6151
this.totalItems++;

‎app/code/Magento/Swatches/view/adminhtml/web/js/visual.js

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ define([
2626
template: mageTemplate('#swatch-visual-row-template'),
2727
add: function (data, render) {
2828
var isNewOption = false,
29-
element, visibleRadio;
29+
element;
3030

3131
if (typeof data.id == 'undefined') {
3232
data = {
@@ -46,20 +46,8 @@ define([
4646
data: data
4747
});
4848

49-
if (isNewOption) {
50-
visibleRadio = $$('#swatch-visual-options-panel [name="defaultvisual[]"]').findAll(
51-
function (el) {
52-
return el.up().up().visible();
53-
}
54-
);
55-
56-
if (visibleRadio.length === 1) {
57-
visibleRadio[0].checked = true;
58-
}
59-
60-
if (!this.isReadOnly) {
61-
this.enableNewOptionDeleteButton(data.id);
62-
}
49+
if (isNewOption && !this.isReadOnly) {
50+
this.enableNewOptionDeleteButton(data.id);
6351
}
6452
this.itemCount++;
6553
this.totalItems++;

‎dev/tests/integration/testsuite/Magento/SalesRule/Model/ResourceModel/Rule/CollectionTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ public function testMultiRulesWithTimezone()
8080
*/
8181
public function testMultiRulesWithDifferentTimezone()
8282
{
83+
$this->markTestIncomplete('MAGETWO-44815');
8384
$this->setSpecificTimezone('Australia/Sydney');
8485
$collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
8586
'Magento\SalesRule\Model\ResourceModel\Rule\Collection'

0 commit comments

Comments
 (0)