X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FSiteStats.php;h=b07bdbbe07136702a3a790ababd105ed53ba39c2;hb=bec7a947e7bdfb6fa0eac10b4d3e2817c7c17173;hp=3729f455a77d71aac9278a6e7e0280b34c0a8372;hpb=1627c222df7cadb1cfa1e25be2d844e480b2d4bc;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/SiteStats.php b/includes/SiteStats.php
index 3729f455a7..b07bdbbe07 100644
--- a/includes/SiteStats.php
+++ b/includes/SiteStats.php
@@ -49,12 +49,7 @@ class SiteStats {
 			// clean schema with mwdumper.
 			wfDebug( __METHOD__ . ": initializing damaged or missing site_stats\n" );
 
-			global $IP;
-			require_once "$IP/maintenance/initStats.inc";
-
-			ob_start();
-			wfInitStats();
-			ob_end_clean();
+			SiteStatsInit::doAllAndCommit( false );
 
 			$row = self::doLoad( wfGetDB( DB_MASTER ) );
 		}
@@ -93,7 +88,7 @@ class SiteStats {
 		self::load();
 		return self::$row->ss_users;
 	}
-	
+
 	static function activeUsers() {
 		self::load();
 		return self::$row->ss_active_users;
@@ -109,36 +104,40 @@ class SiteStats {
 	 */
 	static function admins() {
 		wfDeprecated(__METHOD__);
-		return self::numberingroup('sysop');
+		return self::numberingroup( 'sysop' );
 	}
-	
+
 	/**
 	 * Find the number of users in a given user group.
-	 * @param string $group Name of group
-	 * @return int
+	 * @param $group String: name of group
+	 * @return Integer
 	 */
-	static function numberingroup($group) {
+	static function numberingroup( $group ) {
 		if ( !isset( self::$groupMemberCounts[$group] ) ) {
 			global $wgMemc;
 			$key = wfMemcKey( 'SiteStats', 'groupcounts', $group );
 			$hit = $wgMemc->get( $key );
 			if ( !$hit ) {
 				$dbr = wfGetDB( DB_SLAVE );
-				$hit = $dbr->selectField( 'user_groups', 'COUNT(*)', 
-													array( 'ug_group' => $group ), __METHOD__ );
+				$hit = $dbr->selectField(
+					'user_groups',
+					'COUNT(*)',
+					array( 'ug_group' => $group ),
+					__METHOD__
+				);
 				$wgMemc->set( $key, $hit, 3600 );
 			}
 			self::$groupMemberCounts[$group] = $hit;
 		}
-		return self::$groupMemberCounts[$group];		
+		return self::$groupMemberCounts[$group];
 	}
 
 	static function jobs() {
 		if ( !isset( self::$jobs ) ) {
 			$dbr = wfGetDB( DB_SLAVE );
-			self::$jobs = $dbr->estimateRowCount('job');
+			self::$jobs = $dbr->estimateRowCount( 'job' );
 			/* Zero rows still do single row read for row that doesn't exist, but people are annoyed by that */
-			if (self::$jobs == 1) {
+			if ( self::$jobs == 1 ) {
 				self::$jobs = 0;
 			}
 		}
@@ -149,7 +148,12 @@ class SiteStats {
 		wfProfileIn( __METHOD__ );
 		if( !isset( self::$pageCount[$ns] ) ) {
 			$dbr = wfGetDB( DB_SLAVE );
-			$pageCount[$ns] = (int)$dbr->selectField( 'page', 'COUNT(*)', array( 'page_namespace' => $ns ), __METHOD__ );
+			$pageCount[$ns] = (int)$dbr->selectField(
+				'page',
+				'COUNT(*)',
+				array( 'page_namespace' => $ns ),
+				__METHOD__
+			);
 		}
 		wfProfileOut( __METHOD__ );
 		return $pageCount[$ns];
@@ -161,7 +165,6 @@ class SiteStats {
 			$row === false
 			or $row->ss_total_pages < $row->ss_good_articles
 			or $row->ss_total_edits < $row->ss_total_pages
-			or $row->ss_users       < $row->ss_admins
 		) {
 			return false;
 		}
@@ -169,7 +172,7 @@ class SiteStats {
 		foreach( array( 'total_views', 'total_edits', 'good_articles',
 		'total_pages', 'users', 'admins', 'images' ) as $member ) {
 			if(
-				   $row->{"ss_$member"} > 2000000000
+				$row->{"ss_$member"} > 2000000000
 				or $row->{"ss_$member"} < 0
 			) {
 				return false;
@@ -209,60 +212,203 @@ class SiteStatsUpdate {
 	}
 
 	function doUpdate() {
-		$fname = 'SiteStatsUpdate::doUpdate';
 		$dbw = wfGetDB( DB_MASTER );
 
-		# First retrieve the row just to find out which schema we're in
-		$row = $dbw->selectRow( 'site_stats', '*', false, $fname );
-
 		$updates = '';
 
 		$this->appendUpdate( $updates, 'ss_total_views', $this->mViews );
 		$this->appendUpdate( $updates, 'ss_total_edits', $this->mEdits );
 		$this->appendUpdate( $updates, 'ss_good_articles', $this->mGood );
+		$this->appendUpdate( $updates, 'ss_total_pages', $this->mPages );
+		$this->appendUpdate( $updates, 'ss_users', $this->mUsers );
 
-		if ( isset( $row->ss_total_pages ) ) {
-			# Update schema if required
-			if ( $row->ss_total_pages == -1 && !$this->mViews ) {
-				$dbr = wfGetDB( DB_SLAVE, array( 'SpecialStatistics', 'vslow') );
-				list( $page, $user ) = $dbr->tableNamesN( 'page', 'user' );
-
-				$sql = "SELECT COUNT(*) AS total FROM $page";
-				$res = $dbr->query( $sql, $fname );
-				$pageRow = $dbr->fetchObject( $res );
-				$pages = $pageRow->total + $this->mPages;
-
-				$sql = "SELECT COUNT(*) AS total FROM $user";
-				$res = $dbr->query( $sql, $fname );
-				$userRow = $dbr->fetchObject( $res );
-				$users = $userRow->total + $this->mUsers;
-
-				if ( $updates ) {
-					$updates .= ',';
-				}
-				$updates .= "ss_total_pages=$pages, ss_users=$users";
-			} else {
-				$this->appendUpdate( $updates, 'ss_total_pages', $this->mPages );
-				$this->appendUpdate( $updates, 'ss_users', $this->mUsers );
-			}
-		}
 		if ( $updates ) {
 			$site_stats = $dbw->tableName( 'site_stats' );
-			$sql = $dbw->limitResultForUpdate("UPDATE $site_stats SET $updates", 1);
-			$dbw->query( $sql, $fname );
+			$sql = "UPDATE $site_stats SET $updates";
+
+			# Need a separate transaction because this a global lock
+			$dbw->begin();
+			$dbw->query( $sql, __METHOD__ );
+			$dbw->commit();
 		}
 	}
-	
+
 	public static function cacheUpdate( $dbw ) {
-		$dbr = wfGetDB( DB_SLAVE, array( 'SpecialStatistics', 'vslow') );
+		$dbr = wfGetDB( DB_SLAVE, array( 'SpecialStatistics', 'vslow' ) );
 		# Get non-bot users than did some recent action other than making accounts.
 		# If account creation is included, the number gets inflated ~20+ fold on enwiki.
-		$activeUsers = $dbr->selectField( 'recentchanges', 'COUNT( DISTINCT rc_user_text )',
-			array( 'rc_user != 0', 'rc_bot' => 0, "rc_log_type != 'newusers'" ),
-			__METHOD__ );
-		$dbw->update( 'site_stats', 
-			array( 'ss_active_users' => intval($activeUsers) ),
-			array( 'ss_row_id' => 1 ), __METHOD__, array( 'LIMIT' => 1 )
+		$activeUsers = $dbr->selectField(
+			'recentchanges',
+			'COUNT( DISTINCT rc_user_text )',
+			array(
+				'rc_user != 0',
+				'rc_bot' => 0,
+				"rc_log_type != 'newusers' OR rc_log_type IS NULL"
+			),
+			__METHOD__
+		);
+		$dbw->update(
+			'site_stats',
+			array( 'ss_active_users' => intval( $activeUsers ) ),
+			array( 'ss_row_id' => 1 ),
+			__METHOD__
+		);
+		return $activeUsers;
+	}
+}
+
+/**
+ * Class designed for counting of stats.
+ */
+class SiteStatsInit {
+
+	// Database connection
+	private $db;
+
+	// Various stats
+	private $mEdits, $mArticles, $mPages, $mUsers, $mViews, $mFiles = 0;
+
+	/**
+	 * Constructor
+	 * @param $useMaster Boolean: whether to use the master DB
+	 */
+	public function __construct( $useMaster = false ) {
+		$this->db = wfGetDB( $useMaster ? DB_MASTER : DB_SLAVE );
+	}
+
+	/**
+	 * Count the total number of edits
+	 * @return Integer
+	 */
+	public function edits() {
+		$this->mEdits = $this->db->selectField( 'revision', 'COUNT(*)', '', __METHOD__ );
+		$this->mEdits += $this->db->selectField( 'archive', 'COUNT(*)', '', __METHOD__ );
+		return $this->mEdits;
+	}
+
+	/**
+	 * Count pages in article space(s)
+	 * @return Integer
+	 */
+	public function articles() {
+		global $wgContentNamespaces;
+		$this->mArticles = $this->db->selectField(
+			'page',
+			'COUNT(*)',
+			array(
+				'page_namespace' => $wgContentNamespaces,
+				'page_is_redirect' => 0,
+				'page_len > 0'
+			),
+			__METHOD__
+		);
+		return $this->mArticles;
+	}
+
+	/**
+	 * Count total pages
+	 * @return Integer
+	 */
+	public function pages() {
+		$this->mPages = $this->db->selectField( 'page', 'COUNT(*)', '', __METHOD__ );
+		return $this->mPages;
+	}
+	
+	/**
+	 * Count total users
+	 * @return Integer
+	 */
+	public function users() {
+		$this->mUsers = $this->db->selectField( 'user', 'COUNT(*)', '', __METHOD__ );
+		return $this->mUsers;
+	}
+	
+	/**
+	 * Count views
+	 * @return Integer
+	 */
+	public function views() {
+		$this->mViews = $this->db->selectField( 'page', 'SUM(page_counter)', '', __METHOD__ );
+		return $this->mViews;
+	}
+
+	/**
+	 * Count total files
+	 * @return Integer
+	 */
+	public function files() {
+		$this->mFiles = $this->db->selectField( 'image', 'COUNT(*)', '', __METHOD__ );
+		return $this->mFiles;
+	}
+
+	/**
+	 * Do all updates and commit them. More or less a replacement
+	 * for the original initStats, but without the calls to wfOut()
+	 * @param $update Boolean: whether to update the current stats or write fresh
+	 * @param $noViews Boolean: when true, do not update the number of page views
+	 * @param $activeUsers Boolean: whether to update the number of active users
+	 */
+	public static function doAllAndCommit( $update, $noViews = false, $activeUsers = false ) {
+		// Grab the object and count everything
+		$counter = new SiteStatsInit( false );
+		$counter->edits();
+		$counter->articles();
+		$counter->pages();
+		$counter->users();
+		$counter->files();
+
+		// Only do views if we don't want to not count them
+		if( !$noViews ) {
+			$counter->views();
+		}
+
+		// Update/refresh
+		if( $update ) {
+			$counter->update();
+		} else {
+			$counter->refresh();
+		}
+
+		// Count active users if need be
+		if( $activeUsers ) {
+			SiteStatsUpdate::cacheUpdate( wfGetDB( DB_MASTER ) );
+		}
+	}
+
+	/**
+	 * Update the current row with the selected values
+	 */
+	public function update() {
+		list( $values, $conds ) = $this->getDbParams();
+		$dbw = wfGetDB( DB_MASTER );
+		$dbw->update( 'site_stats', $values, $conds, __METHOD__ );
+	}
+
+	/**
+	 * Refresh site_stats. Erase the current record and save all
+	 * the new values.
+	 */
+	public function refresh() {
+		list( $values, $conds, $views ) = $this->getDbParams();
+		$dbw = wfGetDB( DB_MASTER );
+		$dbw->delete( 'site_stats', $conds, __METHOD__ );
+		$dbw->insert( 'site_stats', array_merge( $values, $conds, $views ), __METHOD__ );
+	}
+
+	/**
+	 * Return three arrays of params for the db queries
+	 * @return Array
+	 */
+	private function getDbParams() {
+		$values = array(
+			'ss_total_edits' => $this->mEdits,
+			'ss_good_articles' => $this->mArticles,
+			'ss_total_pages' => $this->mPages,
+			'ss_users' => $this->mUsers,
+			'ss_images' => $this->mFiles
 		);
+		$conds = array( 'ss_row_id' => 1 );
+		$views = array( 'ss_total_views' => $this->mViews );
+		return array( $values, $conds, $views );
 	}
 }