Liangent has uploaded a new change for review.
https://gerrit.wikimedia.org/r/137847
Change subject: Remove $dbr from ChangeTags::addTags()
......................................................................
Remove $dbr from ChangeTags::addTags()
$dbr (DB_SLAVE) is completely unused now.
Change-Id: I02bbde8366480b841d8028403e9a0efe88fa46fd
---
M includes/ChangeTags.php
1 file changed, 5 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/47/137847/1
diff --git a/includes/ChangeTags.php b/includes/ChangeTags.php
index 7e19164..28db8a1 100644
--- a/includes/ChangeTags.php
+++ b/includes/ChangeTags.php
@@ -101,21 +101,20 @@
'specified when adding a tag to a change!' );
}
- $dbr = wfGetDB( DB_SLAVE );
+ $dbw = wfGetDB( DB_MASTER );
// Might as well look for rcids and so on.
if ( !$rc_id ) {
// Info might be out of date, somewhat fractionally, on
slave.
- $dbr = wfGetDB( DB_MASTER );
if ( $log_id ) {
- $rc_id = $dbr->selectField(
+ $rc_id = $dbw->selectField(
'recentchanges',
'rc_id',
array( 'rc_logid' => $log_id ),
__METHOD__
);
} elseif ( $rev_id ) {
- $rc_id = $dbr->selectField(
+ $rc_id = $dbw->selectField(
'recentchanges',
'rc_id',
array( 'rc_this_oldid' => $rev_id ),
@@ -124,14 +123,13 @@
}
} elseif ( !$log_id && !$rev_id ) {
// Info might be out of date, somewhat fractionally, on
slave.
- $dbr = wfGetDB( DB_MASTER );
- $log_id = $dbr->selectField(
+ $log_id = $dbw->selectField(
'recentchanges',
'rc_logid',
array( 'rc_id' => $rc_id ),
__METHOD__
);
- $rev_id = $dbr->selectField(
+ $rev_id = $dbw->selectField(
'recentchanges',
'rc_this_oldid',
array( 'rc_id' => $rc_id ),
@@ -146,7 +144,6 @@
);
## Update the summary row.
- $dbw = wfGetDB( DB_MASTER );
// $prevTags can be out of date on slaves, especially when
addTags is called consecutively,
// causing loss of tags added recently in tag_summary table.
$prevTags = $dbw->selectField( 'tag_summary', 'ts_tags',
$tsConds, __METHOD__ );
--
To view, visit https://gerrit.wikimedia.org/r/137847
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I02bbde8366480b841d8028403e9a0efe88fa46fd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Liangent <liang...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
