Skip to content

Commit e108aad

Browse files
zakdmazakdma
committed
Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-pr129
2 parents 84d9372 + d1ea23a commit e108aad

File tree

167 files changed

+4926
-1170
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

167 files changed

+4926
-1170
lines changed

‎app/code/Magento/Bundle/Model/ResourceModel/Indexer/Price.php‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -377,8 +377,7 @@ private function prepareBundlePriceByType($priceType, array $dimensions, $entity
377377
]
378378
);
379379

380-
$query = $select->insertFromSelect($this->getBundlePriceTable());
381-
$connection->query($query);
380+
$this->tableMaintainer->insertFromSelect($select, $this->getBundlePriceTable(), []);
382381
}
383382

384383
/**
@@ -418,8 +417,7 @@ private function calculateBundleOptionPrice($priceTable, $dimensions)
418417
]
419418
);
420419

421-
$query = $select->insertFromSelect($this->getBundleOptionTable());
422-
$connection->query($query);
420+
$this->tableMaintainer->insertFromSelect($select, $this->getBundleOptionTable(), []);
423421

424422
$this->getConnection()->delete($priceTable->getTableName());
425423
$this->applyBundlePrice($priceTable);
@@ -575,8 +573,7 @@ private function calculateFixedBundleSelectionPrice()
575573
'tier_price' => $tierExpr,
576574
]
577575
);
578-
$query = $select->insertFromSelect($this->getBundleSelectionTable());
579-
$connection->query($query);
576+
$this->tableMaintainer->insertFromSelect($select, $this->getBundleSelectionTable(), []);
580577

581578
$this->applyFixedBundleSelectionPrice();
582579
}
@@ -627,8 +624,7 @@ private function calculateDynamicBundleSelectionPrice($dimensions)
627624
'tier_price' => $tierExpr,
628625
]
629626
);
630-
$query = $select->insertFromSelect($this->getBundleSelectionTable());
631-
$connection->query($query);
627+
$this->tableMaintainer->insertFromSelect($select, $this->getBundleSelectionTable(), []);
632628
}
633629

634630
/**
@@ -697,8 +693,7 @@ private function prepareTierPriceIndex($dimensions, $entityIds)
697693
$select->where($this->dimensionToFieldMapper[$dimension->getName()] . ' = ?', $dimension->getValue());
698694
}
699695

700-
$query = $select->insertFromSelect($this->getTable('catalog_product_index_tier_price'));
701-
$connection->query($query);
696+
$this->tableMaintainer->insertFromSelect($select, $this->getTable('catalog_product_index_tier_price'), []);
702697
}
703698

704699
/**
@@ -725,8 +720,7 @@ private function applyBundlePrice($priceTable): void
725720
]
726721
);
727722

728-
$query = $select->insertFromSelect($priceTable->getTableName());
729-
$this->getConnection()->query($query);
723+
$this->tableMaintainer->insertFromSelect($select, $priceTable->getTableName(), []);
730724
}
731725

732726
/**
@@ -785,7 +779,7 @@ private function getMainTable($dimensions)
785779
if ($this->fullReindexAction) {
786780
return $this->tableMaintainer->getMainReplicaTable($dimensions);
787781
}
788-
return $this->tableMaintainer->getMainTable($dimensions);
782+
return $this->tableMaintainer->getMainTableByDimensions($dimensions);
789783
}
790784

791785
/**

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ protected function _syncData(array $processIds = [])
173173
}
174174
}
175175

176-
$query = $insertSelect->insertFromSelect($this->tableMaintainer->getMainTable($dimensions));
176+
$query = $insertSelect->insertFromSelect($this->tableMaintainer->getMainTableByDimensions($dimensions));
177177
$this->getConnection()->query($query);
178178
}
179179
return $this;
@@ -385,7 +385,7 @@ protected function _reindexRows($changedIds = [])
385385
// copy to index
386386
$this->_insertFromTable(
387387
$temporaryTable,
388-
$this->tableMaintainer->getMainTable($dimensions)
388+
$this->tableMaintainer->getMainTableByDimensions($dimensions)
389389
);
390390
}
391391
} else {
@@ -410,7 +410,7 @@ private function deleteIndexData(array $entityIds)
410410
{
411411
foreach ($this->dimensionCollectionFactory->create() as $dimensions) {
412412
$select = $this->getConnection()->select()->from(
413-
['index_price' => $this->tableMaintainer->getMainTable($dimensions)],
413+
['index_price' => $this->tableMaintainer->getMainTableByDimensions($dimensions)],
414414
null
415415
)->where('index_price.entity_id IN (?)', $entityIds);
416416
$query = $select->deleteFromSelect('index_price');
@@ -478,7 +478,7 @@ private function getIndexTargetTableByDimension(array $dimensions)
478478
{
479479
$indexTargetTable = $this->getIndexTargetTable();
480480
if ($indexTargetTable === self::getIndexTargetTable()) {
481-
$indexTargetTable = $this->tableMaintainer->getMainTable($dimensions);
481+
$indexTargetTable = $this->tableMaintainer->getMainTableByDimensions($dimensions);
482482
}
483483
if ($indexTargetTable === self::getIndexTargetTable() . '_replica') {
484484
$indexTargetTable = $this->tableMaintainer->getMainReplicaTable($dimensions);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ private function switchTables(): void
425425
$mainTablesByDimension = [];
426426

427427
foreach ($this->dimensionCollectionFactory->create() as $dimensions) {
428-
$mainTablesByDimension[] = $this->dimensionTableMaintainer->getMainTable($dimensions);
428+
$mainTablesByDimension[] = $this->dimensionTableMaintainer->getMainTableByDimensions($dimensions);
429429

430430
//Move data from indexers with old realisation
431431
$this->moveDataFromReplicaTableToReplicaTables($dimensions);

‎app/code/Magento/Catalog/Model/Indexer/Product/Price/ModeSwitcher.php‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515

1616
/**
1717
* Class to prepare new tables for new indexer mode
18+
*
19+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
1820
*/
1921
class ModeSwitcher implements \Magento\Indexer\Model\ModeSwitcherInterface
2022
{
@@ -98,7 +100,6 @@ public function switchMode(string $currentMode, string $previousMode)
98100
* Create new tables
99101
*
100102
* @param string $currentMode
101-
*
102103
* @return void
103104
* @throws \Zend_Db_Exception
104105
*/
@@ -116,7 +117,6 @@ public function createTables(string $currentMode)
116117
*
117118
* @param string $currentMode
118119
* @param string $previousMode
119-
*
120120
* @return void
121121
*/
122122
public function moveData(string $currentMode, string $previousMode)
@@ -125,17 +125,17 @@ public function moveData(string $currentMode, string $previousMode)
125125
$dimensionsArrayForPreviousMode = $this->getDimensionsArray($previousMode);
126126

127127
foreach ($dimensionsArrayForCurrentMode as $dimensionsForCurrentMode) {
128-
$newTable = $this->tableMaintainer->getMainTable($dimensionsForCurrentMode);
128+
$newTable = $this->tableMaintainer->getMainTableByDimensions($dimensionsForCurrentMode);
129129
if (empty($dimensionsForCurrentMode)) {
130130
// new mode is 'none'
131131
foreach ($dimensionsArrayForPreviousMode as $dimensionsForPreviousMode) {
132-
$oldTable = $this->tableMaintainer->getMainTable($dimensionsForPreviousMode);
132+
$oldTable = $this->tableMaintainer->getMainTableByDimensions($dimensionsForPreviousMode);
133133
$this->insertFromOldTablesToNew($newTable, $oldTable);
134134
}
135135
} else {
136136
// new mode is not 'none'
137137
foreach ($dimensionsArrayForPreviousMode as $dimensionsForPreviousMode) {
138-
$oldTable = $this->tableMaintainer->getMainTable($dimensionsForPreviousMode);
138+
$oldTable = $this->tableMaintainer->getMainTableByDimensions($dimensionsForPreviousMode);
139139
$this->insertFromOldTablesToNew($newTable, $oldTable, $dimensionsForCurrentMode);
140140
}
141141
}
@@ -146,7 +146,6 @@ public function moveData(string $currentMode, string $previousMode)
146146
* Drop old tables
147147
*
148148
* @param string $previousMode
149-
*
150149
* @return void
151150
*/
152151
public function dropTables(string $previousMode)
@@ -164,7 +163,6 @@ public function dropTables(string $previousMode)
164163
* Get dimensions array
165164
*
166165
* @param string $mode
167-
*
168166
* @return \Magento\Framework\Indexer\MultiDimensionProvider
169167
*/
170168
private function getDimensionsArray(string $mode): \Magento\Framework\Indexer\MultiDimensionProvider
@@ -184,7 +182,6 @@ private function getDimensionsArray(string $mode): \Magento\Framework\Indexer\Mu
184182
* @param string $newTable
185183
* @param string $oldTable
186184
* @param Dimension[] $dimensions
187-
*
188185
* @return void
189186
*/
190187
private function insertFromOldTablesToNew(string $newTable, string $oldTable, array $dimensions = [])

0 commit comments

Comments
 (0)