Skip to content

Commit 8a18dc4

Browse files
ENGCOM-2962: [MSI] Make Magento MSI test builds as mandatory part of all Pull Requests delivered to Magento core #2170
- Merge Pull Request magento-engcom/magento2ce#2170 from magento-engcom/magento2ce:MSI-1616 - Merged commits: 1. 90225a4
2 parents e13b87f + 90225a4 commit 8a18dc4

File tree

5 files changed

+14
-7
lines changed

5 files changed

+14
-7
lines changed

app/code/Magento/CatalogSearch/Model/Indexer/Fulltext.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,10 @@ public function executeByDimensions(array $dimensions, \Traversable $entityIds =
147147
$productIds = array_unique(
148148
array_merge($entityIds, $this->fulltextResource->getRelationsByChild($entityIds))
149149
);
150-
$saveHandler->deleteIndex($dimensions, new \ArrayIterator($productIds));
151-
$saveHandler->saveIndex($dimensions, $this->fullAction->rebuildStoreIndex($storeId, $productIds));
150+
if ($saveHandler->isAvailable($dimensions)) {
151+
$saveHandler->deleteIndex($dimensions, new \ArrayIterator($productIds));
152+
$saveHandler->saveIndex($dimensions, $this->fullAction->rebuildStoreIndex($storeId, $productIds));
153+
}
152154
}
153155
}
154156

app/code/Magento/CatalogSearch/Model/Indexer/IndexerHandler.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,13 @@ public function cleanIndex($dimensions)
124124
/**
125125
* {@inheritdoc}
126126
*/
127-
public function isAvailable()
127+
public function isAvailable($dimensions = [])
128128
{
129-
return true;
129+
if (empty($dimensions)) {
130+
return true;
131+
}
132+
133+
return $this->resource->getConnection()->isTableExists($this->getTableName($dimensions));
130134
}
131135

132136
/**

app/code/Magento/Elasticsearch/Model/Indexer/IndexerHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public function cleanIndex($dimensions)
124124
/**
125125
* {@inheritdoc}
126126
*/
127-
public function isAvailable()
127+
public function isAvailable($dimensions = [])
128128
{
129129
return $this->adapter->ping();
130130
}

lib/internal/Magento/Framework/Indexer/SaveHandler/IndexerHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public function cleanIndex($dimensions)
128128
/**
129129
* {@inheritdoc}
130130
*/
131-
public function isAvailable()
131+
public function isAvailable($dimensions = [])
132132
{
133133
return true;
134134
}

lib/internal/Magento/Framework/Indexer/SaveHandler/IndexerInterface.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ public function cleanIndex($dimensions);
4747
/**
4848
* Define if engine is available
4949
*
50+
* @param Dimension[] $dimensions
5051
* @return bool
5152
*/
52-
public function isAvailable();
53+
public function isAvailable($dimensions = []);
5354
}

0 commit comments

Comments
 (0)