Skip to content

Commit cd7d717

Browse files
vpelipenkovpelipenko
committed
Merge pull request #268 from magento-troll/kpi
[Troll] Kpi build & bugfixes
2 parents b0c7944 + 58744c0 commit cd7d717

File tree

9 files changed

+242
-6
lines changed

9 files changed

+242
-6
lines changed

‎app/code/Magento/Theme/view/adminhtml/requirejs-config.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55

66
var config = {
77
"shim": {
8+
"extjs/ext-tree": [
9+
"prototype"
10+
],
811
"extjs/ext-tree-checkbox": [
912
"extjs/ext-tree",
1013
"extjs/defaults"

‎dev/tests/integration/testsuite/Magento/ToolkitFramework/_files/small.xml

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
<!-- The price rule condition: minimum products amount in shopping cart for price rule to be applied -->
3030
<customers>20</customers>
3131
<!-- Number of customers to generate -->
32+
<orders>80</orders>
33+
<!-- Orders count -->
3234
<configs> <!-- Config variables and values for change -->
3335
<config>
3436
<path>admin/security/use_form_key</path>
@@ -79,5 +81,39 @@
7981
<value>8080</value>
8082
</config>
8183
</configs>
84+
<indexers> <!-- Indexer mode value (true - Update by Schedule, false - Update on Save) -->
85+
<indexer>
86+
<id>catalog_category_product</id>
87+
<set_scheduled>false</set_scheduled>
88+
</indexer>
89+
<indexer>
90+
<id>catalog_product_category</id>
91+
<set_scheduled>false</set_scheduled>
92+
</indexer>
93+
<indexer>
94+
<id>catalog_product_price</id>
95+
<set_scheduled>false</set_scheduled>
96+
</indexer>
97+
<indexer>
98+
<id>catalog_product_attribute</id>
99+
<set_scheduled>false</set_scheduled>
100+
</indexer>
101+
<indexer>
102+
<id>cataloginventory_stock</id>
103+
<set_scheduled>false</set_scheduled>
104+
</indexer>
105+
<indexer>
106+
<id>catalogrule_rule</id>
107+
<set_scheduled>false</set_scheduled>
108+
</indexer>
109+
<indexer>
110+
<id>catalogrule_product</id>
111+
<set_scheduled>false</set_scheduled>
112+
</indexer>
113+
<indexer>
114+
<id>catalogsearch_fulltext</id>
115+
<set_scheduled>false</set_scheduled>
116+
</indexer>
117+
</indexers>
82118
</profile>
83-
</config>
119+
</config>

‎dev/tools/performance-toolkit/fixtures/indexers_states_apply.php

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<?php
2+
/**
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
/**
8+
* Class IndexersStatesApplyFixture
9+
*/
10+
class IndexersStatesApplyFixture extends \Magento\ToolkitFramework\Fixture
11+
{
12+
/**
13+
* @var int
14+
*/
15+
protected $priority = 170;
16+
17+
/**
18+
* {@inheritdoc}
19+
*/
20+
public function execute()
21+
{
22+
$indexers = \Magento\ToolkitFramework\Config::getInstance()->getValue('indexers', []);
23+
if (!isset($indexers["indexer"]) || empty($indexers["indexer"])) {
24+
return;
25+
}
26+
$this->application->resetObjectManager();
27+
foreach ($indexers["indexer"] as $indexer) {
28+
$this->application->indexersStates[$indexer['id']] = ($indexer['set_scheduled'] == "true");
29+
}
30+
$this->application->getObjectManager()->get('Magento\Framework\App\CacheInterface')
31+
->clean([\Magento\Framework\App\Config::CACHE_TAG]);
32+
}
33+
34+
/**
35+
* {@inheritdoc}
36+
*/
37+
public function getActionTitle()
38+
{
39+
return 'Indexers Mode Changes';
40+
}
41+
42+
/**
43+
* {@inheritdoc}
44+
*/
45+
public function introduceParamLabels()
46+
{
47+
return [];
48+
}
49+
}
50+
51+
return new IndexersStatesApplyFixture($this);

‎dev/tools/performance-toolkit/framework/Magento/ToolkitFramework/Application.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,13 @@ class Application
6969
*/
7070
protected $_initArguments;
7171

72+
/**
73+
* Indexers states values
74+
*
75+
* @var array
76+
*/
77+
public $indexersStates;
78+
7279
/**
7380
* @param string $applicationBaseDir
7481
* @param \Magento\Framework\Shell $shell

‎dev/tools/performance-toolkit/generate.php

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111

1212
$shell = new Zend_Console_Getopt(
1313
[
14-
'profile-s' => 'Profile configuration file',
14+
'profile=s' => 'Profile configuration file',
15+
'skip-reindex-i' => 'Skip reindex (Default - 0)',
1516
]
1617
);
1718

@@ -46,10 +47,10 @@
4647
$indexerListIds = $config->getIndexers();
4748
/** @var $indexerRegistry \Magento\Indexer\Model\IndexerRegistry */
4849
$indexerRegistry = $application->getObjectManager()->create('Magento\Indexer\Model\IndexerRegistry');
49-
$indexersState = [];
50+
$application->indexerStates = [];
5051
foreach ($indexerListIds as $key => $indexerId) {
5152
$indexer = $indexerRegistry->get($indexerId['indexer_id']);
52-
$indexersState[$indexerId['indexer_id']] = $indexer->isScheduled();
53+
$application->indexersStates[$indexerId['indexer_id']] = $indexer->isScheduled();
5354
$indexer->setScheduled(true);
5455
}
5556

@@ -65,10 +66,12 @@
6566
foreach ($indexerListIds as $indexerId) {
6667
/** @var $indexer \Magento\Indexer\Model\Indexer */
6768
$indexer = $indexerRegistry->get($indexerId['indexer_id']);
68-
$indexer->setScheduled($indexersState[$indexerId['indexer_id']]);
69+
$indexer->setScheduled($application->indexersStates[$indexerId['indexer_id']]);
6970
}
7071

71-
$application->reindex();
72+
if (!\Magento\ToolkitFramework\Helper\Cli::getOption('skip-reindex')) {
73+
$application->reindex();
74+
}
7275
$totalEndTime = microtime(true);
7376
$totalResultTime = $totalEndTime - $totalStartTime;
7477

‎dev/tools/performance-toolkit/profiles/ce/extra_large.xml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,39 @@
3434
<value>1</value>
3535
</config>
3636
</configs>
37+
<indexers> <!-- Indexer mode value (true - Update by Schedule, false - Update on Save) -->
38+
<indexer>
39+
<id>catalog_category_product</id>
40+
<set_scheduled>true</set_scheduled>
41+
</indexer>
42+
<indexer>
43+
<id>catalog_product_category</id>
44+
<set_scheduled>true</set_scheduled>
45+
</indexer>
46+
<indexer>
47+
<id>catalog_product_price</id>
48+
<set_scheduled>true</set_scheduled>
49+
</indexer>
50+
<indexer>
51+
<id>catalog_product_attribute</id>
52+
<set_scheduled>true</set_scheduled>
53+
</indexer>
54+
<indexer>
55+
<id>cataloginventory_stock</id>
56+
<set_scheduled>true</set_scheduled>
57+
</indexer>
58+
<indexer>
59+
<id>catalogrule_rule</id>
60+
<set_scheduled>true</set_scheduled>
61+
</indexer>
62+
<indexer>
63+
<id>catalogrule_product</id>
64+
<set_scheduled>true</set_scheduled>
65+
</indexer>
66+
<indexer>
67+
<id>catalogsearch_fulltext</id>
68+
<set_scheduled>true</set_scheduled>
69+
</indexer>
70+
</indexers>
3771
</profile>
3872
</config>

‎dev/tools/performance-toolkit/profiles/ce/large.xml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,39 @@
3434
<value>1</value>
3535
</config>
3636
</configs>
37+
<indexers> <!-- Indexer mode value (true - Update by Schedule, false - Update on Save) -->
38+
<indexer>
39+
<id>catalog_category_product</id>
40+
<set_scheduled>true</set_scheduled>
41+
</indexer>
42+
<indexer>
43+
<id>catalog_product_category</id>
44+
<set_scheduled>true</set_scheduled>
45+
</indexer>
46+
<indexer>
47+
<id>catalog_product_price</id>
48+
<set_scheduled>true</set_scheduled>
49+
</indexer>
50+
<indexer>
51+
<id>catalog_product_attribute</id>
52+
<set_scheduled>true</set_scheduled>
53+
</indexer>
54+
<indexer>
55+
<id>cataloginventory_stock</id>
56+
<set_scheduled>true</set_scheduled>
57+
</indexer>
58+
<indexer>
59+
<id>catalogrule_rule</id>
60+
<set_scheduled>true</set_scheduled>
61+
</indexer>
62+
<indexer>
63+
<id>catalogrule_product</id>
64+
<set_scheduled>true</set_scheduled>
65+
</indexer>
66+
<indexer>
67+
<id>catalogsearch_fulltext</id>
68+
<set_scheduled>true</set_scheduled>
69+
</indexer>
70+
</indexers>
3771
</profile>
3872
</config>

‎dev/tools/performance-toolkit/profiles/ce/medium.xml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,39 @@
3434
<value>1</value>
3535
</config>
3636
</configs>
37+
<indexers> <!-- Indexer mode value (true - Update by Schedule, false - Update on Save) -->
38+
<indexer>
39+
<id>catalog_category_product</id>
40+
<set_scheduled>false</set_scheduled>
41+
</indexer>
42+
<indexer>
43+
<id>catalog_product_category</id>
44+
<set_scheduled>false</set_scheduled>
45+
</indexer>
46+
<indexer>
47+
<id>catalog_product_price</id>
48+
<set_scheduled>false</set_scheduled>
49+
</indexer>
50+
<indexer>
51+
<id>catalog_product_attribute</id>
52+
<set_scheduled>false</set_scheduled>
53+
</indexer>
54+
<indexer>
55+
<id>cataloginventory_stock</id>
56+
<set_scheduled>false</set_scheduled>
57+
</indexer>
58+
<indexer>
59+
<id>catalogrule_rule</id>
60+
<set_scheduled>false</set_scheduled>
61+
</indexer>
62+
<indexer>
63+
<id>catalogrule_product</id>
64+
<set_scheduled>false</set_scheduled>
65+
</indexer>
66+
<indexer>
67+
<id>catalogsearch_fulltext</id>
68+
<set_scheduled>false</set_scheduled>
69+
</indexer>
70+
</indexers>
3771
</profile>
3872
</config>

‎dev/tools/performance-toolkit/profiles/ce/small.xml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,39 @@
3434
<value>1</value>
3535
</config>
3636
</configs>
37+
<indexers> <!-- Indexer mode value (true - Update by Schedule, false - Update on Save) -->
38+
<indexer>
39+
<id>catalog_category_product</id>
40+
<set_scheduled>false</set_scheduled>
41+
</indexer>
42+
<indexer>
43+
<id>catalog_product_category</id>
44+
<set_scheduled>false</set_scheduled>
45+
</indexer>
46+
<indexer>
47+
<id>catalog_product_price</id>
48+
<set_scheduled>false</set_scheduled>
49+
</indexer>
50+
<indexer>
51+
<id>catalog_product_attribute</id>
52+
<set_scheduled>false</set_scheduled>
53+
</indexer>
54+
<indexer>
55+
<id>cataloginventory_stock</id>
56+
<set_scheduled>false</set_scheduled>
57+
</indexer>
58+
<indexer>
59+
<id>catalogrule_rule</id>
60+
<set_scheduled>false</set_scheduled>
61+
</indexer>
62+
<indexer>
63+
<id>catalogrule_product</id>
64+
<set_scheduled>false</set_scheduled>
65+
</indexer>
66+
<indexer>
67+
<id>catalogsearch_fulltext</id>
68+
<set_scheduled>false</set_scheduled>
69+
</indexer>
70+
</indexers>
3771
</profile>
3872
</config>

0 commit comments

Comments
 (0)