wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-11-23 15:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Inject service RevisionStore into RevisionLocalCache"

Browse source
This commit is contained in:
jenkins-bot 2024-03-18 09:06:16 +00:00 committed by Gerrit Code Review
parent e52e1f7587 98feb3f3fd
commit fda5f7daa6
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ServiceWiring.php
View file

@ -99,7 +99,8 @@ return [
'EchoRevisionLocalCache' => static function ( MediaWikiServices $services ): RevisionLocalCache { 'EchoRevisionLocalCache' => static function ( MediaWikiServices $services ): RevisionLocalCache {
return new RevisionLocalCache( return new RevisionLocalCache(
$services->getConnectionProvider() $services->getConnectionProvider(),
$services->getRevisionStore()
); );
} }

15
includes/Cache/RevisionLocalCache.php
View file

@ -2,7 +2,7 @@
namespace MediaWiki\Extension\Notifications\Cache; namespace MediaWiki\Extension\Notifications\Cache;
use MediaWiki\MediaWikiServices; use MediaWiki\Revision\RevisionStore;
use Wikimedia\Rdbms\IConnectionProvider; use Wikimedia\Rdbms\IConnectionProvider;
/** /**
@ -11,22 +11,27 @@ use Wikimedia\Rdbms\IConnectionProvider;
*/ */
class RevisionLocalCache extends LocalCache { class RevisionLocalCache extends LocalCache {
private IConnectionProvider $dbProvider; private IConnectionProvider $dbProvider;
private RevisionStore $revisionStore;
/** /**
* @param IConnectionProvider $dbProvider * @param IConnectionProvider $dbProvider
* @param RevisionStore $revisionStore
*/ */
public function __construct( IConnectionProvider $dbProvider ) { public function __construct(
IConnectionProvider $dbProvider,
RevisionStore $revisionStore
) {
parent::__construct(); parent::__construct();
$this->dbProvider = $dbProvider; $this->dbProvider = $dbProvider;
$this->revisionStore = $revisionStore;
} }
/** /**
* @inheritDoc * @inheritDoc
*/ */
protected function resolve( array $lookups ) { protected function resolve( array $lookups ) {
$store = MediaWikiServices::getInstance()->getRevisionStore();
$dbr = $this->dbProvider->getReplicaDatabase(); $dbr = $this->dbProvider->getReplicaDatabase();
$revQuery = $store->getQueryInfo( [ 'page', 'user' ] ); $revQuery = $this->revisionStore->getQueryInfo( [ 'page', 'user' ] );
$res = $dbr->select( $res = $dbr->select(
$revQuery['tables'], $revQuery['tables'],
$revQuery['fields'], $revQuery['fields'],
@ -36,7 +41,7 @@ class RevisionLocalCache extends LocalCache {
$revQuery['joins'] $revQuery['joins']
); );
foreach ( $res as $row ) { foreach ( $res as $row ) {
yield $row->rev_id => $store->newRevisionFromRow( $row ); yield $row->rev_id => $this->revisionStore->newRevisionFromRow( $row );
} }
} }
} }