Skip to content

Commit ffc4c83

Browse files
author
Stanislav Idolov
committed
MAGETWO-69261: Magento\Framework\App\ResourceConnection::getTableName does not support index table name switching
1 parent afe2c8f commit ffc4c83

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

app/code/Magento/Catalog/Model/ResourceModel/Indexer/ActiveTableSwitcher.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
*/
1111
class ActiveTableSwitcher
1212
{
13-
/** Suffix for outdated index table. */
14-
const OUTDATED_TABLE_SUFFIX = '_outdated';
15-
1613
/** Suffix for replica index table. */
17-
const ADDITIONAL_TABLE_SUFFIX = '_replica';
14+
private $additionalTableSuffix = '_replica';
15+
16+
/** Suffix for outdated index table. */
17+
private $outdatedTableSuffix = '_outdated';
1818

1919
/**
2020
* Switch index tables from replica to active.
@@ -25,8 +25,8 @@ class ActiveTableSwitcher
2525
*/
2626
public function switchTable(\Magento\Framework\DB\Adapter\AdapterInterface $connection, $tableName)
2727
{
28-
$outdatedTableName = $tableName . self::OUTDATED_TABLE_SUFFIX;
29-
$replicaTableName = $tableName . self::ADDITIONAL_TABLE_SUFFIX;
28+
$outdatedTableName = $tableName . $this->outdatedTableSuffix;
29+
$replicaTableName = $tableName . $this->additionalTableSuffix;
3030

3131
$connection->renameTablesBatch(
3232
[
@@ -52,6 +52,6 @@ public function switchTable(\Magento\Framework\DB\Adapter\AdapterInterface $conn
5252
*/
5353
public function getAdditionalTableName($tableName)
5454
{
55-
return $tableName . self::ADDITIONAL_TABLE_SUFFIX;
55+
return $tableName . $this->additionalTableSuffix;
5656
}
5757
}

app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Indexer/ActiveTableSwitcherTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function testGetAdditionalTableName()
4949
{
5050
$tableName = 'table_name';
5151
$this->assertEquals(
52-
$tableName . \Magento\Catalog\Model\ResourceModel\Indexer\ActiveTableSwitcher::ADDITIONAL_TABLE_SUFFIX,
52+
$tableName . '_replica',
5353
$this->model->getAdditionalTableName($tableName)
5454
);
5555
}

0 commit comments

Comments
 (0)