Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit f66f469

Browse files
author
Stanislav Idolov
authored
Merge pull request #3009 from magento-panda/PANDA-2.2-develop-PR
PANDA-2.2-develop-PR
2 parents e6b92a5 + 9288d83 commit f66f469

File tree

15 files changed

+324
-93
lines changed

15 files changed

+324
-93
lines changed

‎app/code/Magento/Catalog/Model/Indexer/Product/Eav/AbstractAction.php‎

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,20 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\Catalog\Model\Indexer\Product\Eav;
79

810
/**
911
* Abstract action reindex class
1012
*/
1113
abstract class AbstractAction
1214
{
15+
/**
16+
* Config path for enable EAV indexer
17+
*/
18+
const ENABLE_EAV_INDEXER = 'catalog/search/enable_eav_indexer';
19+
1320
/**
1421
* EAV Indexers by type
1522
*
@@ -27,17 +34,27 @@ abstract class AbstractAction
2734
*/
2835
protected $_eavDecimalFactory;
2936

37+
/**
38+
* @var \Magento\Framework\App\Config\ScopeConfigInterface
39+
*/
40+
private $scopeConfig;
41+
3042
/**
3143
* AbstractAction constructor.
3244
* @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\DecimalFactory $eavDecimalFactory
3345
* @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\SourceFactory $eavSourceFactory
46+
* @param \Magento\Framework\App\Config\ScopeConfigInterface|null $scopeConfig
3447
*/
3548
public function __construct(
3649
\Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\DecimalFactory $eavDecimalFactory,
37-
\Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\SourceFactory $eavSourceFactory
50+
\Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\SourceFactory $eavSourceFactory,
51+
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig = null
3852
) {
3953
$this->_eavDecimalFactory = $eavDecimalFactory;
4054
$this->_eavSourceFactory = $eavSourceFactory;
55+
$this->scopeConfig = $scopeConfig ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
56+
\Magento\Framework\App\Config\ScopeConfigInterface::class
57+
);
4158
}
4259

