update to MediaWiki 1.16.0

1 files changed, 114 insertions, 18 deletions

diff --git a/maintenance/rebuildtextindex.php b/maintenance/rebuildtextindex.php
index 73dca87f..4521c6f5 100644
--- a/maintenance/rebuildtextindex.php
+++ b/maintenance/rebuildtextindex.php
@@ -1,33 +1,129 @@
 <?php
 /**
- * Rebuild search index table from scratch.  This takes several
+ * Rebuild search index table from scratch.  This may take several
  * hours, depending on the database size and server configuration.
  *
- * This is only for MySQL (see bug 9905).
  * Postgres is trigger-based and should never need rebuilding.
  *
- * @file
- * @todo document
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @ingroup Maintenance
+ * @todo document
  */
 
-/** */
-require_once( "commandLine.inc" );
-require_once( "rebuildtextindex.inc" );
+require_once( dirname(__FILE__) . '/Maintenance.php' );
 
-$database = wfGetDB( DB_MASTER );
-if( !$database instanceof DatabaseMysql ) {
-	print "This script is only for MySQL.\n";
-	exit();
-}
+class RebuildTextIndex extends Maintenance {
+ 	const RTI_CHUNK_SIZE = 500;
+	private $db;
 
-$wgTitle = Title::newFromText( "Rebuild text index script" );
+	public function __construct() {
+		parent::__construct();
+		$this->mDescription = "Rebuild search index table from scratch";
+	}
 
-dropTextIndex( $database );
-rebuildTextIndex( $database );
-createTextIndex( $database );
+	public function getDbType() {
+		return Maintenance::DB_ADMIN;
+	}
 
-print "Done.\n";
-exit();
+	public function execute() {
+		global $wgTitle, $wgDBtype;
 
+		// Shouldn't be needed for Postgres
+		if ( $wgDBtype == 'postgres' ) {
+			$this->error( "This script is not needed when using Postgres.\n", true );
+		}
+	
+		$this->db = wfGetDB( DB_MASTER );
+		$wgTitle = Title::newFromText( "Rebuild text index script" );
+	
+		if ( $wgDBtype == 'mysql' ) {
+			$this->dropMysqlTextIndex();
+			$this->populateSearchIndex();
+			$this->createMysqlTextIndex();
+		} else {
+			$this->clearSearchIndex();
+			$this->populateSearchIndex();
+		}
+	
+		$this->output( "Done.\n" );
+	}
+
+	/**
+	 * Populates the search index with content from all pages
+	 */
+	protected function populateSearchIndex() {
+		$res = $this->db->select( 'page', 'MAX(page_id) AS count' );
+		$s = $this->db->fetchObject($res);
+		$count = $s->count;
+		$this->output( "Rebuilding index fields for {$count} pages...\n" );
+		$n = 0;
+	
+		while ( $n < $count ) {
+			$this->output( $n . "\n" );
+			$end = $n + self::RTI_CHUNK_SIZE - 1;
+
+			$res = $this->db->select( array( 'page', 'revision', 'text' ), 
+				array( 'page_id', 'page_namespace', 'page_title', 'old_flags', 'old_text' ),
+				array( "page_id BETWEEN $n AND $end", 'page_latest = rev_id', 'rev_text_id = old_id' ),
+				__METHOD__
+				);
+	
+			foreach( $res as $s ) {
+				$revtext = Revision::getRevisionText( $s );
+				$u = new SearchUpdate( $s->page_id, $s->page_title, $revtext );
+				$u->doUpdate();
+			}
+			$this->db->freeResult( $res );
+			$n += self::RTI_CHUNK_SIZE;
+		}
+	}
+
+	/**
+	 * (MySQL only) Drops fulltext index before populating the table.
+	 */
+	private function dropMysqlTextIndex() {
+		$searchindex = $this->db->tableName( 'searchindex' );
+		if ( $this->db->indexExists( 'searchindex', 'si_title' ) ) {
+			$this->output( "Dropping index...\n" );
+			$sql = "ALTER TABLE $searchindex DROP INDEX si_title, DROP INDEX si_text";
+			$this->db->query($sql, __METHOD__ );
+		}
+	}
+
+	/**
+	 * (MySQL only) Adds back fulltext index after populating the table.
+	 */
+	private function createMysqlTextIndex() {
+		$searchindex = $this->db->tableName( 'searchindex' );
+		$this->output( "\nRebuild the index...\n" );
+		$sql = "ALTER TABLE $searchindex ADD FULLTEXT si_title (si_title), " .
+		  "ADD FULLTEXT si_text (si_text)";
+		$this->db->query( $sql, __METHOD__ );
+	}
+
+	/**
+	 * Deletes everything from search index.
+	 */
+	private function clearSearchIndex() {
+		$this->output( 'Clearing searchindex table...' );
+		$this->db->delete( 'searchindex', '*', __METHOD__ );
+		$this->output( "Done\n" );
+	}
+}
 
+$maintClass = "RebuildTextIndex";
+require_once( DO_MAINTENANCE );