wikimedia/mediawiki-extensions-Thanks
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Thanks synced 2024-11-27 08:10:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch to ICP and stop using DBAccessObjectUtils::getDBOptions()

Browse source 
We are getting rid of this

Bug: T354194
Change-Id: I70c613993647f77259ef0ccf7570e3560b66ef56
This commit is contained in:
Amir Sarabadani 2024-02-28 13:55:05 +01:00 committed by Ladsgroup
parent ac31054b91
commit 9d4ccf0db4
3 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ServiceWiring.php
View file

@ -11,12 +11,12 @@ return [
): ThanksQueryHelper {
return new ThanksQueryHelper(
$services->getTitleFactory(),
$services->getDBLoadBalancer()
$services->getConnectionProvider()
);
},
'ThanksLogStore' => static function ( MediaWikiServices $services ): LogStore {
return new LogStore(
$services->getDBLoadBalancerFactory(),
$services->getConnectionProvider(),
$services->getActorNormalization(),
new ServiceOptions(
LogStore::CONSTRUCTOR_OPTIONS,

2
includes/EchoCoreThanksPresentationModel.php
View file

@ -162,7 +162,7 @@ class EchoCoreThanksPresentationModel extends EchoEventPresentationModel {
if ( !$logId ) {
$this->logEntry = false;
} else {
$dbr = MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->getReplicaDatabase();
$dbr = MediaWikiServices::getInstance()->getConnectionProvider()->getReplicaDatabase();
$this->logEntry = DatabaseLogEntry::newFromId( $logId, $dbr ) ?: false;
}
return $this->logEntry;

14
includes/ThanksQueryHelper.php
View file

@ -5,20 +5,18 @@ use DBAccessObjectUtils;
use IDBAccessObject;
use MediaWiki\Title\TitleFactory;
use MediaWiki\User\UserIdentity;
use Wikimedia\Rdbms\ILoadBalancer;
use Wikimedia\Rdbms\IConnectionProvider;
/**
* Query module
*/
class ThanksQueryHelper {
/** @var TitleFactory */
private TitleFactory $titleFactory;
/** @var ILoadBalancer */
private ILoadBalancer $loadBalancer;
private IConnectionProvider $dbProvider;
public function __construct( TitleFactory $titleFactory, ILoadBalancer $loadBalancer ) {
public function __construct( TitleFactory $titleFactory, IConnectionProvider $dbProvider ) {
$this->titleFactory = $titleFactory;
$this->loadBalancer = $loadBalancer;
$this->dbProvider = $dbProvider;
}
/**
@ -36,9 +34,7 @@ class ThanksQueryHelper {
int $limit = 1000,
int $flags = IDBAccessObject::READ_NORMAL
): int {
$loadBalancer = $this->loadBalancer;
list( $index, $options ) = DBAccessObjectUtils::getDBOptions( $flags );
$db = $loadBalancer->getConnection( $index );
$db = DBAccessObjectUtils::getDBFromRecency( $this->dbProvider, $flags );
$userPage = $this->titleFactory->newFromText( $userIdentity->getName(), NS_USER );
$logTitle = $userPage->getDBkey();
return $db->newSelectQueryBuilder()