Implement WikiPage::getOldestRevision() in terms of Title::getFirstRevision()

They were both doing the same thing, except that getOldestRevision()
checks the master if the revision is missing on the replica.

Change-Id: I21a118c6cd5c98fb846a0a2765574c0dbdbf7220

diff --git a/includes/Title.php b/includes/Title.php
index 0c5835c..f8d973c 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -4030,7 +4030,6 @@ class Title implements LinkTarget {
                                __METHOD__,
                                [
                                        'ORDER BY' => 'rev_timestamp ASC',
-                                       'LIMIT' => 1,
                                        'IGNORE INDEX' => 'rev_timestamp'
                                ]
                        );

diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index 1d5973b..6d2cdeb 100644 (file)
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -574,36 +574,12 @@ class WikiPage implements Page, IDBAccessObject {
         * @return Revision|null
         */
        public function getOldestRevision() {
-
                // Try using the replica DB first, then try the master
-               $continue = 2;
-               $db = wfGetDB( DB_REPLICA );
-               $revSelectFields = Revision::selectFields();
-
-               $row = null;
-               while ( $continue ) {
-                       $row = $db->selectRow(
-                               [ 'revision' ],
-                               $revSelectFields,
-                               [
-                                       'rev_page' => $this->getId()
-                               ],
-                               __METHOD__,
-                               [
-                                       'ORDER BY' => 'rev_timestamp ASC',
-                                       'IGNORE INDEX' => 'rev_timestamp'
-                               ]
-                       );
-
-                       if ( $row ) {
-                               $continue = 0;
-                       } else {
-                               $db = wfGetDB( DB_MASTER );
-                               $continue--;
-                       }
+               $rev = $this->mTitle->getFirstRevision();
+               if ( !$rev ) {
+                       $rev = $this->mTitle->getFirstRevision( Title::GAID_FOR_UPDATE );
                }
-
-               return $row ? Revision::newFromRow( $row ) : null;
+               return $rev;
        }
 
        /**