deblan/FOSElasticaBundle
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix previous merge

Browse source
This commit is contained in:
Tim Nagel 2014-09-04 09:37:27 +10:00
parent 029ebb153a
commit c4210a5c6d
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Index/AliasProcessor.php
View file

@ -11,10 +11,10 @@
namespace FOS\ElasticaBundle\Index; namespace FOS\ElasticaBundle\Index;
use Elastica\Client;
use Elastica\Exception\ExceptionInterface; use Elastica\Exception\ExceptionInterface;
use Elastica\Request; use Elastica\Request;
use FOS\ElasticaBundle\Configuration\IndexConfig; use FOS\ElasticaBundle\Configuration\IndexConfig;
use FOS\ElasticaBundle\Elastica\Client;
use FOS\ElasticaBundle\Elastica\Index; use FOS\ElasticaBundle\Elastica\Index;
use FOS\ElasticaBundle\Exception\AliasIsIndexException; use FOS\ElasticaBundle\Exception\AliasIsIndexException;
@ -54,13 +54,12 @@ class AliasProcessor
try { try {
$aliasedIndexes = $this->getAliasedIndexes($client, $aliasName); $aliasedIndexes = $this->getAliasedIndexes($client, $aliasName);
} catch(AliasIsIndexException $e) { } catch(AliasIsIndexException $e) {
if ($force) { if (!$force) {
$this->deleteIndex($client, $aliasName); throw $e;
return;
} }
throw $e; $this->deleteIndex($client, $aliasName);
$aliasedIndexes = array();
} }
if (count($aliasedIndexes) > 1) { if (count($aliasedIndexes) > 1) {
@ -75,7 +74,7 @@ class AliasProcessor
} }
$aliasUpdateRequest = array('actions' => array()); $aliasUpdateRequest = array('actions' => array());
if (count($aliasedIndexes) == 1) { if (count($aliasedIndexes) === 1) {
// if the alias is set - add an action to remove it // if the alias is set - add an action to remove it
$oldIndexName = $aliasedIndexes[0]; $oldIndexName = $aliasedIndexes[0];
$aliasUpdateRequest['actions'][] = array( $aliasUpdateRequest['actions'][] = array(
@ -135,7 +134,7 @@ class AliasProcessor
* @param Client $client * @param Client $client
* @param string $aliasName Alias name * @param string $aliasName Alias name
* @return array * @return array
* @throws \FOS\ElasticaBundle\Exception\AliasIsIndexException * @throws AliasIsIndexException
*/ */
private function getAliasedIndexes(Client $client, $aliasName) private function getAliasedIndexes(Client $client, $aliasName)
{ {
@ -146,11 +145,13 @@ class AliasProcessor
if ($indexName === $aliasName) { if ($indexName === $aliasName) {
throw new AliasIsIndexException($indexName); throw new AliasIsIndexException($indexName);
} }
if (isset($indexInfo['aliases'])) { if (!isset($indexInfo['aliases'])) {
$aliases = array_keys($indexInfo['aliases']); continue;
if (in_array($aliasName, $aliases)) { }
$aliasedIndexes[] = $indexName;
} $aliases = array_keys($indexInfo['aliases']);
if (in_array($aliasName, $aliases)) {
$aliasedIndexes[] = $indexName;
} }
} }