-
Notifications
You must be signed in to change notification settings - Fork 206
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
IBX-143: Refactored reindexing command to be DBAL 2.13-compatible
For more details see: * #3094 * https://issues.ibexa.co/browse/IBX-143 Changes: * Bumped doctrine/dbal to ^2.13.0 * Extracted Indexer Doctrine Gateway from ReindexCommand * [Tests] Added integration test coverage for IndexerGateway Co-Authored-By: Adam Wójs <adamwojs@users.noreply.github.com> Co-Authored-By: Łukasz Serwatka <lserwatka@users.noreply.github.com> Co-Authored-By: Tomasz Kryszan <ciastektk@users.noreply.github.com>
- Loading branch information
4 people
committed
Apr 9, 2021
1 parent
a18ac4c
commit 9f1c87e
Showing
11 changed files
with
410 additions
and
103 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
147 changes: 147 additions & 0 deletions
147
eZ/Publish/Core/Search/Legacy/Content/IndexerGateway.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,147 @@ | ||
| <?php | ||
|
|
||
| /** | ||
| * @copyright Copyright (C) eZ Systems AS. All rights reserved. | ||
| * @license For full copyright and license information view LICENSE file distributed with this source code. | ||
| */ | ||
| declare(strict_types=1); | ||
|
|
||
| namespace eZ\Publish\Core\Search\Legacy\Content; | ||
|
|
||
| use DateTimeInterface; | ||
| use Doctrine\DBAL\Connection; | ||
| use Doctrine\DBAL\Driver\ResultStatement; | ||
| use Doctrine\DBAL\ParameterType; | ||
| use Doctrine\DBAL\Query\QueryBuilder; | ||
| use eZ\Publish\SPI\Persistence\Content\ContentInfo; | ||
| use eZ\Publish\SPI\Search\Content\IndexerGateway as SPIIndexerGateway; | ||
| use Generator; | ||
|
|
||
| /** | ||
| * @internal | ||
| */ | ||
| final class IndexerGateway implements SPIIndexerGateway | ||
| { | ||
| /** @var \Doctrine\DBAL\Connection */ | ||
| private $connection; | ||
|
|
||
| public function __construct(Connection $connection) | ||
| { | ||
| $this->connection = $connection; | ||
| } | ||
|
|
||
| public function getContentSince(DateTimeInterface $since, int $iterationCount): Generator | ||
| { | ||
| $query = $this->buildQueryForContentSince($since); | ||
| $query->orderBy('c.modified'); | ||
|
|
||
| yield from $this->fetchIteration($query->execute(), $iterationCount); | ||
| } | ||
|
|
||
| public function countContentSince(DateTimeInterface $since): int | ||
| { | ||
| $query = $this->buildCountingQuery( | ||
| $this->buildQueryForContentSince($since) | ||
| ); | ||
|
|
||
| return (int)$query->execute()->fetchOne(); | ||
| } | ||
|
|
||
| public function getContentInSubtree(string $locationPath, int $iterationCount): Generator | ||
| { | ||
| $query = $this->buildQueryForContentInSubtree($locationPath); | ||
|
|
||
| yield from $this->fetchIteration($query->execute(), $iterationCount); | ||
| } | ||
|
|
||
| public function countContentInSubtree(string $locationPath): int | ||
| { | ||
| $query = $this->buildCountingQuery( | ||
| $this->buildQueryForContentInSubtree($locationPath) | ||
| ); | ||
|
|
||
| return (int)$query->execute()->fetchOne(); | ||
| } | ||
|
|
||
| public function getAllContent(int $iterationCount): Generator | ||
| { | ||
| $query = $this->buildQueryForAllContent(); | ||
|
|
||
| yield from $this->fetchIteration($query->execute(), $iterationCount); | ||
| } | ||
|
|
||
| public function countAllContent(): int | ||
| { | ||
| $query = $this->buildCountingQuery( | ||
| $this->buildQueryForAllContent() | ||
| ); | ||
|
|
||
| return (int)$query->execute()->fetchOne(); | ||
| } | ||
|
|
||
| private function buildQueryForContentSince(DateTimeInterface $since): QueryBuilder | ||
| { | ||
| return $this->connection->createQueryBuilder() | ||
| ->select('c.id') | ||
| ->from('ezcontentobject', 'c') | ||
| ->where('c.status = :status')->andWhere('c.modified >= :since') | ||
| ->setParameter('status', ContentInfo::STATUS_PUBLISHED, ParameterType::INTEGER) | ||
| ->setParameter('since', $since->getTimestamp(), ParameterType::INTEGER); | ||
| } | ||
|
|
||
| private function buildQueryForContentInSubtree(string $locationPath): QueryBuilder | ||
| { | ||
| return $this->connection->createQueryBuilder() | ||
| ->select('DISTINCT c.id') | ||
| ->from('ezcontentobject', 'c') | ||
| ->innerJoin('c', 'ezcontentobject_tree', 't', 't.contentobject_id = c.id') | ||
| ->where('c.status = :status') | ||
| ->andWhere('t.path_string LIKE :path') | ||
| ->setParameter('status', ContentInfo::STATUS_PUBLISHED, ParameterType::INTEGER) | ||
| ->setParameter('path', $locationPath . '%', ParameterType::STRING); | ||
| } | ||
|
|
||
| private function buildQueryForAllContent(): QueryBuilder | ||
| { | ||
| return $this->connection->createQueryBuilder() | ||
| ->select('c.id') | ||
| ->from('ezcontentobject', 'c') | ||
| ->where('c.status = :status') | ||
| ->setParameter('status', ContentInfo::STATUS_PUBLISHED, ParameterType::INTEGER); | ||
| } | ||
|
|
||
| /** | ||
| * @throws \Doctrine\DBAL\Exception | ||
| */ | ||
| private function buildCountingQuery(QueryBuilder $query): QueryBuilder | ||
| { | ||
| $databasePlatform = $this->connection->getDatabasePlatform(); | ||
|
|
||
| // wrap existing select part in count expression | ||
| $query->select( | ||
| $databasePlatform->getCountExpression( | ||
| $query->getQueryPart('select')[0] | ||
| ) | ||
| ); | ||
|
|
||
| return $query; | ||
| } | ||
|
|
||
| private function fetchIteration(ResultStatement $statement, int $iterationCount): Generator | ||
| { | ||
| do { | ||
| $contentIds = []; | ||
| for ($i = 0; $i < $iterationCount; ++$i) { | ||
| if ($contentId = $statement->fetchOne()) { | ||
| $contentIds[] = $contentId; | ||
| } elseif (empty($contentIds)) { | ||
| return; | ||
| } else { | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| yield $contentIds; | ||
| } while (!empty($contentId)); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.