1 files changed, 33 insertions, 31 deletions

diff --git a/includes/LinkBatch.php b/includes/LinkBatch.php
index db1114c9..bdc4b43a 100644
--- a/includes/LinkBatch.php
+++ b/includes/LinkBatch.php
@@ -4,7 +4,7 @@
  * Class representing a list of titles
  * The execute() method checks them all for existence and adds them to a LinkCache object
  *
- * @addtogroup Cache
+ * @ingroup Cache
  */
 class LinkBatch {
 	/**
@@ -18,7 +18,7 @@ class LinkBatch {
 		}
 	}
 
-	function addObj( $title ) {
+	public function addObj( $title ) {
 		if ( is_object( $title ) ) {
 			$this->add( $title->getNamespace(), $title->getDBkey() );
 		} else {
@@ -26,7 +26,7 @@ class LinkBatch {
 		}
 	}
 
-	function add( $ns, $dbkey ) {
+	public function add( $ns, $dbkey ) {
 		if ( $ns < 0 ) {
 			return;
 		}
@@ -41,21 +41,21 @@ class LinkBatch {
 	 * Set the link list to a given 2-d array
 	 * First key is the namespace, second is the DB key, value arbitrary
 	 */
-	function setArray( $array ) {
+	public function setArray( $array ) {
 		$this->data = $array;
 	}
 
 	/**
 	 * Returns true if no pages have been added, false otherwise.
 	 */
-	function isEmpty() {
+	public function isEmpty() {
 		return ($this->getSize() == 0);
 	}
 
 	/**
 	 * Returns the size of the batch.
 	 */
-	function getSize() {
+	public function getSize() {
 		return count( $this->data );
 	}
 
@@ -63,8 +63,8 @@ class LinkBatch {
 	 * Do the query and add the results to the LinkCache object
 	 * Return an array mapping PDBK to ID
 	 */
-	 function execute() {
-	 	$linkCache =& LinkCache::singleton();
+	 public function execute() {
+	 	$linkCache = LinkCache::singleton();
 	 	return $this->executeInto( $linkCache );
 	 }
 
@@ -72,13 +72,22 @@ class LinkBatch {
 	 * Do the query and add the results to a given LinkCache object
 	 * Return an array mapping PDBK to ID
 	 */
-	function executeInto( &$cache ) {
-		$fname = 'LinkBatch::executeInto';
-		wfProfileIn( $fname );
-		// Do query
+	protected function executeInto( &$cache ) {
+		wfProfileIn( __METHOD__ );
 		$res = $this->doQuery();
+		$ids = $this->addResultToCache( $cache, $res );
+		wfProfileOut( __METHOD__ );
+		return $ids;
+	}
+
+	/**
+	 * Add a ResultWrapper containing IDs and titles to a LinkCache object.
+	 * As normal, titles will go into the static Title cache field.
+	 * This function *also* stores extra fields of the title used for link
+	 * parsing to avoid extra DB queries.
+	 */
+	public function addResultToCache( $cache, $res ) {
 		if ( !$res ) {
-			wfProfileOut( $fname );
 			return array();
 		}
 
@@ -88,11 +97,10 @@ class LinkBatch {
 		$remaining = $this->data;
 		while ( $row = $res->fetchObject() ) {
 			$title = Title::makeTitle( $row->page_namespace, $row->page_title );
-			$cache->addGoodLinkObj( $row->page_id, $title );
+			$cache->addGoodLinkObj( $row->page_id, $title, $row->page_len, $row->page_is_redirect );
 			$ids[$title->getPrefixedDBkey()] = $row->page_id;
 			unset( $remaining[$row->page_namespace][$row->page_title] );
 		}
-		$res->free();
 
 		// The remaining links in $data are bad links, register them as such
 		foreach ( $remaining as $ns => $dbkeys ) {
@@ -102,20 +110,17 @@ class LinkBatch {
 				$ids[$title->getPrefixedDBkey()] = 0;
 			}
 		}
-		wfProfileOut( $fname );
 		return $ids;
 	}
 
 	/**
 	 * Perform the existence test query, return a ResultWrapper with page_id fields
 	 */
-	function doQuery() {
-		$fname = 'LinkBatch::doQuery';
-
+	public function doQuery() {
 		if ( $this->isEmpty() ) {
 			return false;
 		}
-		wfProfileIn( $fname );
+		wfProfileIn( __METHOD__ );
 
 		// Construct query
 		// This is very similar to Parser::replaceLinkHolders
@@ -123,26 +128,25 @@ class LinkBatch {
 		$page = $dbr->tableName( 'page' );
 		$set = $this->constructSet( 'page', $dbr );
 		if ( $set === false ) {
-			wfProfileOut( $fname );
+			wfProfileOut( __METHOD__ );
 			return false;
 		}
-		$sql = "SELECT page_id, page_namespace, page_title FROM $page WHERE $set";
+		$sql = "SELECT page_id, page_namespace, page_title, page_len, page_is_redirect FROM $page WHERE $set";
 
 		// Do query
-		$res = new ResultWrapper( $dbr,  $dbr->query( $sql, $fname ) );
-		wfProfileOut( $fname );
+		$res = new ResultWrapper( $dbr,  $dbr->query( $sql, __METHOD__ ) );
+		wfProfileOut( __METHOD__ );
 		return $res;
 	}
 
 	/**
 	 * Construct a WHERE clause which will match all the given titles.
-	 * Give the appropriate table's field name prefix ('page', 'pl', etc).
 	 *
-	 * @param $prefix String: ??
+	 * @param string $prefix the appropriate table's field name prefix ('page', 'pl', etc)
 	 * @return string
 	 * @public
 	 */
-	function constructSet( $prefix, &$db ) {
+	public function constructSet( $prefix, &$db ) {
 		$first = true;
 		$firstTitle = true;
 		$sql = '';
@@ -156,7 +160,7 @@ class LinkBatch {
 			} else {
 				$sql .= ' OR ';
 			}
-			
+
 			if (count($dbkeys)==1) { // avoid multiple-reference syntax if simple equality can be used
 				$singleKey = array_keys($dbkeys);
 				$sql .= "({$prefix}_namespace=$ns AND {$prefix}_title=".
@@ -164,7 +168,7 @@ class LinkBatch {
 					")";
 			} else {
 				$sql .= "({$prefix}_namespace=$ns AND {$prefix}_title IN (";
-				
+
 				$firstTitle = true;
 				foreach( $dbkeys as $dbkey => $unused ) {
 					if ( $firstTitle ) {
@@ -185,5 +189,3 @@ class LinkBatch {
 		}
 	}
 }
-
-