dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added a new "api-error-publishfailed" message.
[lhc/web/wiklou.git]
/
includes
/
SiteStats.php
diff --git
a/includes/SiteStats.php
b/includes/SiteStats.php
index
1c2c454
..
01841b6
100644
(file)
--- a/
includes/SiteStats.php
+++ b/
includes/SiteStats.php
@@
-48,8
+48,7
@@
class SiteStats {
# Update schema
$u = new SiteStatsUpdate( 0, 0, 0 );
$u->doUpdate();
# Update schema
$u = new SiteStatsUpdate( 0, 0, 0 );
$u->doUpdate();
- $dbr = wfGetDB( DB_SLAVE );
- self::$row = $dbr->selectRow( 'site_stats', '*', false, __METHOD__ );
+ self::$row = self::doLoad( wfGetDB( DB_SLAVE ) );
}
self::$loaded = true;
}
self::$loaded = true;
@@
-91,7
+90,16
@@
class SiteStats {
* @return Bool|ResultWrapper
*/
static function doLoad( $db ) {
* @return Bool|ResultWrapper
*/
static function doLoad( $db ) {
- return $db->selectRow( 'site_stats', '*', false, __METHOD__ );
+ return $db->selectRow( 'site_stats', array(
+ 'ss_row_id',
+ 'ss_total_views',
+ 'ss_total_edits',
+ 'ss_good_articles',
+ 'ss_total_pages',
+ 'ss_users',
+ 'ss_active_users',
+ 'ss_images',
+ ), false, __METHOD__ );
}
/**
}
/**
@@
-286,6
+294,8
@@
class SiteStatsUpdate implements DeferrableUpdate {
$this->doUpdatePendingDeltas();
} else {
$dbw = wfGetDB( DB_MASTER );
$this->doUpdatePendingDeltas();
} else {
$dbw = wfGetDB( DB_MASTER );
+ // Need a separate transaction because this a global lock
+ $dbw->begin( __METHOD__ );
$lockKey = wfMemcKey( 'site_stats' ); // prepend wiki ID
if ( $rate ) {
$lockKey = wfMemcKey( 'site_stats' ); // prepend wiki ID
if ( $rate ) {
@@
-306,9
+316,6
@@
class SiteStatsUpdate implements DeferrableUpdate {
$this->images += ( $pd['ss_images']['+'] - $pd['ss_images']['-'] );
}
$this->images += ( $pd['ss_images']['+'] - $pd['ss_images']['-'] );
}
- // Need a separate transaction because this a global lock
- $dbw->begin( __METHOD__ );
-
// Build up an SQL query of deltas and apply them...
$updates = '';
$this->appendUpdate( $updates, 'ss_total_views', $this->views );
// Build up an SQL query of deltas and apply them...
$updates = '';
$this->appendUpdate( $updates, 'ss_total_views', $this->views );