Tim Starling has uploaded a new change for review.
https://gerrit.wikimedia.org/r/93021
Change subject: Move the DeferredUpdates hierarchy to its own directory
......................................................................
Move the DeferredUpdates hierarchy to its own directory
The grouping makes at least as much sense as job/, and certainly makes
more sense than cache/. With directories named after base classes, it is
fairly easy to tell what should go where. The grouping of
DeferredUpdates, DataUpdate and CallableUpdate would surely be
uncontroversial.
The move of SearchUpdate out of search/ demonstrates the conflict between
arrangement by module versus arrangement by type, which is the most
difficult design question here. I think arrangement by type is more
consistent with e.g. the arrangement of the core root, i.e. tests/,
resources/, maintenance/, etc. where a given feature will have its files
split up into a mostly type-based hierarchy.
I also tidied up AutoLoader.php by moving includes/content to the correct
location, sorted alphabetically by subdirectory.
Verified with AutoLoaderTest.
Change-Id: Ib369411d0caca38e72978084aa57348f1b892ed0
---
M includes/AutoLoader.php
M includes/SiteStats.php
R includes/deferred/CallableUpdate.php
R includes/deferred/DataUpdate.php
R includes/deferred/DeferredUpdates.php
R includes/deferred/HTMLCacheUpdate.php
R includes/deferred/LinksUpdate.php
R includes/deferred/SearchUpdate.php
A includes/deferred/SiteStatsUpdate.php
R includes/deferred/SqlDataUpdate.php
R includes/deferred/SquidUpdate.php
R includes/deferred/ViewCountUpdate.php
12 files changed, 274 insertions(+), 252 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/21/93021/1
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index dbba500..da85438 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -65,9 +65,6 @@
'Cookie' => 'includes/Cookie.php',
'CookieJar' => 'includes/Cookie.php',
'CurlHttpRequest' => 'includes/HttpFunctions.php',
- 'DeferrableUpdate' => 'includes/DeferredUpdates.php',
- 'DeferredUpdates' => 'includes/DeferredUpdates.php',
- 'MWCallableUpdate' => 'includes/CallableUpdate.php',
'DeprecatedGlobal' => 'includes/DeprecatedGlobal.php',
'DerivativeRequest' => 'includes/WebRequest.php',
'DiffHistoryBlob' => 'includes/HistoryBlob.php',
@@ -155,8 +152,6 @@
'Licenses' => 'includes/Licenses.php',
'Linker' => 'includes/Linker.php',
'LinkFilter' => 'includes/LinkFilter.php',
- 'LinksUpdate' => 'includes/LinksUpdate.php',
- 'LinksDeletionUpdate' => 'includes/LinksUpdate.php',
'LocalisationCache' => 'includes/cache/LocalisationCache.php',
'LocalisationCache_BulkLoad' => 'includes/cache/LocalisationCache.php',
'MagicWord' => 'includes/MagicWord.php',
@@ -212,14 +207,11 @@
'RevisionList' => 'includes/RevisionList.php',
'RSSFeed' => 'includes/Feed.php',
'Sanitizer' => 'includes/Sanitizer.php',
- 'DataUpdate' => 'includes/DataUpdate.php',
- 'SqlDataUpdate' => 'includes/SqlDataUpdate.php',
'ScopedCallback' => 'includes/ScopedCallback.php',
'ScopedPHPTimeout' => 'includes/ScopedPHPTimeout.php',
'SiteConfiguration' => 'includes/SiteConfiguration.php',
'SiteStats' => 'includes/SiteStats.php',
'SiteStatsInit' => 'includes/SiteStats.php',
- 'SiteStatsUpdate' => 'includes/SiteStats.php',
'Skin' => 'includes/Skin.php',
'SkinTemplate' => 'includes/SkinTemplate.php',
'SpecialCreateAccount' => 'includes/SpecialPage.php',
@@ -261,7 +253,6 @@
'UserCache' => 'includes/cache/UserCache.php',
'UserMailer' => 'includes/UserMailer.php',
'UserRightsProxy' => 'includes/UserRightsProxy.php',
- 'ViewCountUpdate' => 'includes/ViewCountUpdate.php',
'WantedQueryPage' => 'includes/QueryPage.php',
'WatchedItem' => 'includes/WatchedItem.php',
'WebRequest' => 'includes/WebRequest.php',
@@ -287,21 +278,6 @@
'ZhClient' => 'includes/ZhClient.php',
'ZipDirectoryReader' => 'includes/ZipDirectoryReader.php',
'ZipDirectoryReaderError' => 'includes/ZipDirectoryReader.php',
-
- # content handler
- 'AbstractContent' => 'includes/content/AbstractContent.php',
- 'ContentHandler' => 'includes/content/ContentHandler.php',
- 'Content' => 'includes/content/Content.php',
- 'CssContentHandler' => 'includes/content/CssContentHandler.php',
- 'CssContent' => 'includes/content/CssContent.php',
- 'JavaScriptContentHandler' =>
'includes/content/JavaScriptContentHandler.php',
- 'JavaScriptContent' => 'includes/content/JavaScriptContent.php',
- 'MessageContent' => 'includes/content/MessageContent.php',
- 'MWContentSerializationException' =>
'includes/content/ContentHandler.php',
- 'TextContentHandler' => 'includes/content/TextContentHandler.php',
- 'TextContent' => 'includes/content/TextContent.php',
- 'WikitextContentHandler' =>
'includes/content/WikitextContentHandler.php',
- 'WikitextContent' => 'includes/content/WikitextContent.php',
# includes/actions
'CachedAction' => 'includes/actions/CachedAction.php',
@@ -440,7 +416,6 @@
'FileDependency' => 'includes/cache/CacheDependency.php',
'GenderCache' => 'includes/cache/GenderCache.php',
'GlobalDependency' => 'includes/cache/CacheDependency.php',
- 'HTMLCacheUpdate' => 'includes/cache/HTMLCacheUpdate.php',
'HTMLFileCache' => 'includes/cache/HTMLFileCache.php',
'LinkBatch' => 'includes/cache/LinkBatch.php',
'LinkCache' => 'includes/cache/LinkCache.php',
@@ -448,7 +423,6 @@
'ObjectFileCache' => 'includes/cache/ObjectFileCache.php',
'ProcessCacheLRU' => 'includes/cache/ProcessCacheLRU.php',
'ResourceFileCache' => 'includes/cache/ResourceFileCache.php',
- 'SquidUpdate' => 'includes/cache/SquidUpdate.php',
'TitleDependency' => 'includes/cache/CacheDependency.php',
'TitleListDependency' => 'includes/cache/CacheDependency.php',
@@ -462,6 +436,21 @@
# includes/clientpool
'RedisConnectionPool' => 'includes/clientpool/RedisConnectionPool.php',
'RedisConnRef' => 'includes/clientpool/RedisConnectionPool.php',
+
+ # includes/content
+ 'AbstractContent' => 'includes/content/AbstractContent.php',
+ 'ContentHandler' => 'includes/content/ContentHandler.php',
+ 'Content' => 'includes/content/Content.php',
+ 'CssContentHandler' => 'includes/content/CssContentHandler.php',
+ 'CssContent' => 'includes/content/CssContent.php',
+ 'JavaScriptContentHandler' =>
'includes/content/JavaScriptContentHandler.php',
+ 'JavaScriptContent' => 'includes/content/JavaScriptContent.php',
+ 'MessageContent' => 'includes/content/MessageContent.php',
+ 'MWContentSerializationException' =>
'includes/content/ContentHandler.php',
+ 'TextContentHandler' => 'includes/content/TextContentHandler.php',
+ 'TextContent' => 'includes/content/TextContent.php',
+ 'WikitextContentHandler' =>
'includes/content/WikitextContentHandler.php',
+ 'WikitextContent' => 'includes/content/WikitextContent.php',
# includes/context
'ContextSource' => 'includes/context/ContextSource.php',
@@ -529,6 +518,20 @@
# includes/debug
'MWDebug' => 'includes/debug/Debug.php',
+
+ # includes/deferred
+ 'DataUpdate' => 'includes/deferred/DataUpdate.php',
+ 'DeferrableUpdate' => 'includes/deferred/DeferredUpdates.php',
+ 'DeferredUpdates' => 'includes/deferred/DeferredUpdates.php',
+ 'HTMLCacheUpdate' => 'includes/deferred/HTMLCacheUpdate.php',
+ 'LinksDeletionUpdate' => 'includes/deferred/LinksUpdate.php',
+ 'LinksUpdate' => 'includes/deferred/LinksUpdate.php',
+ 'MWCallableUpdate' => 'includes/deferred/CallableUpdate.php',
+ 'SearchUpdate' => 'includes/deferred/SearchUpdate.php',
+ 'SiteStatsUpdate' => 'includes/deferred/SiteStatsUpdate.php',
+ 'SqlDataUpdate' => 'includes/deferred/SqlDataUpdate.php',
+ 'SquidUpdate' => 'includes/deferred/SquidUpdate.php',
+ 'ViewCountUpdate' => 'includes/deferred/ViewCountUpdate.php',
# includes/diff
'_DiffEngine' => 'includes/diff/DairikiDiff.php',
@@ -909,7 +912,6 @@
'SearchResultSet' => 'includes/search/SearchEngine.php',
'SearchResultTooMany' => 'includes/search/SearchEngine.php',
'SearchSqlite' => 'includes/search/SearchSqlite.php',
- 'SearchUpdate' => 'includes/search/SearchUpdate.php',
'SqliteSearchResultSet' => 'includes/search/SearchSqlite.php',
'SqlSearchResultSet' => 'includes/search/SearchEngine.php',
diff --git a/includes/SiteStats.php b/includes/SiteStats.php
index 355993c..0df6d90 100644
--- a/includes/SiteStats.php
+++ b/includes/SiteStats.php
@@ -252,231 +252,6 @@
}
/**
- * Class for handling updates to the site_stats table
- */
-class SiteStatsUpdate implements DeferrableUpdate {
- protected $views = 0;
- protected $edits = 0;
- protected $pages = 0;
- protected $articles = 0;
- protected $users = 0;
- protected $images = 0;
-
- // @todo deprecate this constructor
- function __construct( $views, $edits, $good, $pages = 0, $users = 0 ) {
- $this->views = $views;
- $this->edits = $edits;
- $this->articles = $good;
- $this->pages = $pages;
- $this->users = $users;
- }
-
- /**
- * @param $deltas Array
- * @return SiteStatsUpdate
- */
- public static function factory( array $deltas ) {
- $update = new self( 0, 0, 0 );
-
- $fields = array( 'views', 'edits', 'pages', 'articles',
'users', 'images' );
- foreach ( $fields as $field ) {
- if ( isset( $deltas[$field] ) && $deltas[$field] ) {
- $update->$field = $deltas[$field];
- }
- }
-
- return $update;
- }
-
- public function doUpdate() {
- global $wgSiteStatsAsyncFactor;
-
- $rate = $wgSiteStatsAsyncFactor; // convenience
- // If set to do so, only do actual DB updates 1 every $rate
times.
- // The other times, just update "pending delta" values in
memcached.
- if ( $rate && ( $rate < 0 || mt_rand( 0, $rate - 1 ) != 0 ) ) {
- $this->doUpdatePendingDeltas();
- } else {
- // Need a separate transaction because this a global
lock
- wfGetDB( DB_MASTER )->onTransactionIdle( array( $this,
'tryDBUpdateInternal' ) );
- }
- }
-
- /**
- * Do not call this outside of SiteStatsUpdate
- *
- * @return void
- */
- public function tryDBUpdateInternal() {
- global $wgSiteStatsAsyncFactor;
-
- $dbw = wfGetDB( DB_MASTER );
- $lockKey = wfMemcKey( 'site_stats' ); // prepend wiki ID
- if ( $wgSiteStatsAsyncFactor ) {
- // Lock the table so we don't have double DB/memcached
updates
- if ( !$dbw->lockIsFree( $lockKey, __METHOD__ )
- || !$dbw->lock( $lockKey, __METHOD__, 1 ) // 1
sec timeout
- ) {
- $this->doUpdatePendingDeltas();
- return;
- }
- $pd = $this->getPendingDeltas();
- // Piggy-back the async deltas onto those of this stats
update....
- $this->views += ( $pd['ss_total_views']['+'] -
$pd['ss_total_views']['-'] );
- $this->edits += ( $pd['ss_total_edits']['+'] -
$pd['ss_total_edits']['-'] );
- $this->articles += ( $pd['ss_good_articles']['+'] -
$pd['ss_good_articles']['-'] );
- $this->pages += ( $pd['ss_total_pages']['+'] -
$pd['ss_total_pages']['-'] );
- $this->users += ( $pd['ss_users']['+'] -
$pd['ss_users']['-'] );
- $this->images += ( $pd['ss_images']['+'] -
$pd['ss_images']['-'] );
- }
-
- // Build up an SQL query of deltas and apply them...
- $updates = '';
- $this->appendUpdate( $updates, 'ss_total_views', $this->views );
- $this->appendUpdate( $updates, 'ss_total_edits', $this->edits );
- $this->appendUpdate( $updates, 'ss_good_articles',
$this->articles );
- $this->appendUpdate( $updates, 'ss_total_pages', $this->pages );
- $this->appendUpdate( $updates, 'ss_users', $this->users );
- $this->appendUpdate( $updates, 'ss_images', $this->images );
- if ( $updates != '' ) {
- $dbw->update( 'site_stats', array( $updates ), array(),
__METHOD__ );
- }
-
- if ( $wgSiteStatsAsyncFactor ) {
- // Decrement the async deltas now that we applied them
- $this->removePendingDeltas( $pd );
- // Commit the updates and unlock the table
- $dbw->unlock( $lockKey, __METHOD__ );
- }
- }
-
- /**
- * @param $dbw DatabaseBase
- * @return bool|mixed
- */
- public static function cacheUpdate( $dbw ) {
- global $wgActiveUserDays;
- $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 != ' . $dbr->addQuotes( 'newusers'
) . ' OR rc_log_type IS NULL',
- 'rc_timestamp >= ' . $dbr->addQuotes(
$dbr->timestamp( wfTimestamp( TS_UNIX ) - $wgActiveUserDays * 24 * 3600 ) ),
- ),
- __METHOD__
- );
- $dbw->update(
- 'site_stats',
- array( 'ss_active_users' => intval( $activeUsers ) ),
- array( 'ss_row_id' => 1 ),
- __METHOD__
- );
- return $activeUsers;
- }
-
- protected function doUpdatePendingDeltas() {
- $this->adjustPending( 'ss_total_views', $this->views );
- $this->adjustPending( 'ss_total_edits', $this->edits );
- $this->adjustPending( 'ss_good_articles', $this->articles );
- $this->adjustPending( 'ss_total_pages', $this->pages );
- $this->adjustPending( 'ss_users', $this->users );
- $this->adjustPending( 'ss_images', $this->images );
- }
-
- /**
- * @param $sql string
- * @param $field string
- * @param $delta integer
- */
- protected function appendUpdate( &$sql, $field, $delta ) {
- if ( $delta ) {
- if ( $sql ) {
- $sql .= ',';
- }
- if ( $delta < 0 ) {
- $sql .= "$field=$field-" . abs( $delta );
- } else {
- $sql .= "$field=$field+" . abs( $delta );
- }
- }
- }
-
- /**
- * @param $type string
- * @param string $sign ('+' or '-')
- * @return string
- */
- private function getTypeCacheKey( $type, $sign ) {
- return wfMemcKey( 'sitestatsupdate', 'pendingdelta', $type,
$sign );
- }
-
- /**
- * Adjust the pending deltas for a stat type.
- * Each stat type has two pending counters, one for increments and
decrements
- * @param $type string
- * @param $delta integer Delta (positive or negative)
- * @return void
- */
- protected function adjustPending( $type, $delta ) {
- global $wgMemc;
-
- if ( $delta < 0 ) { // decrement
- $key = $this->getTypeCacheKey( $type, '-' );
- } else { // increment
- $key = $this->getTypeCacheKey( $type, '+' );
- }
-
- $magnitude = abs( $delta );
- if ( !$wgMemc->incr( $key, $magnitude ) ) { // not there?
- if ( !$wgMemc->add( $key, $magnitude ) ) { // race?
- $wgMemc->incr( $key, $magnitude );
- }
- }
- }
-
- /**
- * Get pending delta counters for each stat type
- * @return Array Positive and negative deltas for each type
- * @return void
- */
- protected function getPendingDeltas() {
- global $wgMemc;
-
- $pending = array();
- foreach ( array( 'ss_total_views', 'ss_total_edits',
- 'ss_good_articles', 'ss_total_pages', 'ss_users',
'ss_images' ) as $type )
- {
- // Get pending increments and pending decrements
- $pending[$type]['+'] = (int)$wgMemc->get(
$this->getTypeCacheKey( $type, '+' ) );
- $pending[$type]['-'] = (int)$wgMemc->get(
$this->getTypeCacheKey( $type, '-' ) );
- }
-
- return $pending;
- }
-
- /**
- * Reduce pending delta counters after updates have been applied
- * @param array $pd Result of getPendingDeltas(), used for DB update
- * @return void
- */
- protected function removePendingDeltas( array $pd ) {
- global $wgMemc;
-
- foreach ( $pd as $type => $deltas ) {
- foreach ( $deltas as $sign => $magnitude ) {
- // Lower the pending counter now that we
applied these changes
- $wgMemc->decr( $this->getTypeCacheKey( $type,
$sign ), $magnitude );
- }
- }
- }
-}
-
-/**
* Class designed for counting of stats.
*/
class SiteStatsInit {
diff --git a/includes/CallableUpdate.php b/includes/deferred/CallableUpdate.php
similarity index 100%
rename from includes/CallableUpdate.php
rename to includes/deferred/CallableUpdate.php
diff --git a/includes/DataUpdate.php b/includes/deferred/DataUpdate.php
similarity index 100%
rename from includes/DataUpdate.php
rename to includes/deferred/DataUpdate.php
diff --git a/includes/DeferredUpdates.php
b/includes/deferred/DeferredUpdates.php
similarity index 100%
rename from includes/DeferredUpdates.php
rename to includes/deferred/DeferredUpdates.php
diff --git a/includes/cache/HTMLCacheUpdate.php
b/includes/deferred/HTMLCacheUpdate.php
similarity index 100%
rename from includes/cache/HTMLCacheUpdate.php
rename to includes/deferred/HTMLCacheUpdate.php
diff --git a/includes/LinksUpdate.php b/includes/deferred/LinksUpdate.php
similarity index 100%
rename from includes/LinksUpdate.php
rename to includes/deferred/LinksUpdate.php
diff --git a/includes/search/SearchUpdate.php
b/includes/deferred/SearchUpdate.php
similarity index 100%
rename from includes/search/SearchUpdate.php
rename to includes/deferred/SearchUpdate.php
diff --git a/includes/deferred/SiteStatsUpdate.php
b/includes/deferred/SiteStatsUpdate.php
new file mode 100644
index 0000000..09ff87d
--- /dev/null
+++ b/includes/deferred/SiteStatsUpdate.php
@@ -0,0 +1,245 @@
+<?php
+/**
+ * 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
+ *
+ * @file
+ */
+
+/**
+ * Class for handling updates to the site_stats table
+ */
+class SiteStatsUpdate implements DeferrableUpdate {
+ protected $views = 0;
+ protected $edits = 0;
+ protected $pages = 0;
+ protected $articles = 0;
+ protected $users = 0;
+ protected $images = 0;
+
+ // @todo deprecate this constructor
+ function __construct( $views, $edits, $good, $pages = 0, $users = 0 ) {
+ $this->views = $views;
+ $this->edits = $edits;
+ $this->articles = $good;
+ $this->pages = $pages;
+ $this->users = $users;
+ }
+
+ /**
+ * @param $deltas Array
+ * @return SiteStatsUpdate
+ */
+ public static function factory( array $deltas ) {
+ $update = new self( 0, 0, 0 );
+
+ $fields = array( 'views', 'edits', 'pages', 'articles',
'users', 'images' );
+ foreach ( $fields as $field ) {
+ if ( isset( $deltas[$field] ) && $deltas[$field] ) {
+ $update->$field = $deltas[$field];
+ }
+ }
+
+ return $update;
+ }
+
+ public function doUpdate() {
+ global $wgSiteStatsAsyncFactor;
+
+ $rate = $wgSiteStatsAsyncFactor; // convenience
+ // If set to do so, only do actual DB updates 1 every $rate
times.
+ // The other times, just update "pending delta" values in
memcached.
+ if ( $rate && ( $rate < 0 || mt_rand( 0, $rate - 1 ) != 0 ) ) {
+ $this->doUpdatePendingDeltas();
+ } else {
+ // Need a separate transaction because this a global
lock
+ wfGetDB( DB_MASTER )->onTransactionIdle( array( $this,
'tryDBUpdateInternal' ) );
+ }
+ }
+
+ /**
+ * Do not call this outside of SiteStatsUpdate
+ *
+ * @return void
+ */
+ public function tryDBUpdateInternal() {
+ global $wgSiteStatsAsyncFactor;
+
+ $dbw = wfGetDB( DB_MASTER );
+ $lockKey = wfMemcKey( 'site_stats' ); // prepend wiki ID
+ if ( $wgSiteStatsAsyncFactor ) {
+ // Lock the table so we don't have double DB/memcached
updates
+ if ( !$dbw->lockIsFree( $lockKey, __METHOD__ )
+ || !$dbw->lock( $lockKey, __METHOD__, 1 ) // 1
sec timeout
+ ) {
+ $this->doUpdatePendingDeltas();
+ return;
+ }
+ $pd = $this->getPendingDeltas();
+ // Piggy-back the async deltas onto those of this stats
update....
+ $this->views += ( $pd['ss_total_views']['+'] -
$pd['ss_total_views']['-'] );
+ $this->edits += ( $pd['ss_total_edits']['+'] -
$pd['ss_total_edits']['-'] );
+ $this->articles += ( $pd['ss_good_articles']['+'] -
$pd['ss_good_articles']['-'] );
+ $this->pages += ( $pd['ss_total_pages']['+'] -
$pd['ss_total_pages']['-'] );
+ $this->users += ( $pd['ss_users']['+'] -
$pd['ss_users']['-'] );
+ $this->images += ( $pd['ss_images']['+'] -
$pd['ss_images']['-'] );
+ }
+
+ // Build up an SQL query of deltas and apply them...
+ $updates = '';
+ $this->appendUpdate( $updates, 'ss_total_views', $this->views );
+ $this->appendUpdate( $updates, 'ss_total_edits', $this->edits );
+ $this->appendUpdate( $updates, 'ss_good_articles',
$this->articles );
+ $this->appendUpdate( $updates, 'ss_total_pages', $this->pages );
+ $this->appendUpdate( $updates, 'ss_users', $this->users );
+ $this->appendUpdate( $updates, 'ss_images', $this->images );
+ if ( $updates != '' ) {
+ $dbw->update( 'site_stats', array( $updates ), array(),
__METHOD__ );
+ }
+
+ if ( $wgSiteStatsAsyncFactor ) {
+ // Decrement the async deltas now that we applied them
+ $this->removePendingDeltas( $pd );
+ // Commit the updates and unlock the table
+ $dbw->unlock( $lockKey, __METHOD__ );
+ }
+ }
+
+ /**
+ * @param $dbw DatabaseBase
+ * @return bool|mixed
+ */
+ public static function cacheUpdate( $dbw ) {
+ global $wgActiveUserDays;
+ $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 != ' . $dbr->addQuotes( 'newusers'
) . ' OR rc_log_type IS NULL',
+ 'rc_timestamp >= ' . $dbr->addQuotes(
$dbr->timestamp( wfTimestamp( TS_UNIX ) - $wgActiveUserDays * 24 * 3600 ) ),
+ ),
+ __METHOD__
+ );
+ $dbw->update(
+ 'site_stats',
+ array( 'ss_active_users' => intval( $activeUsers ) ),
+ array( 'ss_row_id' => 1 ),
+ __METHOD__
+ );
+ return $activeUsers;
+ }
+
+ protected function doUpdatePendingDeltas() {
+ $this->adjustPending( 'ss_total_views', $this->views );
+ $this->adjustPending( 'ss_total_edits', $this->edits );
+ $this->adjustPending( 'ss_good_articles', $this->articles );
+ $this->adjustPending( 'ss_total_pages', $this->pages );
+ $this->adjustPending( 'ss_users', $this->users );
+ $this->adjustPending( 'ss_images', $this->images );
+ }
+
+ /**
+ * @param $sql string
+ * @param $field string
+ * @param $delta integer
+ */
+ protected function appendUpdate( &$sql, $field, $delta ) {
+ if ( $delta ) {
+ if ( $sql ) {
+ $sql .= ',';
+ }
+ if ( $delta < 0 ) {
+ $sql .= "$field=$field-" . abs( $delta );
+ } else {
+ $sql .= "$field=$field+" . abs( $delta );
+ }
+ }
+ }
+
+ /**
+ * @param $type string
+ * @param string $sign ('+' or '-')
+ * @return string
+ */
+ private function getTypeCacheKey( $type, $sign ) {
+ return wfMemcKey( 'sitestatsupdate', 'pendingdelta', $type,
$sign );
+ }
+
+ /**
+ * Adjust the pending deltas for a stat type.
+ * Each stat type has two pending counters, one for increments and
decrements
+ * @param $type string
+ * @param $delta integer Delta (positive or negative)
+ * @return void
+ */
+ protected function adjustPending( $type, $delta ) {
+ global $wgMemc;
+
+ if ( $delta < 0 ) { // decrement
+ $key = $this->getTypeCacheKey( $type, '-' );
+ } else { // increment
+ $key = $this->getTypeCacheKey( $type, '+' );
+ }
+
+ $magnitude = abs( $delta );
+ if ( !$wgMemc->incr( $key, $magnitude ) ) { // not there?
+ if ( !$wgMemc->add( $key, $magnitude ) ) { // race?
+ $wgMemc->incr( $key, $magnitude );
+ }
+ }
+ }
+
+ /**
+ * Get pending delta counters for each stat type
+ * @return Array Positive and negative deltas for each type
+ * @return void
+ */
+ protected function getPendingDeltas() {
+ global $wgMemc;
+
+ $pending = array();
+ foreach ( array( 'ss_total_views', 'ss_total_edits',
+ 'ss_good_articles', 'ss_total_pages', 'ss_users',
'ss_images' ) as $type )
+ {
+ // Get pending increments and pending decrements
+ $pending[$type]['+'] = (int)$wgMemc->get(
$this->getTypeCacheKey( $type, '+' ) );
+ $pending[$type]['-'] = (int)$wgMemc->get(
$this->getTypeCacheKey( $type, '-' ) );
+ }
+
+ return $pending;
+ }
+
+ /**
+ * Reduce pending delta counters after updates have been applied
+ * @param array $pd Result of getPendingDeltas(), used for DB update
+ * @return void
+ */
+ protected function removePendingDeltas( array $pd ) {
+ global $wgMemc;
+
+ foreach ( $pd as $type => $deltas ) {
+ foreach ( $deltas as $sign => $magnitude ) {
+ // Lower the pending counter now that we
applied these changes
+ $wgMemc->decr( $this->getTypeCacheKey( $type,
$sign ), $magnitude );
+ }
+ }
+ }
+}
+
diff --git a/includes/SqlDataUpdate.php b/includes/deferred/SqlDataUpdate.php
similarity index 100%
rename from includes/SqlDataUpdate.php
rename to includes/deferred/SqlDataUpdate.php
diff --git a/includes/cache/SquidUpdate.php b/includes/deferred/SquidUpdate.php
similarity index 100%
rename from includes/cache/SquidUpdate.php
rename to includes/deferred/SquidUpdate.php
diff --git a/includes/ViewCountUpdate.php
b/includes/deferred/ViewCountUpdate.php
similarity index 100%
rename from includes/ViewCountUpdate.php
rename to includes/deferred/ViewCountUpdate.php
--
To view, visit https://gerrit.wikimedia.org/r/93021
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib369411d0caca38e72978084aa57348f1b892ed0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tim Starling <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
