Fixed recently committed error.

[lhc/web/wiklou.git] / includes / SiteStatsUpdate.php

diff --git a/includes/SiteStatsUpdate.php b/includes/SiteStatsUpdate.php
index 468540a..b91dcfe 100644 (file)
--- a/includes/SiteStatsUpdate.php
+++ b/includes/SiteStatsUpdate.php
@@ -1,48 +1,92 @@
 <?php
-# $Id$
 /**
- * See deferred.doc
+ * See deferred.txt
+ *
+ * @package MediaWiki
  */
 
 /**
  *
+ * @package MediaWiki
  */
 class SiteStatsUpdate {
 
-       var $mViews, $mEdits, $mGood;
+       var $mViews, $mEdits, $mGood, $mPages, $mUsers;
 
-       function SiteStatsUpdate( $views, $edits, $good ) {
+       function SiteStatsUpdate( $views, $edits, $good, $pages = 0, $users = 0 ) {
                $this->mViews = $views;
                $this->mEdits = $edits;
                $this->mGood = $good;
+               $this->mPages = $pages;
+               $this->mUsers = $users;
+       }
+
+       function appendUpdate( &$sql, $field, $delta ) {
+               if ( $delta ) {
+                       if ( $sql ) {
+                               $sql .= ',';
+                       }
+                       if ( $delta < 0 ) {
+                               $sql .= "$field=$field-1";
+                       } else {
+                               $sql .= "$field=$field+1";
+                       }
+               }
        }
 
        function doUpdate() {
-               $a = array();
-
-               if ( $this->mViews < 0 ) { $m = '-1'; }
-               else if ( $this->mViews > 0 ) { $m = '+1'; }
-               else $m = '';
-               array_push( $a, "ss_total_views=(ss_total_views$m)" );
-
-               if ( $this->mEdits < 0 ) { $m = '-1'; }
-               else if ( $this->mEdits > 0 ) { $m = '+1'; }
-               else $m = '';
-               array_push( $a, "ss_total_edits=(ss_total_edits$m)" );
-
-               if ( $this->mGood < 0 ) { $m = '-1'; }
-               else if ( $this->mGood > 0 ) { $m = '+1'; }
-               else $m = '';
-               array_push( $a, "ss_good_articles=(ss_good_articles$m)" );
-
-               $db =& wfGetDB( DB_MASTER );
-               $site_stats = $db->tableName( 'site_stats' );
-               $lowpri = $db->lowPriorityOption();
-
-               $sql = "UPDATE $lowpri $site_stats SET " . implode ( ',', $a ) .
-                 ' WHERE ss_row_id=1';
-               $db->query( $sql, 'SiteStatsUpdate::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 );
+
+               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') );
+                               extract( $dbr->tableNames( 'page', 'user' ) );
+
+                               $sql = "SELECT COUNT(page_namespace) AS total FROM $page";
+                               $res = $dbr->query( $sql, $fname );
+                               $pageRow = $dbr->fetchObject( $res );
+                               $pages = $pageRow->total + $this->mPages;
+
+                               $sql = "SELECT COUNT(user_id) 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->begin();
+                       $dbw->query( $sql, $fname );
+                       $dbw->commit();
+               }
+
+               /*
+               global $wgDBname, $wgTitle;
+               if ( $this->mGood && $wgDBname == 'enwiki' ) {
+                       $good = $dbw->selectField( 'site_stats', 'ss_good_articles', '', $fname );
+                       error_log( $good . ' ' . $wgTitle->getPrefixedDBkey() . "\n", 3, '/home/wikipedia/logs/million.log' );
+               }
+               */
        }
 }
-
 ?>