Hello Daniel Kinzler, Tim Starling, Legoktm,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/383926
to review the following change.
Change subject: Update for deprecation of selectFields() methods
......................................................................
Update for deprecation of selectFields() methods
Various selectFields() methods were deprecated in MediaWiki core change
Idcfd1556, replaced with getQueryInfo() methods.
Change-Id: I5d62ad76fdb64a9c6efd228f27e9b5f512f17d5e
Depends-On: Idcfd15568489d9f03a7ba4460e96610d33bc4089
---
M includes/cache/RevisionLocalCache.php
M maintenance/backfillUnreadWikis.php
2 files changed, 10 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/26/383926/1
diff --git a/includes/cache/RevisionLocalCache.php
b/includes/cache/RevisionLocalCache.php
index b879de6..0c968e3 100644
--- a/includes/cache/RevisionLocalCache.php
+++ b/includes/cache/RevisionLocalCache.php
@@ -29,21 +29,14 @@
if ( $this->lookups ) {
// @Todo Add newFromIds() to Revision
$dbr = wfGetDB( DB_REPLICA );
- $fields = array_merge(
- Revision::selectFields(),
- Revision::selectPageFields(),
- Revision::selectUserFields()
- );
+ $revQuery = Revision::getQueryInfo( [ 'page', 'user' ]
);
$res = $dbr->select(
- [ 'revision', 'page', 'user' ],
- $fields,
+ $revQuery['tables'],
+ $revQuery['fields'],
[ 'rev_id' => $this->lookups ],
__METHOD__,
[],
- [
- 'page' => Revision::pageJoinCond(),
- 'user' => Revision::userJoinCond()
- ]
+ $revQuery['joins']
);
if ( $res ) {
foreach ( $res as $row ) {
diff --git a/maintenance/backfillUnreadWikis.php
b/maintenance/backfillUnreadWikis.php
index 3323647..d2c4b52 100644
--- a/maintenance/backfillUnreadWikis.php
+++ b/maintenance/backfillUnreadWikis.php
@@ -25,8 +25,12 @@
$iterator = new BatchRowIterator(
$dbFactory->getSharedDb( DB_REPLICA ), 'echo_unread_wikis', 'euw_user',
$this->mBatchSize );
$iterator->addConditions( [ 'euw_wiki' => wfWikiID() ]
);
} else {
- $iterator = new BatchRowIterator( wfGetDB( DB_REPLICA
), 'user', 'user_id', $this->mBatchSize );
- $iterator->setFetchColumns( User::selectFields() );
+ $userQuery = User::getQueryInfo();
+ $iterator = new BatchRowIterator(
+ wfGetDB( DB_REPLICA ), $userQuery['tables'],
'user_id', $this->mBatchSize
+ );
+ $iterator->setFetchColumns( $userQuery['fields'] );
+ $iterator->addJoinConditions( $userQuery['joins'] );
}
$processed = 0;
--
To view, visit https://gerrit.wikimedia.org/r/383926
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d62ad76fdb64a9c6efd228f27e9b5f512f17d5e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Anomie <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Tim Starling <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
