From 3c2bc32ae1775f5e875958b62d7181b4b5cfe24e Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Tue, 10 Mar 2015 20:53:44 -0700 Subject: [PATCH] Removed newFromConds master fallback logic; obsoleted by $flags Bug: T86862 Change-Id: I6867a61fff9828fb32b063c1e84872e910c4b273 --- includes/Revision.php | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/includes/Revision.php b/includes/Revision.php index d535028a92..6f57bc02a3 100644 --- a/includes/Revision.php +++ b/includes/Revision.php @@ -121,8 +121,6 @@ class Revision implements IDBAccessObject { if ( $id ) { // Use the specified 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 ); } else { // Use a join to get the latest revision @@ -150,8 +148,6 @@ class Revision implements IDBAccessObject { $conds = array( 'page_id' => $pageId ); if ( $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 ); } else { // Use a join to get the latest revision @@ -310,12 +306,6 @@ class Revision implements IDBAccessObject { private static function newFromConds( $conditions, $flags = 0 ) { $db = wfGetDB( ( $flags & self::READ_LATEST ) ? DB_MASTER : DB_SLAVE ); $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 ) { $rev->mQueryFlags = $flags; } -- 2.20.1