4360
/**
@@ -90,6 +107,9 @@ public function getIndexer($type)
90107
*/
91108
public function reindex($ids = null)
92109
{
110+
if (!$this->isEavIndexerEnabled()) {
111+
return;
112+
}
93113
foreach ($this->getIndexers() as $indexer) {
94114
if ($ids === null) {
95115
$indexer->reindexAll();
@@ -147,4 +167,19 @@ protected function processRelations($indexer, $ids, $onlyParents = false)
147167
$childIds = $onlyParents ? [] : $indexer->getRelationsByParent($parentIds);
148168
return array_unique(array_merge($ids, $childIds, $parentIds));
149169
}
170+
171+
/**
172+
* Get EAV indexer status
173+
*
174+
* @return bool
175+
*/
176+
private function isEavIndexerEnabled(): bool
177+
{
178+
$eavIndexerStatus = $this->scopeConfig->getValue(
179+
self::ENABLE_EAV_INDEXER,
180+
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
181+
);
182+
183+
return (bool)$eavIndexerStatus;
184+
}
150185
}

‎app/code/Magento/Catalog/Model/Indexer/Product/Eav/Action/Full.php‎

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,15 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
declare(strict_types=1);
7+
68
namespace Magento\Catalog\Model\Indexer\Product\Eav\Action;
79

810
use Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher;
911

1012
/**
1113
* Class Full reindex action
14+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
1215
*/
1316
class Full extends \Magento\Catalog\Model\Indexer\Product\Eav\AbstractAction
1417
{
@@ -32,23 +35,33 @@ class Full extends \Magento\Catalog\Model\Indexer\Product\Eav\AbstractAction
3235
*/
3336
private $activeTableSwitcher;
3437

38+
/**
39+
* @var \Magento\Framework\App\Config\ScopeConfigInterface
40+
*/
41+
private $scopeConfig;
42+
3543
/**
3644
* @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\DecimalFactory $eavDecimalFactory
3745
* @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\SourceFactory $eavSourceFactory
3846
* @param \Magento\Framework\EntityManager\MetadataPool|null $metadataPool
3947
* @param \Magento\Framework\Indexer\BatchProviderInterface|null $batchProvider
4048
* @param \Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\BatchSizeCalculator $batchSizeCalculator
4149
* @param ActiveTableSwitcher|null $activeTableSwitcher
50+
* @param \Magento\Framework\App\Config\ScopeConfigInterface|null $scopeConfig
4251
*/
4352
public function __construct(
4453
\Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\DecimalFactory $eavDecimalFactory,
4554
\Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\SourceFactory $eavSourceFactory,
4655
\Magento\Framework\EntityManager\MetadataPool $metadataPool = null,
4756
\Magento\Framework\Indexer\BatchProviderInterface $batchProvider = null,
4857
\Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\BatchSizeCalculator $batchSizeCalculator = null,
49-
ActiveTableSwitcher $activeTableSwitcher = null
58+
ActiveTableSwitcher $activeTableSwitcher = null,
59+
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig = null
5060
) {
51-
parent::__construct($eavDecimalFactory, $eavSourceFactory);
61+
$this->scopeConfig = $scopeConfig ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
62+
\Magento\Framework\App\Config\ScopeConfigInterface::class
63+
);
64+
parent::__construct($eavDecimalFactory, $eavSourceFactory, $scopeConfig);
5265
$this->metadataPool = $metadataPool ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
5366
\Magento\Framework\EntityManager\MetadataPool::class
5467
);
@@ -73,6 +86,9 @@ public function __construct(
7386
*/
7487
public function execute($ids = null)
7588
{
89+
if (!$this->isEavIndexerEnabled()) {
90+
return;
91+
}
7692
try {
7793
foreach ($this->getIndexers() as $indexerName => $indexer) {
7894
$connection = $indexer->getConnection();
@@ -129,4 +145,19 @@ protected function syncData($indexer, $destinationTable, $ids = null)
129145
throw $e;
130146
}
131147
}
148+
149+
/**
150+
* Get EAV indexer status
151+
*
152+
* @return bool
153+
*/
154+
private function isEavIndexerEnabled(): bool
155+
{
156+
$eavIndexerStatus = $this->scopeConfig->getValue(
157+
self::ENABLE_EAV_INDEXER,
158+
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
159+
);
160+
161+
return (bool)$eavIndexerStatus;
162+
}
132163
}

‎app/code/Magento/Catalog/Test/Unit/Model/Indexer/Product/Eav/AbstractActionTest.php‎

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ class AbstractActionTest extends \PHPUnit\Framework\TestCase
2222
*/
2323
protected $_eavSourceFactoryMock;
2424

25+
/**
26+
* @var \Magento\Framework\App\Config\ScopeConfigInterface|\PHPUnit_Framework_MockObject_MockObject
27+
*/
28+
private $scopeConfig;
29+
2530
protected function setUp()
2631
{
2732
$this->_eavDecimalFactoryMock = $this->createPartialMock(
@@ -32,9 +37,16 @@ protected function setUp()
3237
\Magento\Catalog\Model\ResourceModel\Product\Indexer\Eav\SourceFactory::class,
3338
['create']
3439
);
40+
$this->scopeConfig = $this->getMockBuilder(\Magento\Framework\App\Config\ScopeConfigInterface::class)
41+
->disableOriginalConstructor()
42+
->getMockForAbstractClass();
3543
$this->_model = $this->getMockForAbstractClass(
3644
\Magento\Catalog\Model\Indexer\Product\Eav\AbstractAction::class,
37-
[$this->_eavDecimalFactoryMock, $this->_eavSourceFactoryMock, []]
45+
[
46+
$this->_eavDecimalFactoryMock,
47+
$this->_eavSourceFactoryMock,
48+
$this->scopeConfig
49+
]
3850
);
3951
}
4052

@@ -110,6 +122,10 @@ public function testReindexWithoutArgumentsExecutesReindexAll()
110122
->method('create')
111123
->will($this->returnValue($eavDecimal));
112124

125+
$this->scopeConfig->expects($this->once())
126+
->method('getValue')
127+
->willReturn(1);
128+
113129
$this->_model->reindex();
114130
}
115131

@@ -174,9 +190,25 @@ public function testReindexWithNotNullArgumentExecutesReindexEntities(
174190
->method('create')
175191
->will($this->returnValue($eavDecimal));
176192

193+
$this->scopeConfig->expects($this->once())
194+
->method('getValue')
195+
->willReturn(1);
196+
177197
$this->_model->reindex($ids);
178198
}
179199

200+
public function testReindexWithDisabledEavIndexer()
201+
{
202+
$this->scopeConfig->expects($this->once())
203+
->method('getValue')
204+
->willReturn(0);
205+
206+
$this->_eavSourceFactoryMock->expects($this->never())->method('create');
207+
$this->_eavDecimalFactoryMock->expects($this->never())->method('create');
208+
209+
$this->_model->reindex();
210+
}
211+
180212
/**
181213
* @return array
182214
*/

0 commit comments

Comments
 (0)