/**
*
* @package MediaWiki
+ * @subpackage Cache
*/
/** */
# can return a cache hit, this saves
# some extra milliseconds
$this->mDeferred = true;
-
+
wfProfileOut( $fname );
}
global $wgAllMessagesEn;
if ( $this->mDisable ) {
- wfDebug( "MessageCache::load(): disabled\n" );
+ static $shownDisabled = false;
+ if ( !$shownDisabled ) {
+ wfDebug( "MessageCache::load(): disabled\n" );
+ $shownDisabled = true;
+ }
return true;
}
$fname = 'MessageCache::load';
wfDebug( "MessageCache::load(): loading all messages\n" );
$this->lock();
# Other threads don't need to load the messages if another thread is doing it.
- $success = $this->mMemc->add( $this->mMemcKey, "loading", MSG_LOAD_TIMEOUT );
+ $success = $this->mMemc->add( $this->mMemcKey.'-status', "loading", MSG_LOAD_TIMEOUT );
if ( $success ) {
wfProfileIn( $fname.'-load' );
$this->loadFromDB();
# Save in memcached
# Keep trying if it fails, this is kind of important
wfProfileIn( $fname.'-save' );
- for ( $i=0; $i<20 && !$this->mMemc->set( $this->mMemcKey, $this->mCache, $this->mExpiry ); $i++ ) {
+ for ($i=0; $i<20 &&
+ !$this->mMemc->set( $this->mMemcKey, $this->mCache, $this->mExpiry );
+ $i++ ) {
usleep(mt_rand(500000,1500000));
}
wfProfileOut( $fname.'-save' );
if ( $i == 20 ) {
- $this->mMemc->set( $this->mMemcKey, 'error', 60*5 );
+ $this->mMemc->set( $this->mMemcKey.'-status', 'error', 60*5 );
wfDebug( "MemCached set error in MessageCache: restart memcached server!\n" );
}
}
* Loads all or main part of cacheable messages from the database
*/
function loadFromDB() {
- global $wgPartialMessageCache;
$fname = 'MessageCache::loadFromDB';
$dbr =& wfGetDB( DB_SLAVE );
- $conditions = array( 'page_is_redirect' => 0,
+ $conditions = array( 'page_is_redirect' => 0,
'page_namespace' => NS_MEDIAWIKI);
- if ($wgPartialMessageCache) {
- wfDebugDieBacktrace( "Confused about how this works." );
- if (is_array($wgPartialMessageCache)) {
- $conditions['page_title']=$wgPartialMessageCache;
- } else {
- require_once("MessageCacheHints.php");
- $conditions['page_title']=MessageCacheHints::get();
- }
- }
- $res = $dbr->select( array( 'page', 'text' ),
+ $res = $dbr->select( array( 'page', 'revision', 'text' ),
array( 'page_title', 'old_text', 'old_flags' ),
- 'page_is_redirect=0 AND page_namespace = '.NS_MEDIAWIKI.' AND page_latest = old_id',
+ 'page_is_redirect=0 AND page_namespace='.NS_MEDIAWIKI.' AND page_latest=rev_id AND rev_text_id=old_id',
$fname
);
}
$dbr->freeResult( $res );
+ /*
+ # FIXME: This is too slow currently.
+ # We need to bulk-fetch revisions, but in a portable way...
+ $resultSet = Revision::fetchFromConds( $dbr, array(
+ 'page_namespace' => NS_MEDIAWIKI,
+ 'page_is_redirect' => 0,
+ 'page_id=rev_page' ) );
+ while( $row = $resultSet->fetchObject() ) {
+ $revision = new Revision( $row );
+ $title = $revision->getTitle();
+ $this->mCache[$title->getDBkey()] = $revision->getText();
+ }
+ $resultSet->free();
+ */
}
/**
}
/**
- * Obsolete
+ * @deprecated
*/
function isCacheable( $key ) {
return true;
}
# If uninitialised, someone is trying to call this halfway through Setup.php
if( !$this->mInitialised ) {
- return "<$key>";
+ return '<' . htmlspecialchars($key) . '>';
}
# If cache initialization was deferred, start it now.
if( $this->mDeferred ) {
!$isfullkey && ($langcode != $wgContLanguageCode) ) {
$message = $this->getFromCache( $lang->ucfirst( $key ) );
}
-
+
# Final fallback
if( !$message ) {
- $message = "<$key>";
+ return '<' . htmlspecialchars($key) . '>';
}
# Replace brace tags
$message = $this->transform( $message );
return $message;
}
-
+
function getFromCache( $title ) {
$message = false;
-
+
# Try the cache
if( $this->mUseCache && is_array( $this->mCache ) && array_key_exists( $title, $this->mCache ) ) {
$message = $this->mCache[$title];
# If it wasn't in the cache, load each message from the DB individually
if ( !$message ) {
- $dbr =& wfGetDB( DB_SLAVE );
- $result = $dbr->selectRow( array( 'page', 'text' ),
- array( 'old_flags', 'old_text' ),
- 'page_namespace=' . NS_MEDIAWIKI .
- ' AND page_title=' . $dbr->addQuotes( $title ) .
- ' AND page_latest=old_id',
- 'MessageCache::get' );
- if ( $result ) {
- $message = Revision::getRevisionText( $result );
+ $revision = Revision::newFromTitle( Title::makeTitle( NS_MEDIAWIKI, $title ) );
+ if( $revision ) {
+ $message = $revision->getText();
if ($this->mUseCache) {
$this->mCache[$title]=$message;
- /* individual messages may be often
- recached until proper purge code exists
+ /* individual messages may be often
+ recached until proper purge code exists
*/
$this->mMemc->set( $this->mMemcKey . ':' . $title, $message, 300 );
}
}
}
-
+
return $message;
}
function disableTransform() { $this->mDisableTransform = true; }
function enableTransform() { $this->mDisableTransform = false; }
+ /**
+ * Add a message to the cache
+ *
+ * @param mixed $key
+ * @param mixed $value
+ */
function addMessage( $key, $value ) {
$this->mExtensionMessages[$key] = $value;
}
+ /**
+ * Add an associative array of message to the cache
+ *
+ * @param array $messages An associative array of key => values to be added
+ */
function addMessages( $messages ) {
foreach ( $messages as $key => $value ) {
$this->mExtensionMessages[$key] = $value;
dépôts / lhc / web / wiklou.git / blobdiff