Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed newFromConds master fallback logic; obsoleted by $flags

Browse source 
Bug: T86862
Change-Id: I6867a61fff9828fb32b063c1e84872e910c4b273
This commit is contained in:
Aaron Schulz 2015-03-10 20:53:44 -07:00
parent bfe07bed33
commit 3c2bc32ae1
1 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
includes/Revision.php
View file

@ -121,8 +121,6 @@ class Revision implements IDBAccessObject {
if ( $id ) { if ( $id ) {
// Use the specified ID // Use the specified ID
$conds['rev_id'] = $id; $conds['rev_id'] = $id;
// This uses slave->master fallback with READ_NORMAL. Assuming revdelete,
// moves, and merges are rare, callers can use this to reduce master queries.
return self::newFromConds( $conds, $flags ); return self::newFromConds( $conds, $flags );
} else { } else {
// Use a join to get the latest revision // Use a join to get the latest revision
@ -150,8 +148,6 @@ class Revision implements IDBAccessObject {
$conds = array( 'page_id' => $pageId ); $conds = array( 'page_id' => $pageId );
if ( $revId ) { if ( $revId ) {
$conds['rev_id'] = $revId; $conds['rev_id'] = $revId;
// This uses slave->master fallback with READ_NORMAL. Assuming revdelete
// and merges are rare, callers can use this to reduce master queries.
return self::newFromConds( $conds, $flags ); return self::newFromConds( $conds, $flags );
} else { } else {
// Use a join to get the latest revision // Use a join to get the latest revision
@ -310,12 +306,6 @@ class Revision implements IDBAccessObject {
private static function newFromConds( $conditions, $flags = 0 ) { private static function newFromConds( $conditions, $flags = 0 ) {
$db = wfGetDB( ( $flags & self::READ_LATEST ) ? DB_MASTER : DB_SLAVE ); $db = wfGetDB( ( $flags & self::READ_LATEST ) ? DB_MASTER : DB_SLAVE );
$rev = self::loadFromConds( $db, $conditions, $flags ); $rev = self::loadFromConds( $db, $conditions, $flags );
if ( $rev === null && wfGetLB()->getServerCount() > 1 ) {
if ( !( $flags & self::READ_LATEST ) ) {
$dbw = wfGetDB( DB_MASTER );
$rev = self::loadFromConds( $dbw, $conditions, $flags );
}
}
if ( $rev ) { if ( $rev ) {
$rev->mQueryFlags = $flags; $rev->mQueryFlags = $flags;
} }