X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=maintenance%2FupdateSearchIndex.php;h=ac784847852b70547344356af9fa3c06188f234c;hb=f2db5e71f0179939093a587ce68eadb562bc137e;hp=475001541fd36c1be526235278ce8bf8ff7e4510;hpb=a1c51e18af85a9ac464c5b555921e58ec422cd11;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/updateSearchIndex.php b/maintenance/updateSearchIndex.php
index 475001541f..ac78484785 100644
--- a/maintenance/updateSearchIndex.php
+++ b/maintenance/updateSearchIndex.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Script for periodic off-peak updating of the search index
+ * Periodic off-peak updating of the search index.
  *
  * Usage: php updateSearchIndex.php [-s START] [-e END] [-p POSFILE] [-l LOCKTIME] [-q]
  * Where START is the starting timestamp
@@ -24,11 +24,17 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  *
+ * @file
  * @ingroup Maintenance
  */
- 
-require_once( "Maintenance.php" );
 
+require_once( __DIR__ . '/Maintenance.php' );
+
+/**
+ * Maintenance script for periodic off-peak updating of the search index.
+ *
+ * @ingroup Maintenance
+ */
 class UpdateSearchIndex extends Maintenance {
 
 	public function __construct() {
@@ -40,30 +46,41 @@ class UpdateSearchIndex extends Maintenance {
 		$this->addOption( 'l', 'How long the searchindex and revision tables will be locked for', false, true );
 	}
 
+	public function getDbType() {
+		return Maintenance::DB_ADMIN;
+	}
+
 	public function execute() {
 		$posFile = $this->getOption( 'p', 'searchUpdate.' . wfWikiId() . '.pos' );
 		$end = $this->getOption( 'e', wfTimestampNow() );
 		if ( $this->hasOption( 's' ) ) {
-			$start = $this->getOption('s');
-		} elseif( is_readable( 'searchUpdate.pos' ) ) {
+			$start = $this->getOption( 's' );
+		} elseif ( is_readable( 'searchUpdate.pos' ) ) {
 			# B/c to the old position file name which was hardcoded
 			# We can safely delete the file when we're done though.
 			$start = file_get_contents( 'searchUpdate.pos' );
 			unlink( 'searchUpdate.pos' );
+		} elseif( is_readable( $posFile ) ) {
+			$start = file_get_contents( $posFile );
 		} else {
-			$start = @file_get_contents( $posFile );
-			if ( !$start ) {
-				$start = wfTimestamp( TS_MW, time() - 86400 );
-			}
+			$start = wfTimestamp( TS_MW, time() - 86400 );
 		}
 		$lockTime = $this->getOption( 'l', 20 );
-		
+
 		$this->doUpdateSearchIndex( $start, $end, $lockTime );
-		$file = fopen( $posFile, 'w' );
-		fwrite( $file, $end );
-		fclose( $file );
+		if ( is_writable( dirname( realpath( $posFile ) ) ) ) {
+			$file = fopen( $posFile, 'w' );
+			if ( $file !== false ) {
+				fwrite( $file, $end );
+				fclose( $file );
+			} else {
+				$this->error( "*** Couldn't write to the $posFile!\n" );
+			}
+		} else {
+			$this->error( "*** Couldn't write to the $posFile!\n" );
+		}
 	}
-	
+
 	private function doUpdateSearchIndex( $start, $end, $maxLockTime ) {
 		global $wgDisableSearchUpdate;
 
@@ -75,104 +92,25 @@ class UpdateSearchIndex extends Maintenance {
 		$this->output( "Updating searchindex between $start and $end\n" );
 
 		# Select entries from recentchanges which are on top and between the specified times
-		$start = $dbw->strencode( $start );
-		$end = $dbw->strencode( $end );
+		$start = $dbw->timestamp( $start );
+		$end = $dbw->timestamp( $end );
 
 		$page = $dbw->tableName( 'page' );
-		$sql = "SELECT rc_cur_id,rc_type,rc_moved_to_ns,rc_moved_to_title FROM $recentchanges
+		$sql = "SELECT rc_cur_id FROM $recentchanges
 		  JOIN $page ON rc_cur_id=page_id AND rc_this_oldid=page_latest
-		  WHERE rc_timestamp BETWEEN '$start' AND '$end'
+		  WHERE rc_type != " . RC_LOG . " AND rc_timestamp BETWEEN '$start' AND '$end'
 		  ";
 		$res = $dbw->query( $sql, __METHOD__ );
 
+		$this->updateSearchIndex( $maxLockTime, array( $this, 'searchIndexUpdateCallback' ), $dbw, $res );
 
-		# Lock searchindex
-		if ( $maxLockTime ) {
-			$this->output( "   --- Waiting for lock ---" );
-			$this->lockSearchindex( $dbw );
-			$lockTime = time();
-			$this->output( "\n" );
-		}
-
-		# Loop through the results and do a search update
-		while ( $row = $dbw->fetchObject( $res ) ) {
-			# Allow reads to be processed
-			if ( $maxLockTime && time() > $lockTime + $maxLockTime ) {
-				$this->output( "    --- Relocking ---" );
-				$this->relockSearchindex( $dbw );
-				$lockTime = time();
-				$this->output( "\n" );
-			}
-			if ( $row->rc_type == RC_LOG ) {
-				continue;
-			} elseif ( $row->rc_type == RC_MOVE || $row->rc_type == RC_MOVE_OVER_REDIRECT ) {
-				# Rename searchindex entry
-				$titleObj = Title::makeTitle( $row->rc_moved_to_ns, $row->rc_moved_to_title );
-				$title = $titleObj->getPrefixedDBkey();
-				$this->output( "$title..." );
-				$u = new SearchUpdate( $row->rc_cur_id, $title, false );
-				$this->output( "\n" );
-			} else {
-				// Get current revision
-				$rev = Revision::loadFromPageId( $dbw, $row->rc_cur_id );
-				if( $rev ) {
-					$titleObj = $rev->getTitle();
-					$title = $titleObj->getPrefixedDBkey();
-					$this->output( $title );
-					# Update searchindex
-					$u = new SearchUpdate( $row->rc_cur_id, $titleObj->getText(), $rev->getText() );
-					$u->doUpdate();
-					$this->output( "\n" );
-				}
-			}
-		}
-
-		# Unlock searchindex
-		if ( $maxLockTime ) {
-			$this->output( "    --- Unlocking --" );
-			$this->unlockSearchindex( $dbw );
-			$this->output( "\n" );
-		}
 		$this->output( "Done\n" );
 	}
 
-	/**
-	 * Lock the search index
-	 * @param &$db Database object
-	 */
-	private function lockSearchindex( &$db ) {
-		$write = array( 'searchindex' );
-		$read = array( 'page', 'revision', 'text', 'interwiki' );
-		$items = array();
-	
-		foreach( $write as $table ) {
-			$items[] = $db->tableName( $table ) . ' LOW_PRIORITY WRITE';
-		}
-		foreach( $read as $table ) {
-			$items[] = $db->tableName( $table ) . ' READ';
-		}
-		$sql = "LOCK TABLES " . implode( ',', $items );
-		$db->query( $sql, 'updateSearchIndex.php ' . __METHOD__ );
-	}
-
-	/**
-	 * Unlock the tables
-	 * @param &$db Database object
-	 */
-	private function unlockSearchindex( &$db ) {
-		$db->query( "UNLOCK TABLES", 'updateSearchIndex.php ' . __METHOD__ );
-	}
-	
-	/**
-	 * Unlock and lock again
-	 * Since the lock is low-priority, queued reads will be able to complete
-	 * @param &$db Database object
-	 */
-	private function relockSearchindex( &$db ) {
-		$this->unlockSearchindex( $db );
-		$this->lockSearchindex( $db );
+	public function searchIndexUpdateCallback( $dbw, $row ) {
+		$this->updateSearchIndexForPage( $dbw, $row->rc_cur_id );
 	}
 }
 
 $maintClass = "UpdateSearchIndex";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );