* $wgWikiDiff2MovedParagraphDetectionCutoff — If you still want a custom change
size threshold, please specify in php.ini, using the configuration variable
wikidiff2.moved_paragraph_detection_cutoff.
+* $wgDebugPrintHttpHeaders - The default of including HTTP headers in the
+ debug log channel is no longer configurable. The debug log itself remains
+ configurable via $wgDebugLogFile.
=== New user-facing features in 1.34 ===
* Special:Mute has been added as a quick way for users to block unwanted emails
* Updated wikimedia/at-ease from 1.2.0 to 2.0.0.
* Updated wikimedia/remex-html from 2.0.1 to 2.0.3.
* Updated monolog/monolog from 1.22.1 to 1.24.0 (dev-only).
-* Updated wikimedia/object-factory from 1.0.0 to 2.0.0.
+* Updated wikimedia/object-factory from 1.0.0 to 2.1.0.
* Updated wikimedia/timestamp from 2.2.0 to 3.0.0.
* Updated wikimedia/xmp-reader from 0.6.2 to 0.6.3.
* Updated mediawiki/mediawiki-phan-config from 0.6.0 to 0.6.1 (dev-only).
* The 'user.groups' module, deprecated in 1.28, was removed.
Use the 'user' module instead.
* The ability to override User::$mRights has been removed.
+* Previously, when iterating ResultWrapper with foreach() or a similar
+ construct, the range of the index was 1..numRows. This has been fixed to be
+ 0..(numRows-1).
+* The ChangePasswordForm hook, deprecated in 1.27, has been removed. Use the
+ AuthChangeFormFields hook or security levels instead.
+* WikiMap::getWikiIdFromDomain(), deprecated in 1.33, has been removed.
+ Use WikiMap::getWikiIdFromDbDomain() instead.
* …
=== Deprecations in 1.34 ===
"wikimedia/html-formatter": "1.0.2",
"wikimedia/ip-set": "2.0.1",
"wikimedia/less.php": "1.8.0",
- "wikimedia/object-factory": "2.0.0",
+ "wikimedia/object-factory": "2.1.0",
"wikimedia/password-blacklist": "0.1.4",
"wikimedia/php-session-serializer": "1.0.7",
"wikimedia/purtle": "1.0.7",
$req: AuthenticationRequest object describing the change (and target user)
$status: StatusValue with the result of the action
-'ChangePasswordForm': DEPRECATED since 1.27! Use AuthChangeFormFields or
-security levels. For extensions that need to add a field to the ChangePassword
-form via the Preferences form.
-&$extraFields: An array of arrays that hold fields like would be passed to the
- pretty function.
-
'ChangesListInitRows': Batch process change list rows prior to rendering.
$changesList: ChangesList instance
$rows: The data that will be rendered. May be a \Wikimedia\Rdbms\IResultWrapper
Calling it again with mismatching parameters, or calling it with parameters mismatching
the ones prepareContent() was called with, triggers a LogicException.
-- getSecondaryDataUpdtes() returns DataUpdates that represent derived data for the revision.
+- getSecondaryDataUpdates() returns DataUpdates that represent derived data for the revision.
These may be used to update such data, e.g. in ApiPurge, RefreshLinksJob, and the refreshLinks
script.
-- doUpdates() triggers the updates defined by getSecondaryDataUpdtes(), and also causes
+- doUpdates() triggers the updates defined by getSecondaryDataUpdates(), and also causes
updates to cached artifacts in the ParserCache, the CDN layer, etc. This is primarily
used by PageUpdater, but also by PageArchive during undeletion, and when importing
revisions from XML. doUpdates() can only be called after prepareUpdate() was used to
*/
$wgDebugTimestamps = false;
-/**
- * Print HTTP headers for every request in the debug information.
- */
-$wgDebugPrintHttpHeaders = true;
-
/**
* Show the contents of $wgHooks in Special:Version
*/
*/
$wgPageInfoTransclusionLimit = 50;
-/**
- * Set this to an integer to only do synchronous site_stats updates
- * one every *this many* updates. The other requests go into pending
- * delta values in $wgMemc. Make sure that $wgMemc is a global cache.
- * If set to -1, updates *only* go to $wgMemc (useful for daemons).
- */
-$wgSiteStatsAsyncFactor = false;
-
/**
* Parser test suite files to be run by parserTests.php when no specific
* filename is passed to it.
}
/**
- * Set PHP's memory limit to the larger of php.ini or $wgMemoryLimit
+ * Raise PHP's memory limit (if needed).
*
- * @return int Resulting value of the memory limit.
+ * @internal For use by Setup.php
*/
-function wfMemoryLimit() {
- global $wgMemoryLimit;
- $memlimit = wfShorthandToInteger( ini_get( 'memory_limit' ) );
- if ( $memlimit != -1 ) {
- $conflimit = wfShorthandToInteger( $wgMemoryLimit );
- if ( $conflimit == -1 ) {
+function wfMemoryLimit( $newLimit ) {
+ $oldLimit = wfShorthandToInteger( ini_get( 'memory_limit' ) );
+ // If the INI config is already unlimited, there is nothing larger
+ if ( $oldLimit != -1 ) {
+ $newLimit = wfShorthandToInteger( $newLimit );
+ if ( $newLimit == -1 ) {
wfDebug( "Removing PHP's memory limit\n" );
Wikimedia\suppressWarnings();
- ini_set( 'memory_limit', $conflimit );
+ ini_set( 'memory_limit', $newLimit );
Wikimedia\restoreWarnings();
- return $conflimit;
- } elseif ( $conflimit > $memlimit ) {
- wfDebug( "Raising PHP's memory limit to $conflimit bytes\n" );
+ } elseif ( $newLimit > $oldLimit ) {
+ wfDebug( "Raising PHP's memory limit to $newLimit bytes\n" );
Wikimedia\suppressWarnings();
- ini_set( 'memory_limit', $conflimit );
+ ini_set( 'memory_limit', $newLimit );
Wikimedia\restoreWarnings();
- return $conflimit;
}
}
- return $memlimit;
}
/**
) {
list( , $subpage ) = $spFactory->resolveAlias( $title->getDBkey() );
$target = $specialPage->getRedirect( $subpage );
- // target can also be true. We let that case fall through to normal processing.
+ // Target can also be true. We let that case fall through to normal processing.
if ( $target instanceof Title ) {
+ if ( $target->isExternal() ) {
+ // Handle interwiki redirects
+ $target = SpecialPage::getTitleFor(
+ 'GoToInterwiki',
+ $target->getPrefixedDBkey()
+ );
+ }
+
$query = $specialPage->getRedirectQuery( $subpage ) ?: [];
$request = new DerivativeRequest( $this->context->getRequest(), $query );
$request->setRequestURL( $this->context->getRequest()->getRequestURL() );
*/
public function insertRevisionOn( RevisionRecord $rev, IDatabase $dbw ) {
// TODO: pass in a DBTransactionContext instead of a database connection.
- $this->checkDatabaseWikiId( $dbw );
+ $this->checkDatabaseDomain( $dbw );
$slotRoles = $rev->getSlotRoles();
$minor,
User $user
) {
- $this->checkDatabaseWikiId( $dbw );
+ $this->checkDatabaseDomain( $dbw );
$pageId = $title->getArticleID();
* @param IDatabase $db
* @throws MWException
*/
- private function checkDatabaseWikiId( IDatabase $db ) {
- $storeWiki = $this->dbDomain;
- $dbWiki = $db->getDomainID();
-
- if ( $dbWiki === $storeWiki ) {
- return;
- }
-
- $storeWiki = $storeWiki ?: $this->loadBalancer->getLocalDomainID();
- // @FIXME: when would getDomainID() be false here?
- $dbWiki = $dbWiki ?: wfWikiID();
-
- if ( $dbWiki === $storeWiki ) {
- return;
- }
-
- // HACK: counteract encoding imposed by DatabaseDomain
- $storeWiki = str_replace( '?h', '-', $storeWiki );
- $dbWiki = str_replace( '?h', '-', $dbWiki );
-
- if ( $dbWiki === $storeWiki ) {
+ private function checkDatabaseDomain( IDatabase $db ) {
+ $dbDomain = $db->getDomainID();
+ $storeDomain = $this->loadBalancer->resolveDomainID( $this->dbDomain );
+ if ( $dbDomain === $storeDomain ) {
return;
}
- throw new MWException( "RevisionStore for $storeWiki "
- . "cannot be used with a DB connection for $dbWiki" );
+ throw new MWException( "DB connection domain '$dbDomain' does not match '$storeDomain'" );
}
/**
* @return object|false data row as a raw object
*/
private function fetchRevisionRowFromConds( IDatabase $db, $conditions, $flags = 0 ) {
- $this->checkDatabaseWikiId( $db );
+ $this->checkDatabaseDomain( $db );
$revQuery = $this->getQueryInfo( [ 'page', 'user' ] );
$options = [];
* of the corresponding revision.
*/
public function listRevisionSizes( IDatabase $db, array $revIds ) {
- $this->checkDatabaseWikiId( $db );
+ $this->checkDatabaseDomain( $db );
$revLens = [];
if ( !$revIds ) {
* @return int
*/
private function getPreviousRevisionId( IDatabase $db, RevisionRecord $rev ) {
- $this->checkDatabaseWikiId( $db );
+ $this->checkDatabaseDomain( $db );
if ( $rev->getPageId() === null ) {
return 0;
* @return int
*/
public function countRevisionsByPageId( IDatabase $db, $id ) {
- $this->checkDatabaseWikiId( $db );
+ $this->checkDatabaseDomain( $db );
$row = $db->selectRow( 'revision',
[ 'revCount' => 'COUNT(*)' ],
* @return bool True if the given user was the only one to edit since the given timestamp
*/
public function userWasLastToEdit( IDatabase $db, $pageId, $userId, $since ) {
- $this->checkDatabaseWikiId( $db );
+ $this->checkDatabaseDomain( $db );
if ( !$userId ) {
return false;
// Start the autoloader, so that extensions can derive classes from core files
require_once "$IP/includes/AutoLoader.php";
-// Load up some global defines
+// Load global constants
require_once "$IP/includes/Defines.php";
// Load default settings
die( 1 );
}
+/**
+ * Changes to the PHP environment that don't vary on configuration.
+ */
+
// Install a header callback
MediaWiki\HeaderCallback::register();
+// Set the encoding used by reading HTTP input, writing HTTP output.
+// This is also the default for mbstring functions.
+mb_internal_encoding( 'UTF-8' );
+
/**
* Load LocalSettings.php
*/
// Don't let any other extensions load
ExtensionRegistry::getInstance()->finish();
-mb_internal_encoding( 'UTF-8' );
-
// Set the configured locale on all requests for consisteny
putenv( "LC_ALL=$wgShellLocale" );
setlocale( LC_ALL, $wgShellLocale );
$ps_misc = Profiler::instance()->scopedProfileIn( $fname . '-misc' );
// Raise the memory limit if it's too low
-wfMemoryLimit();
+// Note, this makes use of wfDebug, and thus should not be before
+// MWDebug::init() is called.
+wfMemoryLimit( $wgMemoryLimit );
/**
* Set up the timezone, suppressing the pseudo-security warning in PHP 5.1+
}
} else {
$debug = "\n\nStart request {$wgRequest->getMethod()} {$wgRequest->getRequestURL()}\n";
-
- if ( $wgDebugPrintHttpHeaders ) {
- $debug .= "HTTP HEADERS:\n";
-
- foreach ( $wgRequest->getAllHeaders() as $name => $value ) {
- $debug .= "$name: $value\n";
- }
+ $debug .= "HTTP HEADERS:\n";
+ foreach ( $wgRequest->getAllHeaders() as $name => $value ) {
+ $debug .= "$name: $value\n";
}
wfDebug( $debug );
}
$config = MediaWikiServices::getInstance()->getMainConfig();
$lb = self::getLB();
- $dbr = $lb->getConnection( DB_REPLICA );
+ $dbr = $lb->getConnectionRef( DB_REPLICA );
wfDebug( __METHOD__ . ": reading site_stats from replica DB\n" );
$row = self::doLoadFromDB( $dbr );
if ( !self::isRowSane( $row ) && $lb->hasOrMadeRecentMasterChanges() ) {
// Might have just been initialized during this request? Underflow?
wfDebug( __METHOD__ . ": site_stats damaged or missing on replica DB\n" );
- $row = self::doLoadFromDB( $lb->getConnection( DB_MASTER ) );
+ $row = self::doLoadFromDB( $lb->getConnectionRef( DB_MASTER ) );
}
if ( !self::isRowSane( $row ) ) {
SiteStatsInit::doAllAndCommit( $dbr );
}
- $row = self::doLoadFromDB( $lb->getConnection( DB_MASTER ) );
+ $row = self::doLoadFromDB( $lb->getConnectionRef( DB_MASTER ) );
}
if ( !self::isRowSane( $row ) ) {
$cache->makeKey( 'SiteStats', 'groupcounts', $group ),
$cache::TTL_HOUR,
function ( $oldValue, &$ttl, array &$setOpts ) use ( $group, $fname ) {
- $dbr = self::getLB()->getConnection( DB_REPLICA );
+ $dbr = self::getLB()->getConnectionRef( DB_REPLICA );
$setOpts += Database::getCacheSetOptions( $dbr );
return (int)$dbr->selectField(
$cache->makeKey( 'SiteStats', 'page-in-namespace', $ns ),
$cache::TTL_HOUR,
function ( $oldValue, &$ttl, array &$setOpts ) use ( $ns, $fname ) {
- $dbr = self::getLB()->getConnection( DB_REPLICA );
+ $dbr = self::getLB()->getConnectionRef( DB_REPLICA );
$setOpts += Database::getCacheSetOptions( $dbr );
return (int)$dbr->selectField(
*
* DerivedPageDataUpdater instances are designed to be cached inside a WikiPage instance,
* and re-used by callback code over the course of an update operation. It's a stepping stone
- * one the way to a more complete refactoring of WikiPage.
+ * on the way to a more complete refactoring of WikiPage.
*
* When using a DerivedPageDataUpdater, the following life cycle must be observed:
* grabCurrentRevision (optional), prepareContent (optional), prepareUpdate (required
}
}
- /**
- * @return bool|string
- */
- private function getWikiId() {
- // TODO: get from RevisionStore
- return false;
- }
-
/**
* Checks whether this DerivedPageDataUpdater can be re-used for running updates targeting
* the given revision.
*/
public function isContentDeleted() {
if ( $this->revision ) {
- // XXX: if that revision is the current revision, this should be skipped
return $this->revision->isDeleted( RevisionRecord::DELETED_TEXT );
} else {
// If the content has not been saved yet, it cannot have been deleted yet.
// TODO: In the wiring, register a listener for this on the new PageEventEmitter
ResourceLoaderWikiModule::invalidateModuleCache(
- $title, $oldLegacyRevision, $legacyRevision, $this->getWikiId() ?: wfWikiID()
+ $title,
+ $oldLegacyRevision,
+ $legacyRevision,
+ $this->loadbalancerFactory->getLocalDomainID()
);
$this->doTransition( 'done' );
// the stash request finishes parsing. For the lock acquisition below, there is not much
// need to duplicate parsing of the same content/user/summary bundle, so try to avoid
// blocking at all here.
- $dbw = $this->lb->getConnection( DB_MASTER );
+ $dbw = $this->lb->getConnectionRef( DB_MASTER );
if ( !$dbw->lock( $key, $fname, 0 ) ) {
// De-duplicate requests on the same key
return self::ERROR_BUSY;
* @return string|null TS_MW timestamp or null
*/
private function lastEditTime( User $user ) {
- $db = $this->lb->getConnection( DB_REPLICA );
+ $db = $this->lb->getConnectionRef( DB_REPLICA );
+
$actorQuery = ActorMigration::newMigration()->getWhere( $db, 'rc_user', $user, false );
$time = $db->selectField(
[ 'recentchanges' ] + $actorQuery['tables'],
if (
!MediaWikiServices::getInstance()->getNamespaceInfo()->
hasSubpages( $this->mNamespace )
+ || strtok( $this->getText(), '/' ) === false
) {
return $this->getText();
}
* @since 1.20
*/
public function getSubpage( $text ) {
- return self::makeTitleSafe( $this->mNamespace, $this->getText() . '/' . $text );
+ return self::makeTitleSafe(
+ $this->mNamespace,
+ $this->getText() . '/' . $text,
+ '',
+ $this->mInterwiki
+ );
}
/**
->getPermissionErrors( $action, $user, $this, $rigor, $ignoreErrors );
}
- /**
- * Add the resulting error code to the errors array
- *
- * @param array $errors List of current errors
- * @param array|string|MessageSpecifier|false $result Result of errors
- *
- * @return array List of errors
- */
- private function resultToError( $errors, $result ) {
- if ( is_array( $result ) && count( $result ) && !is_array( $result[0] ) ) {
- // A single array representing an error
- $errors[] = $result;
- } elseif ( is_array( $result ) && is_array( $result[0] ) ) {
- // A nested array representing multiple errors
- $errors = array_merge( $errors, $result );
- } elseif ( $result !== '' && is_string( $result ) ) {
- // A string representing a message-id
- $errors[] = [ $result ];
- } elseif ( $result instanceof MessageSpecifier ) {
- // A message specifier representing an error
- $errors[] = [ $result ];
- } elseif ( $result === false ) {
- // a generic "We don't want them to do that"
- $errors[] = [ 'badaccess-group0' ];
- }
- return $errors;
- }
-
/**
* Get a filtered list of all restriction types supported by this wiki.
* @param bool $exists True to get all restriction types that apply to
$this->mHasSubpages = false;
$subpages = $this->getSubpages( 1 );
if ( $subpages instanceof TitleArray ) {
- $this->mHasSubpages = (bool)$subpages->count();
+ $this->mHasSubpages = (bool)$subpages->current();
}
}
* Get the timestamp when this page was updated since the user last saw it.
*
* @param User|null $user
- * @return string|null
+ * @return string|bool|null String timestamp, false if not watched, null if nothing is unseen
*/
public function getNotificationTimestamp( $user = null ) {
global $wgUser;
: (string)$domain->getDatabase();
}
- /**
- * @param string $domain
- * @return string
- * @deprecated Since 1.33; use getWikiIdFromDbDomain()
- */
- public static function getWikiIdFromDomain( $domain ) {
- return self::getWikiIdFromDbDomain( $domain );
- }
-
/**
* @return DatabaseDomain Database domain of the current wiki
* @since 1.33
* @since 1.33
*/
public static function isCurrentWikiDbDomain( $domain ) {
- return self::getCurrentWikiDbDomain()->equals( DatabaseDomain::newFromId( $domain ) );
+ return self::getCurrentWikiDbDomain()->equals( $domain );
}
/**
$out = $this->getOutput();
$request = $this->getRequest();
- /**
- * Allow client caching.
- */
- if ( $out->checkLastModified( $this->page->getTouched() ) ) {
+ // Allow client-side HTTP caching of the history page.
+ // But, always ignore this cache if the (logged-in) user has this page on their watchlist
+ // and has one or more unseen revisions. Otherwise, we might be showing stale update markers.
+ // The Last-Modified for the history page does not change when user's markers are cleared,
+ // so going from "some unseen" to "all seen" would not clear the cache.
+ // But, when all of the revisions are marked as seen, then only way for new unseen revision
+ // markers to appear, is for the page to be edited, which updates page_touched/Last-Modified.
+ if (
+ !$this->hasUnseenRevisionMarkers() &&
+ $out->checkLastModified( $this->page->getTouched() )
+ ) {
return null; // Client cache fresh and headers sent, nothing more to do.
}
return null;
}
+ /**
+ * @return bool Page is watched by and has unseen revision for the user
+ */
+ private function hasUnseenRevisionMarkers() {
+ return (
+ $this->getContext()->getConfig()->get( 'ShowUpdatedMarker' ) &&
+ $this->getTitle()->getNotificationTimestamp( $this->getUser() )
+ );
+ }
+
/**
* Fetch an array of revisions, specified by a given limit, offset and
* direction. This is now only used by the feeds. It was previously
*/
function formatRow( $row ) {
if ( $this->lastRow ) {
- $latest = ( $this->counter == 1 && $this->mIsFirst );
$firstInList = $this->counter == 1;
$this->counter++;
? $this->getTitle()->getNotificationTimestamp( $this->getUser() )
: false;
- $s = $this->historyLine(
- $this->lastRow, $row, $notifTimestamp, $latest, $firstInList );
+ $s = $this->historyLine( $this->lastRow, $row, $notifTimestamp, false, $firstInList );
} else {
$s = '';
}
$s .= Html::hidden( 'type', 'revision' ) . "\n";
// Button container stored in $this->buttons for re-use in getEndBody()
- $this->buttons = Html::openElement( 'div', [ 'class' => 'mw-history-compareselectedversions' ] );
- $className = 'historysubmit mw-history-compareselectedversions-button';
- $attrs = [ 'class' => $className ]
- + Linker::tooltipAndAccesskeyAttribs( 'compareselectedversions' );
- $this->buttons .= $this->submitButton( $this->msg( 'compareselectedversions' )->text(),
- $attrs
- ) . "\n";
-
- $user = $this->getUser();
- $actionButtons = '';
- if ( $user->isAllowed( 'deleterevision' ) ) {
- $actionButtons .= $this->getRevisionButton( 'revisiondelete', 'showhideselectedversions' );
- }
- if ( $this->showTagEditUI ) {
- $actionButtons .= $this->getRevisionButton( 'editchangetags', 'history-edit-tags' );
- }
- if ( $actionButtons ) {
- $this->buttons .= Xml::tags( 'div', [ 'class' =>
- 'mw-history-revisionactions' ], $actionButtons );
- }
+ $this->buttons = '';
+ if ( $this->getNumRows() > 0 ) {
+ $this->buttons .= Html::openElement(
+ 'div', [ 'class' => 'mw-history-compareselectedversions' ] );
+ $className = 'historysubmit mw-history-compareselectedversions-button';
+ $attrs = [ 'class' => $className ]
+ + Linker::tooltipAndAccesskeyAttribs( 'compareselectedversions' );
+ $this->buttons .= $this->submitButton( $this->msg( 'compareselectedversions' )->text(),
+ $attrs
+ ) . "\n";
+
+ $user = $this->getUser();
+ $actionButtons = '';
+ if ( $user->isAllowed( 'deleterevision' ) ) {
+ $actionButtons .= $this->getRevisionButton(
+ 'revisiondelete', 'showhideselectedversions' );
+ }
+ if ( $this->showTagEditUI ) {
+ $actionButtons .= $this->getRevisionButton(
+ 'editchangetags', 'history-edit-tags' );
+ }
+ if ( $actionButtons ) {
+ $this->buttons .= Xml::tags( 'div', [ 'class' =>
+ 'mw-history-revisionactions' ], $actionButtons );
+ }
- if ( $user->isAllowed( 'deleterevision' ) || $this->showTagEditUI ) {
- $this->buttons .= ( new ListToggle( $this->getOutput() ) )->getHTML();
- }
+ if ( $user->isAllowed( 'deleterevision' ) || $this->showTagEditUI ) {
+ $this->buttons .= ( new ListToggle( $this->getOutput() ) )->getHTML();
+ }
- $this->buttons .= '</div>';
+ $this->buttons .= '</div>';
- $s .= $this->buttons;
+ $s .= $this->buttons;
+ }
$s .= '<ul id="pagehistory">' . "\n";
return $s;
protected function getEndBody() {
if ( $this->lastRow ) {
- $latest = $this->counter == 1 && $this->mIsFirst;
$firstInList = $this->counter == 1;
if ( $this->mIsBackwards ) {
# Next row is unknown, but for UI reasons, probably exists if an offset has been specified
? $this->getTitle()->getNotificationTimestamp( $this->getUser() )
: false;
- $s = $this->historyLine(
- $this->lastRow, $next, $notifTimestamp, $latest, $firstInList );
+ $s = $this->historyLine( $this->lastRow, $next, $notifTimestamp, false, $firstInList );
} else {
$s = '';
}
* @param mixed $next The database row corresponding to the next line
* (chronologically previous)
* @param bool|string $notificationtimestamp
- * @param bool $latest Whether this row corresponds to the page's latest revision.
+ * @param bool $dummy Unused.
* @param bool $firstInList Whether this row corresponds to the first
* displayed on this history page.
* @return string HTML output for the row
*/
function historyLine( $row, $next, $notificationtimestamp = false,
- $latest = false, $firstInList = false ) {
+ $dummy = false, $firstInList = false ) {
$rev = new Revision( $row, 0, $this->getTitle() );
if ( is_object( $next ) ) {
$prevRev = null;
}
- $curlink = $this->curLink( $rev, $latest );
+ $latest = $rev->getId() === $this->getWikiPage()->getLatest();
+ $curlink = $this->curLink( $rev );
$lastlink = $this->lastLink( $rev, $next );
$curLastlinks = Html::rawElement( 'span', [], $curlink ) .
Html::rawElement( 'span', [], $lastlink );
* Create a diff-to-current link for this revision for this page
*
* @param Revision $rev
- * @param bool $latest This is the latest revision of the page?
* @return string
*/
- function curLink( $rev, $latest ) {
+ function curLink( $rev ) {
$cur = $this->historyPage->message['cur'];
- if ( $latest || !$rev->userCan( Revision::DELETED_TEXT, $this->getUser() ) ) {
+ $latest = $this->getWikiPage()->getLatest();
+ if ( $latest === $rev->getId() || !$rev->userCan( Revision::DELETED_TEXT, $this->getUser() ) ) {
return $cur;
} else {
return MediaWikiServices::getInstance()->getLinkRenderer()->makeKnownLink(
new HtmlArmor( $cur ),
[],
[
- 'diff' => $this->getWikiPage()->getLatest(),
+ 'diff' => $latest,
'oldid' => $rev->getId()
]
);
"Kenjiraw",
"Framawiki",
"Epok",
- "Derugon"
+ "Derugon",
+ "Lucas Werkmeister (WMDE)"
]
},
"apihelp-main-extended-description": "<div class=\"hlist plainlinks api-main-links\">\n* [[mw:Special:MyLanguage/API:Main_page|Documentation]]\n* [[mw:Special:MyLanguage/API:FAQ|FAQ]]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api Liste de diffusion]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api-announce Annonces de l’API]\n* [https://phabricator.wikimedia.org/maniphest/query/GebfyV4uCaLd/#R Bogues et demandes]\n</div>\n<strong>État :</strong> L’API MediaWiki est une interface stable et mature qui est supportée et améliorée de façon active. Bien que nous essayions de l’éviter, nous pouvons avoir parfois besoin de faire des modifications impactantes ; inscrivez-vous à [https://lists.wikimedia.org/pipermail/mediawiki-api-announce/ la liste de diffusion mediawiki-api-announce] pour être informé des mises à jour.\n\n<strong>Requêtes erronées :</strong> Si des requêtes erronées sont envoyées à l’API, un entête HTTP sera renvoyé avec la clé « MediaWiki-API-Error ». La valeur de cet entête et le code d’erreur renvoyé prendront la même valeur. Pour plus d’information, voyez [[mw:Special:MyLanguage/API:Errors_and_warnings|API:Errors and warnings]].\n\n<p class=\"mw-apisandbox-link\"><strong>Test :</strong> Pour faciliter le test des requêtes à l’API, voyez [[Special:ApiSandbox]].</p>",
"apihelp-query+languageinfo-paramvalue-prop-code": "Le code de langue (ce code est spécifique à MédiaWiki, bien qu’il y ait des recouvrements avec d’autres standards).",
"apihelp-query+languageinfo-paramvalue-prop-bcp47": "Le code de langue BCP-47.",
"apihelp-query+languageinfo-paramvalue-prop-dir": "La direction d’écriture de la langue (<code>ltr</code> ou <code>rtl</code>).",
- "apihelp-query+languageinfo-paramvalue-prop-autonym": "L’autonyme d'une langue, c’est-à-dire son nom dans cette langue.",
+ "apihelp-query+languageinfo-paramvalue-prop-autonym": "L’autonyme d’une langue, c’est-à-dire son nom dans cette langue.",
"apihelp-query+languageinfo-paramvalue-prop-name": "Le nom de la langue dans la langue spécifiée par le paramètre <var>lilang</var>, avec application des langues de secours si besoin.",
"apihelp-query+languageinfo-paramvalue-prop-fallbacks": "Les codes de langue des langues de secours configurées pour cette langue. Le secours implicite final en 'en' n’est pas inclus (mais certaines langues peuvent avoir 'en' en secours explicitement).",
"apihelp-query+languageinfo-paramvalue-prop-variants": "Les codes de langue des variantes supportées par cette langue.",
"apihelp-main-param-uselang": "Јазик за преведување на пораките. <kbd>[[Special:ApiHelp/query+siteinfo|action=query&meta=siteinfo]]</kbd> со <kbd>siprop=languages</kbd> дава список на јазични кодови, или укажете <kbd>user</kbd> за да го користите тековно зададениот јазик корисникот, или пак укажете <kbd>content</kbd> за да го користите јазикот на содржината на ова вики.",
"apihelp-block-summary": "Блокирај корисник.",
"apihelp-block-param-user": "Корисничко име, IP-адреса или IP-опсег ако сакате да блокирате. Не може да се користи заедно со <var>$1userid</var>",
- "apihelp-block-param-expiry": "Време на истек. Може да биде релативно (на пр. <kbd>5 months</kbd> или „2 недели“) или пак апсолутно (на пр. <kbd>2014-09-18T12:34:56Z</kbd>). Ако го зададете <kbd>infinite</kbd>, <kbd>indefinite</kbd> или <kbd>never</kbd>, блокот ќе трае засекогаш.",
+ "apihelp-block-param-expiry": "Време на истек. Може да биде релативно (на пр. <kbd>5 months</kbd> или <kbd>2 weeks</kbd>) или пак апсолутно (на пр. <kbd>2014-09-18T12:34:56Z</kbd>). Ако го зададете <kbd>infinite</kbd>, <kbd>indefinite</kbd> или <kbd>never</kbd>, блокот ќе трае засекогаш.",
"apihelp-block-param-reason": "Причина за блокирање.",
"apihelp-block-param-anononly": "Блокирај само анонимни корисници (т.е. оневозможи анонимно уредување од оваа IP-адреса).",
"apihelp-block-param-nocreate": "Оневозможи создавање кориснички сметки.",
"apihelp-opensearch-param-search": "Низа за пребарување.",
"apihelp-opensearch-param-limit": "Највеќе ставки за прикажување.",
"apihelp-opensearch-param-namespace": "Именски простори за пребарување.",
- "apihelp-opensearch-param-suggest": "Не прави ништо ако <var>[[mw:Manual:$wgEnableOpenSearchSuggest|$wgEnableOpenSearchSuggest]]</var> е неточно.",
+ "apihelp-opensearch-param-suggest": "Не прави ништо ако <var>[[mw:Special:MyLanguage/Manual:$wgEnableOpenSearchSuggest|$wgEnableOpenSearchSuggest]]</var> е неточно.",
"apihelp-opensearch-param-redirects": "Како да се работи со пренасочувања:\n;return: Дај го самото пренасочување.\n;resolve: Дај ја целната страница. Може да даде помалку од $1limit ставки.\nОд историски причини, по основно е „return“ за $1format=json и „resolve“ за други формати.",
"apihelp-opensearch-param-format": "Формат на изводот.",
"apihelp-opensearch-example-te": "Најди страници што почнуваат со <kbd>Те</kbd>.",
"apihelp-options-param-resetkinds": "Сисок на типови можности за повраток кога е зададена можноста <var>$1reset</var>.",
"apihelp-options-param-change": "Список на промени во форматот name=value (на пр. skin=vector). Вредностите не треба да содржат исправени црти. Ако не зададете вредност (дури ни знак за равенство), на пр., можност|другаможност|..., ќе биде зададена вредноста на можноста по основно.",
"apihelp-options-param-optionname": "Назив на можноста што треба да ѝ се зададе на вредноста дадена од <var>$1optionvalue</var>.",
- "apihelp-options-param-optionvalue": "Вредноста на можноста укажана од <var>$1optionname</var>. Може да содржи исправени црти.",
+ "apihelp-options-param-optionvalue": "Вредноста на можноста укажана од <var>$1optionname</var>.",
"apihelp-options-example-reset": "Врати ги сите поставки по основно",
"apihelp-options-example-change": "Смени ги поставките <kbd>skin</kbd и <kbd>hideminor</kbd>.",
"apihelp-options-example-complex": "Врати ги сите нагодувања по основно, а потоа задај ги <kbd>skin</kbd> и <kbd>nickname</kbd>.",
"apihelp-paraminfo-summary": "Набави информации за извршнички (API) модули.",
- "apihelp-paraminfo-param-modules": "Список на називи на модули (вредности на параметрите <var>action</var> и <var>format</var>, или пак <kbd>main</kbd>). Може да се укажат подмодули со <kbd>+</kbd>.",
+ "apihelp-paraminfo-param-modules": "Список на називи на модули (вредности на параметрите <var>action</var> и <var>format</var>, или пак <kbd>main</kbd>). Може да се укажат подмодули со <kbd>+</kbd>, или сите подмодули <kbd>+*</kbd>, или сите подмодули рекурзивно со <kbd>+**</kbd>.",
"apihelp-paraminfo-param-helpformat": "Формат на помошните низи.",
"apihelp-paraminfo-param-querymodules": "Список на називи на модули за барања (вредност на параметарот <var>prop</var>, <var>meta</var> или <var>list</var>). Користете го <kbd>$1modules=query+foo</kbd> наместо <kbd>$1querymodules=foo</kbd>.",
"apihelp-paraminfo-param-mainmodule": "Добави информации и за главниот (врховен) модул. Користете го <kbd>$1modules=main</kbd> наместо тоа.",
"apihelp-paraminfo-param-pagesetmodule": "Дај ги сите информации и за модулот на збирот страници (укажувајќи titles= и сродни).",
"apihelp-paraminfo-param-formatmodules": "Список на називи на форматни модули (вредностза параметарот <var>format</var>). Наместо тоа, користете го <var>$1modules</var>.",
+ "apihelp-paraminfo-example-1": "Прикажи информации за <kbd>[[Special:ApiHelp/parse|action=parse]]</kbd>, <kbd>[[Special:ApiHelp/jsonfm|format=jsonfm]]</kbd>, <kbd>[[Special:ApiHelp/query+allpages|action=query&list=allpages]]</kbd> и <kbd>[[Special:ApiHelp/query+siteinfo|action=query&meta=siteinfo]]</kbd>.",
+ "apihelp-paraminfo-example-2": "Прикажи информации за сите подмодули на <kbd>[[Special:ApiHelp/query|action=query]]</kbd>.",
"apihelp-parse-param-summary": "Опис за расчленување.",
"apihelp-parse-param-preview": "Расчлени во прегледен режим.",
"apihelp-parse-param-sectionpreview": "Расчлени во прегледен режим на поднасловот (го овозможува и прегледниот режим).",
"apihelp-patrol-summary": "Испатролирај страница или преработка.",
"apihelp-patrol-param-rcid": "Назнака на спорешните промени за патролирање.",
"apihelp-patrol-param-revid": "Назнака на преработката за патролирање.",
+ "apihelp-patrol-param-tags": "Ознаки за примена врз ставката во дневникот на патролирања.",
"apihelp-patrol-example-rcid": "Испатролирај скорешна промена",
"apihelp-patrol-example-revid": "Патролирај праработка",
"apihelp-protect-summary": "Смени го степенот на заштита на страница.",
"apihelp-protect-param-title": "Наслов на страница што се (од)заштитува. Не може да се користи заедно со $1pageid.",
"apihelp-protect-param-pageid": "Назнака на страница што се (од)заштитува. Не може да се користи заедно со $1title.",
"apihelp-protect-param-reason": "Причиина за (од)заштитување",
+ "apihelp-protect-param-tags": "Ознаки за примена врз ставката во дневникот на заштита.",
"apihelp-protect-example-protect": "Заштити страница",
"apihelp-purge-param-forcelinkupdate": "Поднови ги табелите со врски.",
"apihelp-purge-example-simple": "Превчитај ги <kbd>Main Page</kbd> и <kbd>API</kbd>.",
"apihelp-query+allcategories-param-from": "Од која категорија да почне набројувањето.",
"apihelp-query+allcategories-param-to": "На која категорија да запре набројувањето.",
"apihelp-query+allcategories-param-dir": "Насока на подредувањето.",
+ "apihelp-query+allcategories-param-limit": "Колку категории да се дадат.",
"apihelp-query+allcategories-param-prop": "Кои својства да се дадат:",
"apihelp-query+alldeletedrevisions-param-from": "Почни го исписот од овој наслов.",
"apihelp-query+alldeletedrevisions-param-to": "Запри го исписот на овој наслов.",
"WhitePhosphorus",
"科劳",
"SolidBlock",
- "神樂坂秀吉"
+ "神樂坂秀吉",
+ "94rain"
]
},
"apihelp-main-extended-description": "<div class=\"hlist plainlinks api-main-links\">\n* [[mw:Special:MyLanguage/API:Main_page|文档]]\n* [[mw:Special:MyLanguage/API:FAQ|常见问题]]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api 邮件列表]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api-announce API公告]\n* [https://phabricator.wikimedia.org/maniphest/query/GebfyV4uCaLd/#R 程序错误与功能请求]\n</div>\n<strong>状态信息：</strong>MediaWiki API是一个成熟稳定的，不断受到支持和改进的界面。尽管我们尽力避免，但偶尔也需要作出重大更新；请订阅[https://lists.wikimedia.org/pipermail/mediawiki-api-announce/ mediawiki-api-announce 邮件列表]以便获得更新通知。\n\n<strong>错误请求：</strong>当API收到错误请求时，HTTP header将会返回一个包含\"MediaWiki-API-Error\"的值，随后header的值与error code将会送回并设置为相同的值。详细信息请参阅[[mw:Special:MyLanguage/API:Errors_and_warnings|API：错误与警告]]。\n\n<p class=\"mw-apisandbox-link\"><strong>测试中：</strong>测试API请求的易用性，请参见[[Special:ApiSandbox]]。</p>",
"apihelp-upload-param-comment": "上传注释。如果没有指定<var>$1text</var>，那么它也被用于新文件的初始页面文本。",
"apihelp-upload-param-tags": "更改标签以应用于上传日志记录和文件页面修订中。",
"apihelp-upload-param-text": "用于新文件的初始页面文本。",
- "apihelp-upload-param-watch": "关注页面。",
+ "apihelp-upload-param-watch": "监视页面。",
"apihelp-upload-param-watchlist": "无条件地将页面加入至当前用户的监视列表或将其移除，使用设置或不更改监视。",
"apihelp-upload-param-ignorewarnings": "忽略任何警告。",
"apihelp-upload-param-file": "文件内容。",
return [];
}
- $db = $db ?: $this->loadBalancer->getConnection( DB_REPLICA );
+ $db = $db ?: $this->loadBalancer->getConnectionRef( DB_REPLICA );
$result = $db->select(
[ 'ipblocks_restrictions', 'page' ],
return false;
}
- $dbw = $this->loadBalancer->getConnection( DB_MASTER );
+ $dbw = $this->loadBalancer->getConnectionRef( DB_MASTER );
$dbw->insert(
'ipblocks_restrictions',
* @return bool
*/
public function update( array $restrictions ) {
- $dbw = $this->loadBalancer->getConnection( DB_MASTER );
+ $dbw = $this->loadBalancer->getConnectionRef( DB_MASTER );
$dbw->startAtomic( __METHOD__ );
$parentBlockId = (int)$parentBlockId;
- $db = $this->loadBalancer->getConnection( DB_MASTER );
+ $db = $this->loadBalancer->getConnectionRef( DB_MASTER );
$db->startAtomic( __METHOD__ );
* @return bool
*/
public function delete( array $restrictions ) {
- $dbw = $this->loadBalancer->getConnection( DB_MASTER );
+ $dbw = $this->loadBalancer->getConnectionRef( DB_MASTER );
$result = true;
foreach ( $restrictions as $restriction ) {
if ( !$restriction instanceof Restriction ) {
* @return bool
*/
public function deleteByBlockId( $blockId ) {
- $dbw = $this->loadBalancer->getConnection( DB_MASTER );
+ $dbw = $this->loadBalancer->getConnectionRef( DB_MASTER );
return $dbw->delete(
'ipblocks_restrictions',
[ 'ir_ipb_id' => $blockId ],
* @return bool
*/
public function deleteByParentBlockId( $parentBlockId ) {
- $dbw = $this->loadBalancer->getConnection( DB_MASTER );
+ $dbw = $this->loadBalancer->getConnectionRef( DB_MASTER );
return $dbw->deleteJoin(
'ipblocks_restrictions',
'ipblocks',
private function isCacheable( LinkTarget $title ) {
$ns = $title->getNamespace();
- if ( in_array( $ns, [ NS_TEMPLATE, NS_FILE, NS_CATEGORY ] ) ) {
+ if ( in_array( $ns, [ NS_TEMPLATE, NS_FILE, NS_CATEGORY, NS_MEDIAWIKI ] ) ) {
return true;
}
// Focus on transcluded pages more than the main content
* @param array $params Additional parameters include:
* - keywordTableMap : Map of reserved table names to alternative table names to use
*/
- function __construct( array $params ) {
+ public function __construct( array $params ) {
$this->keywordTableMap = $params['keywordTableMap'] ?? [];
$params['tablePrefix'] = strtoupper( $params['tablePrefix'] );
parent::__construct( $params );
"and database)\n" );
}
+ if ( $schema !== null ) {
+ // We use the *database* aspect of $domain for schema, not the domain schema
+ throw new DBExpectedError(
+ $this,
+ __CLASS__ . ": cannot use schema '$schema'; " .
+ "the database component '$dbName' is actually interpreted as the Oracle schema."
+ );
+ }
+
$this->close();
$this->user = $user;
$this->password = $password;
protected function doSelectDomain( DatabaseDomain $domain ) {
if ( $domain->getSchema() !== null ) {
// We use the *database* aspect of $domain for schema, not the domain schema
- throw new DBExpectedError( $this, __CLASS__ . ": domain schemas are not supported." );
+ throw new DBExpectedError(
+ $this,
+ __CLASS__ . ": domain '{$domain->getId()}' has a schema component; " .
+ "the database component is actually interpreted as the Oracle schema."
+ );
}
$database = $domain->getDatabase();
*
* @file
*/
+
+use Liuggio\StatsdClient\Factory\StatsdDataFactoryInterface;
+use MediaWiki\Logger\LoggerFactory;
+use Psr\Log\LoggerInterface;
use Wikimedia\Rdbms\IDatabase;
use MediaWiki\MediaWikiServices;
use Wikimedia\Rdbms\LBFactory;
protected static function handleUpdateQueue( array &$queue, $mode, $stage ) {
$services = MediaWikiServices::getInstance();
$stats = $services->getStatsdDataFactory();
- $lbFactory = $services->getDBLoadBalancerFactory();
- $method = RequestContext::getMain()->getRequest()->getMethod();
-
- /** @var ErrorPageError $reportableError */
- $reportableError = null;
+ $lbf = $services->getDBLoadBalancerFactory();
+ $logger = LoggerFactory::getInstance( 'DeferredUpdates' );
+ $httpMethod = $services->getMainConfig()->get( 'CommandLineMode' )
+ ? 'cli'
+ : strtolower( RequestContext::getMain()->getRequest()->getMethod() );
+
+ /** @var ErrorPageError $guiEx */
+ $guiEx = null;
/** @var DeferrableUpdate[] $updates Snapshot of queue */
$updates = $queue;
while ( $updates ) {
$queue = []; // clear the queue
- // Order will be DataUpdate followed by generic DeferrableUpdate tasks
- $updatesByType = [ 'data' => [], 'generic' => [] ];
- foreach ( $updates as $du ) {
- if ( $du instanceof DataUpdate ) {
- $updatesByType['data'][] = $du;
+ // Segregate the queue into one for DataUpdate and one for everything else
+ $dataUpdateQueue = [];
+ $genericUpdateQueue = [];
+ foreach ( $updates as $update ) {
+ if ( $update instanceof DataUpdate ) {
+ $dataUpdateQueue[] = $update;
} else {
- $updatesByType['generic'][] = $du;
+ $genericUpdateQueue[] = $update;
}
-
- $name = ( $du instanceof DeferrableCallback )
- ? get_class( $du ) . '-' . $du->getOrigin()
- : get_class( $du );
- $stats->increment( 'deferred_updates.' . $method . '.' . $name );
}
-
- // Execute all remaining tasks...
- foreach ( $updatesByType as $updatesForType ) {
- foreach ( $updatesForType as $update ) {
+ // Execute all DataUpdate queue followed by the DeferrableUpdate queue...
+ foreach ( [ $dataUpdateQueue, $genericUpdateQueue ] as $updateQueue ) {
+ foreach ( $updateQueue as $du ) {
+ // Enqueue the task into the job queue system instead if applicable
+ if ( $mode === 'enqueue' && $du instanceof EnqueueableDataUpdate ) {
+ self::jobify( $du, $lbf, $logger, $stats, $httpMethod );
+ continue;
+ }
+ // Otherwise, execute the task and any subtasks that it spawns
self::$executeContext = [ 'stage' => $stage, 'subqueue' => [] ];
try {
- /** @var DeferrableUpdate $update */
- $guiError = self::handleUpdate( $update, $lbFactory, $mode, $stage );
- $reportableError = $reportableError ?: $guiError;
+ $e = self::run( $du, $lbf, $logger, $stats, $httpMethod );
+ $guiEx = $guiEx ?: ( $e instanceof ErrorPageError ? $e : null );
// Do the subqueue updates for $update until there are none
while ( self::$executeContext['subqueue'] ) {
- $subUpdate = reset( self::$executeContext['subqueue'] );
+ $duChild = reset( self::$executeContext['subqueue'] );
$firstKey = key( self::$executeContext['subqueue'] );
unset( self::$executeContext['subqueue'][$firstKey] );
- $guiError = self::handleUpdate( $subUpdate, $lbFactory, $mode, $stage );
- $reportableError = $reportableError ?: $guiError;
+ $e = self::run( $duChild, $lbf, $logger, $stats, $httpMethod );
+ $guiEx = $guiEx ?: ( $e instanceof ErrorPageError ? $e : null );
}
} finally {
// Make sure we always clean up the context.
$updates = $queue; // new snapshot of queue (check for new entries)
}
- if ( $reportableError ) {
- throw $reportableError; // throw the first of any GUI errors
+ // Throw the first of any GUI errors as long as the context is HTTP pre-send. However,
+ // callers should check permissions *before* enqueueing updates. If the main transaction
+ // round actions succeed but some deferred updates fail due to permissions errors then
+ // there is a risk that some secondary data was not properly updated.
+ if ( $guiEx && $stage === self::PRESEND && !headers_sent() ) {
+ throw $guiEx;
}
}
/**
- * Run or enqueue an update
+ * Run a task and catch/log any exceptions
*
* @param DeferrableUpdate $update
* @param LBFactory $lbFactory
- * @param string $mode
- * @param int $stage
- * @return ErrorPageError|null
+ * @param LoggerInterface $logger
+ * @param StatsdDataFactoryInterface $stats
+ * @param string $httpMethod
+ * @return Exception|Throwable|null
*/
- private static function handleUpdate(
- DeferrableUpdate $update, LBFactory $lbFactory, $mode, $stage
+ private static function run(
+ DeferrableUpdate $update,
+ LBFactory $lbFactory,
+ LoggerInterface $logger,
+ StatsdDataFactoryInterface $stats,
+ $httpMethod
) {
- $guiError = null;
+ $name = get_class( $update );
+ $suffix = ( $update instanceof DeferrableCallback ) ? "_{$update->getOrigin()}" : '';
+ $stats->increment( "deferred_updates.$httpMethod.{$name}{$suffix}" );
+
+ $e = null;
try {
- if ( $mode === 'enqueue' && $update instanceof EnqueueableDataUpdate ) {
- // Run only the job enqueue logic to complete the update later
- $spec = $update->getAsJobSpecification();
- $domain = $spec['domain'] ?? $spec['wiki'];
- JobQueueGroup::singleton( $domain )->push( $spec['job'] );
- } else {
- self::attemptUpdate( $update, $lbFactory );
- }
+ self::attemptUpdate( $update, $lbFactory );
} catch ( Exception $e ) {
- // Reporting GUI exceptions does not work post-send
- if ( $e instanceof ErrorPageError && $stage === self::PRESEND ) {
- $guiError = $e;
- }
- $lbFactory->rollbackMasterChanges( __METHOD__ );
+ } catch ( Throwable $e ) {
+ }
+ if ( $e ) {
+ $logger->error(
+ "Deferred update {type} failed: {message}",
+ [
+ 'type' => $name . $suffix,
+ 'message' => $e->getMessage(),
+ 'trace' => $e->getTraceAsString()
+ ]
+ );
+ $lbFactory->rollbackMasterChanges( __METHOD__ );
// VW-style hack to work around T190178, so we can make sure
// PageMetaDataUpdater doesn't throw exceptions.
if ( defined( 'MW_PHPUNIT_TEST' ) ) {
}
}
- return $guiError;
+ return $e;
+ }
+
+ /**
+ * Push a task into the job queue system and catch/log any exceptions
+ *
+ * @param EnqueueableDataUpdate $update
+ * @param LBFactory $lbFactory
+ * @param LoggerInterface $logger
+ * @param StatsdDataFactoryInterface $stats
+ * @param string $httpMethod
+ */
+ private static function jobify(
+ EnqueueableDataUpdate $update,
+ LBFactory $lbFactory,
+ LoggerInterface $logger,
+ StatsdDataFactoryInterface $stats,
+ $httpMethod
+ ) {
+ $stats->increment( "deferred_updates.$httpMethod." . get_class( $update ) );
+
+ $e = null;
+ try {
+ $spec = $update->getAsJobSpecification();
+ JobQueueGroup::singleton( $spec['domain'] ?? $spec['wiki'] )->push( $spec['job'] );
+ } catch ( Exception $e ) {
+ } catch ( Throwable $e ) {
+ }
+
+ if ( $e ) {
+ $logger->error(
+ "Job insertion of deferred update {type} failed: {message}",
+ [
+ 'type' => get_class( $update ),
+ 'message' => $e->getMessage(),
+ 'trace' => $e->getTraceAsString()
+ ]
+ );
+ $lbFactory->rollbackMasterChanges( __METHOD__ );
+ }
}
/**
$update instanceof TransactionRoundAwareUpdate &&
$update->getTransactionRoundRequirement() == $update::TRX_ROUND_ABSENT
) {
- $update->doUpdate();
+ $fnameTrxOwner = null;
} else {
- // Run the bulk of the update now
$fnameTrxOwner = get_class( $update ) . '::doUpdate';
+ }
+
+ if ( $fnameTrxOwner !== null ) {
$lbFactory->beginMasterChanges( $fnameTrxOwner );
- $update->doUpdate();
+ }
+
+ $update->doUpdate();
+
+ if ( $fnameTrxOwner !== null ) {
$lbFactory->commitMasterChanges( $fnameTrxOwner );
}
}
* @since 1.27
*/
public static function acquirePageLock( IDatabase $dbw, $pageId, $why = 'atomicity' ) {
- $key = "LinksUpdate:$why:pageid:$pageId";
+ $key = "{$dbw->getDomainID()}:LinksUpdate:$why:pageid:$pageId"; // per-wiki
$scopedLock = $dbw->getScopedLockAndFlush( $key, __METHOD__, 15 );
if ( !$scopedLock ) {
$logger = LoggerFactory::getInstance( 'SecondaryDataUpdate' );
* Class for handling updates to the site_stats table
*/
class SiteStatsUpdate implements DeferrableUpdate, MergeableUpdate {
- /** @var BagOStuff */
- protected $stash;
/** @var int */
protected $edits = 0;
/** @var int */
/** @var int */
protected $images = 0;
- private static $counters = [ 'edits', 'pages', 'articles', 'users', 'images' ];
+ /** @var string[] Map of (table column => counter type) */
+ private static $counters = [
+ 'ss_total_edits' => 'edits',
+ 'ss_total_pages' => 'pages',
+ 'ss_good_articles' => 'articles',
+ 'ss_users' => 'users',
+ 'ss_images' => 'images'
+ ];
// @todo deprecate this constructor
function __construct( $views, $edits, $good, $pages = 0, $users = 0 ) {
$this->articles = $good;
$this->pages = $pages;
$this->users = $users;
-
- $this->stash = MediaWikiServices::getInstance()->getMainObjectStash();
}
public function merge( MergeableUpdate $update ) {
}
/**
- * @param array $deltas
+ * @param int[] $deltas Map of (counter type => integer delta)
* @return SiteStatsUpdate
+ * @throws UnexpectedValueException
*/
public static function factory( array $deltas ) {
$update = new self( 0, 0, 0 );
}
foreach ( self::$counters as $field ) {
- if ( isset( $deltas[$field] ) && $deltas[$field] ) {
- $update->$field = $deltas[$field];
- }
+ $update->$field = $deltas[$field] ?? 0;
}
return $update;
}
public function doUpdate() {
- $this->doUpdateContextStats();
-
- $rate = MediaWikiServices::getInstance()->getMainConfig()->get( 'SiteStatsAsyncFactor' );
- // 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
- DeferredUpdates::addCallableUpdate( [ $this, 'tryDBUpdateInternal' ] );
- }
- }
-
- /**
- * Do not call this outside of SiteStatsUpdate
- */
- public function tryDBUpdateInternal() {
$services = MediaWikiServices::getInstance();
- $config = $services->getMainConfig();
-
- $dbw = $services->getDBLoadBalancer()->getConnection( DB_MASTER );
- $lockKey = $dbw->getDomainID() . ':site_stats'; // prepend wiki ID
- $pd = [];
- if ( $config->get( 'SiteStatsAsyncFactor' ) ) {
- // Lock the table so we don't have double DB/memcached updates
- if ( !$dbw->lock( $lockKey, __METHOD__, 0 ) ) {
- $this->doUpdatePendingDeltas();
+ $stats = $services->getStatsdDataFactory();
- return;
+ $deltaByType = [];
+ foreach ( self::$counters as $type ) {
+ $delta = $this->$type;
+ if ( $delta !== 0 ) {
+ $stats->updateCount( "site.$type", $delta );
}
- $pd = $this->getPendingDeltas();
- // Piggy-back the async deltas onto those of this stats update....
- $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_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', [ $updates ], [], __METHOD__ );
+ $deltaByType[$type] = $delta;
}
- if ( $config->get( 'SiteStatsAsyncFactor' ) ) {
- // Decrement the async deltas now that we applied them
- $this->removePendingDeltas( $pd );
- // Commit the updates and unlock the table
- $dbw->unlock( $lockKey, __METHOD__ );
- }
+ ( new AutoCommitUpdate(
+ $services->getDBLoadBalancer()->getConnectionRef( DB_MASTER ),
+ __METHOD__,
+ function ( IDatabase $dbw, $fname ) use ( $deltaByType ) {
+ $set = [];
+ foreach ( self::$counters as $column => $type ) {
+ $delta = (int)$deltaByType[$type];
+ if ( $delta > 0 ) {
+ $set[] = "$column=$column+" . abs( $delta );
+ } elseif ( $delta < 0 ) {
+ $set[] = "$column=$column-" . abs( $delta );
+ }
+ }
+
+ if ( $set ) {
+ $dbw->update( 'site_stats', $set, [ 'ss_row_id' => 1 ], $fname );
+ }
+ }
+ ) )->doUpdate();
- // Invalid cache used by parser functions
+ // Invalidate cache used by parser functions
SiteStats::unload();
}
$services = MediaWikiServices::getInstance();
$config = $services->getMainConfig();
- $dbr = $services->getDBLoadBalancer()->getConnection( DB_REPLICA, 'vslow' );
+ $dbr = $services->getDBLoadBalancer()->getConnectionRef( DB_REPLICA, '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.
$rcQuery = RecentChange::getQueryInfo();
return $activeUsers;
}
-
- protected function doUpdateContextStats() {
- $stats = MediaWikiServices::getInstance()->getStatsdDataFactory();
- foreach ( [ 'edits', 'articles', 'pages', 'users', 'images' ] as $type ) {
- $delta = $this->$type;
- if ( $delta !== 0 ) {
- $stats->updateCount( "site.$type", $delta );
- }
- }
- }
-
- protected function doUpdatePendingDeltas() {
- $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 string &$sql
- * @param string $field
- * @param int $delta
- */
- 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 BagOStuff $stash
- * @param string $type
- * @param string $sign ('+' or '-')
- * @return string
- */
- private function getTypeCacheKey( BagOStuff $stash, $type, $sign ) {
- return $stash->makeKey( '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 string $type
- * @param int $delta Delta (positive or negative)
- */
- protected function adjustPending( $type, $delta ) {
- if ( $delta < 0 ) { // decrement
- $key = $this->getTypeCacheKey( $this->stash, $type, '-' );
- } else { // increment
- $key = $this->getTypeCacheKey( $this->stash, $type, '+' );
- }
-
- $magnitude = abs( $delta );
- $this->stash->incrWithInit( $key, 0, $magnitude, $magnitude );
- }
-
- /**
- * Get pending delta counters for each stat type
- * @return array Positive and negative deltas for each type
- */
- protected function getPendingDeltas() {
- $pending = [];
- foreach ( [ 'ss_total_edits',
- 'ss_good_articles', 'ss_total_pages', 'ss_users', 'ss_images' ] as $type
- ) {
- // Get pending increments and pending decrements
- $flg = BagOStuff::READ_LATEST;
- $pending[$type]['+'] = (int)$this->stash->get(
- $this->getTypeCacheKey( $this->stash, $type, '+' ),
- $flg
- );
- $pending[$type]['-'] = (int)$this->stash->get(
- $this->getTypeCacheKey( $this->stash, $type, '-' ),
- $flg
- );
- }
-
- return $pending;
- }
-
- /**
- * Reduce pending delta counters after updates have been applied
- * @param array $pd Result of getPendingDeltas(), used for DB update
- */
- protected function removePendingDeltas( array $pd ) {
- foreach ( $pd as $type => $deltas ) {
- foreach ( $deltas as $sign => $magnitude ) {
- // Lower the pending counter now that we applied these changes
- $key = $this->getTypeCacheKey( $this->stash, $type, $sign );
- $this->stash->decr( $key, $magnitude );
- }
- }
- }
}
*/
public function doUpdate() {
$lb = MediaWikiServices::getInstance()->getDBLoadBalancer();
- $dbw = $lb->getConnection( DB_MASTER );
+ $dbw = $lb->getConnectionRef( DB_MASTER );
$fname = __METHOD__;
( new AutoCommitUpdate( $dbw, __METHOD__, function () use ( $lb, $dbw, $fname ) {
// The user_editcount is probably NULL (e.g. not initialized).
// Since this update runs after the new revisions were committed,
// wait for the replica DB to catch up so they will be counted.
- $dbr = $lb->getConnection( DB_REPLICA );
- // If $dbr is actually the master DB, then clearing the snapshot is
+ $dbr = $lb->getConnectionRef( DB_REPLICA );
+ // If $dbr is actually the master DB, then clearing the snapshot
// is harmless and waitForMasterPos() will just no-op.
$dbr->flushSnapshot( $fname );
$lb->waitForMasterPos( $dbr );
'type' => 'sqlite',
'dbname' => \"{\$wgDBname}_jobqueue\",
'tablePrefix' => '',
+ 'variables' => [ 'synchronous' => 'NORMAL' ],
'dbDirectory' => \$wgSQLiteDataDir,
'trxMode' => 'IMMEDIATE',
'flags' => 0
"config-copyright": "== Аўтарскае права і ўмовы ==\n\n$1\n\nThis 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.\n\nThis 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'''.\nSee the GNU General Public License for more details.\n\nYou should have received <doclink href=Copying>a copy of the GNU General Public License</doclink> along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. or [https://www.gnu.org/copyleft/gpl.html read it online].",
"config-sidebar": "* [https://www.mediawiki.org Хатняя старонка MediaWiki]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Contents Даведка для ўдзельнікаў]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Contents Даведка для адміністратараў]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ Адказы на частыя пытаньні]",
"config-sidebar-readme": "Прачытай мяне",
+ "config-sidebar-relnotes": "Заўвагі да выпуску",
+ "config-sidebar-license": "Капіяваньне",
+ "config-sidebar-upgrade": "Абнаўленьне",
"config-env-good": "Асяродзьдзе было праверанае.\nВы можаце ўсталёўваць MediaWiki.",
"config-env-bad": "Асяродзьдзе было праверанае.\nУсталяваньне MediaWiki немагчымае.",
"config-env-php": "Усталяваны PHP $1.",
"config-page-existingwiki": "Eksisterende wiki",
"config-help-restart": "Vil du rydde alle gemte data, du har indtastet og genstarte installationen?",
"config-restart": "Ja, genstart den",
+ "config-sidebar-upgrade": "Opgraderer",
"config-env-php": "PHP $1 er installeret.",
"config-env-hhvm": "HHVM $1 er installeret.",
"config-apc": "[https://www.php.net/apc APC] er installeret",
"Tosky",
"Selven",
"Sarah Bernabei",
- "ArTrix"
+ "ArTrix",
+ "Annibale covini gerolamo"
]
},
"config-desc": "Programma di installazione per MediaWiki",
"config-sidebar": "* [https://www.mediawiki.org Pagina principale MediaWiki]\n* [https://www.mediawiki.org/Special:MyLanguage/Help:Contents Guida ai contenuti per utenti]\n* [https://www.mediawiki.org/Special:MyLanguage/Manual:Contents Guida ai contenuti per admin]\n* [https://www.mediawiki.org/Special:MyLanguage/Manual:FAQ FAQ]",
"config-sidebar-readme": "Leggimi",
"config-sidebar-relnotes": "Note di versione",
+ "config-sidebar-license": "Licenza",
"config-sidebar-upgrade": "Aggiornamento",
"config-env-good": "L'ambiente è stato controllato.\nÈ possibile installare MediaWiki.",
"config-env-bad": "L'ambiente è stato controllato.\nNon è possibile installare MediaWiki.",
"config-restart": "Ja, starta om",
"config-welcome": "=== Miljökontroller ===\nGrundläggande kontroller kommer nu att utföras för att se om denna miljö är lämplig för installation av MediaWiki.\nKom ihåg att ta med denna information om du söker stöd för hur du skall slutföra installationen.",
"config-copyright": "=== Upphovsrätt och Villkor ===\n\n$1\n\nDetta program är fri programvara; du kan vidaredistribuera den och/eller modifiera det enligt villkoren i GNU General Public License som publicerats av Free Software Foundation; antingen genom version 2 av licensen, eller (på ditt initiativ) någon senare version.\n\nDetta program är distribuerat i hopp om att det kommer att vara användbart, men '''utan någon garanti'''; utan att ens ha en underförstådd garanti om '''säljbarhet''' eller '''lämplighet för ett särskilt ändamål'''.\nSe GNU General Public License för mer detaljer.\n\nDu bör ha fått <doclink href=Copying>en kopia av GNU General Public License</doclink> tillsammans med detta program; om inte, skriv till Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA, eller [https://www.gnu.org/copyleft/gpl.html läs den online].",
- "config-sidebar": "* [https://www.mediawiki.org MediaWikis webbplats]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Contents Användarguide]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Contents Administratörguide]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ Frågor och svar]\n----\n* <doclink href=Readme>Läs mig</doclink>\n* <doclink href=ReleaseNotes>Utgivningsanteckningar</doclink>\n* <doclink href=Copying>Kopiering</doclink>\n* <doclink href=UpgradeDoc>Uppgradering</doclink>",
+ "config-sidebar": "* [https://www.mediawiki.org MediaWikis webbplats]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Contents Användarguide]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Contents Administratörsguide]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ Frågor och svar]",
+ "config-sidebar-readme": "Läs mig",
+ "config-sidebar-relnotes": "Utgivningsanteckningar",
+ "config-sidebar-license": "Kopierar",
+ "config-sidebar-upgrade": "Uppgradering",
"config-env-good": "Miljön har kontrollerats.\nDu kan installera MediaWiki.",
"config-env-bad": "Miljön har kontrollerats.\nDu kan inte installera MediaWiki.",
"config-env-php": "PHP $1 är installerat.",
"config-restart": "Так, перезапустити установку",
"config-welcome": "=== Перевірка оточення ===\nБудуть проведені базові перевірки, щоб виявити, чи можлива установка MediaWiki у даній системі.\nНе забудьте включити цю інформацію, якщо ви звернетеся по підтримку, як завершити установку.",
"config-copyright": "=== Авторське право і умови ===\n\n$1\n\nЦя програма є вільним програмним забезпеченням; Ви можете розповсюджувати та/або змінювати її під ліцензією GNU General Public License, опублікованою Фондом вільного програмного забезпечення; версією 2 цієї ліцензії або будь-якою пізнішою на Ваш вибір.\n\nЦя програма поширюється з надією на те, що вона буде корисною, однак '''без жодних гарантій'''; навіть без неявної гарантії '''комерційної цінності''' або '''придатності для певних цілей'''.\nДив. GNU General Public License для детальної інформації.\n\nВи повинні були отримати <doclink href=Copying>копію GNU General Public License</doclink> разом із цією програмою; якщо ж ні, зверніться до Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. або [https://www.gnu.org/copyleft/gpl.html ознайомтесь з нею онлайн].",
- "config-sidebar": "* [https://www.mediawiki.org Сайт MediaWiki]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Contents Посібник користувача]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Contents Посібник адміністратора]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ FAQ]\n----\n* <doclink href=Readme>Read me</doclink>\n* <doclink href=ReleaseNotes>Інформація про випуск</doclink>\n* <doclink href=Copying>Ліцензія</doclink>\n* <doclink href=UpgradeDoc>Оновлення</doclink>",
+ "config-sidebar": "* [https://www.mediawiki.org Сайт MediaWiki]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Contents Посібник користувача]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Contents Посібник адміністратора]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ FAQ]",
+ "config-sidebar-readme": "Прочитай мене",
+ "config-sidebar-relnotes": "Інформація про версію",
+ "config-sidebar-license": "Копіювання",
+ "config-sidebar-upgrade": "Оновлення",
"config-env-good": "Перевірку середовища успішно завершено.\nВи можете встановити MediaWiki.",
"config-env-bad": "Було проведено перевірку середовища. Ви не можете встановити MediaWiki.",
"config-env-php": "Встановлено версію PHP: $1.",
"config-env-hhvm": "HHVM $1 встановлено.",
- "config-unicode-using-intl": "Ð\92икоÑ\80иÑ\81Ñ\82овÑ\83ваÑ\82и [https://pecl.php.net/intl мÑ\96жнаÑ\80одне Ñ\80озÑ\88иÑ\80еннÑ\8f PECL] для нормалізації Юнікоду.",
- "config-unicode-pure-php-warning": "'''Увага''': [https://pecl.php.net/intl міжнародне розширення PECL] не може провести нормалізацію Юнікоду.\nЯкщо ваш сайт має високий трафік, вам варто почитати про [https://www.mediawiki.org/wiki/Special:MyLanguage/Unicode_normalization_considerations нормалізацію Юнікоду].",
+ "config-unicode-using-intl": "Ð\97а допомогоÑ\8e [https://php.net/manual/en/book.intl.php PHP-Ñ\80озÑ\88иÑ\80еннÑ\8f intl] для нормалізації Юнікоду.",
+ "config-unicode-pure-php-warning": "'''Увага''': [https://php.net/manual/en/book.intl.php PHP-розширення intl] не може провести нормалізацію Юнікоду.\nЯкщо ваш сайт має високий трафік, вам варто почитати про [https://www.mediawiki.org/wiki/Special:MyLanguage/Unicode_normalization_considerations нормалізацію Юнікоду].",
"config-unicode-update-warning": "'''Увага''': Встановлена версія обгортки нормалізації Юнікоду використовує стару версію бібліотеки [http://site.icu-project.org/ проекту ICU].\nВи маєте [https://www.mediawiki.org/wiki/Special:MyLanguage/Unicode_normalization_considerations оновити версію], якщо плануєте повноцінно використовувати Юнікод.",
"config-no-db": "Не вдалося знайти потрібний драйвер бази даних! Вам необхідно встановити драйвер бази даних для PHP. Підтримуються {{PLURAL:$2|такий тип|такі типи}} баз даних: $1.\n\nЯкщо ви скомпілювали PHP самостійно, переналаштуйте його з увімкненим клієнтом бази даних, наприклад за допомогою <code>./configure --with-mysqli</code>.\n\nЯкщо установлено PHP з пакетів Debian або Ubuntu, тоді ви також повинні встановити, наприклад, пакунок <code>php-mysql</code>.",
"config-outdated-sqlite": "<strong>Увага:</strong> у Вас встановлена версія SQLite $2, а це нижче, ніж мінімально необхідна версія $1. SQLite буде недоступним.",
"config-support-info": "MediaWiki підтримує такі системи баз даних:\n\n$1\n\nЯкщо Ви не бачите серед перерахованих систему баз даних, яку використовуєте, виконайте вказівки, вказані вище, щоб увімкнути підтримку.",
"config-dbsupport-mysql": "* [{{int:version-db-mariadb-url}} MariaDB] є основною ціллю для MediaWiki і найкраще підтримується. MediaWiki також працює з [{{int:version-db-mysql-url}} MySQL] та [{{int:version-db-percona-url}} Percona Server], які сумісні з MariaDB. ([https://www.php.net/manual/en/mysqli.installation.php Як зібрати PHP з підтримкою MySQL])",
"config-dbsupport-postgres": "* [{{int:version-db-postgres-url}} PostgreSQL] — популярна відкрита СУБД, альтернатива MySQL. ([https://www.php.net/manual/en/pgsql.installation.php як зібрати PHP з допомогою PostgreSQL]).",
- "config-dbsupport-sqlite": "* [{{int:version-db-sqlite-url}} SQLite] — легка система баз даних, яка дуже добре підтримується. ([http://www.php.net/manual/en/pdo.installation.php Як зібрати PHP з допомогою SQLite], що використовує PDO)",
- "config-dbsupport-oracle": "* [{{int:version-db-oracle-url}} Oracle] — комерційна база даних масштабу підприємства. ([http://www.php.net/manual/en/oci8.installation.php Як зібрати PHP з підтримкою OCI8])",
+ "config-dbsupport-sqlite": "* [{{int:version-db-sqlite-url}} SQLite] — легка система баз даних, яка дуже добре підтримується. ([http://www.php.net/manual/en/pdo.installation.php Як зібрати PHP з допомогою SQLite], використовує PDO)",
+ "config-dbsupport-oracle": "* [{{int:version-db-oracle-url}} Oracle] — комерційна база даних масштабу підприємства. ([http://www.php.net/manual/en/oci8.installation.php Як зібрати PHP з підтримкою OCI8])",
"config-dbsupport-mssql": "* [{{int:version-db-mssql-url}} Microsoft SQL Server] — це комерційна база даних для Windows масштабу підприємства. ([https://www.php.net/manual/en/sqlsrv.installation.php Як зібрати PHP з підтримкою SQLSRV])",
"config-header-mysql": "Налаштування MariaDB/MySQL",
"config-header-postgres": "Налаштування PostgreSQL",
"config-license-help": "Чимало загальнодоступних вікі публікують увесь свій вміст під [https://freedomdefined.org/Definition вільною ліцензією]. Це розвиває відчуття спільної власності і заохочує довготривалу участь. У загальному випадку для приватної чи корпоративної вікі у цьому немає необхідності.\n\nЯкщо Ви хочете мати змогу використовувати текст з Вікіпедії і дати Вікіпедії змогу використовувати текст, скопійований з Вашої вікі, вам необхідно обрати <strong>{{int:config-license-cc-by-sa}}</strong>.\n\nРаніше Вікіпедія використовувала GNU Free Documentation License.\nGFDL — допустима ліцензія, але у ній важко розібратися, а контент під GFDL важко використовувати повторно.",
"config-email-settings": "Налаштування електронної пошти",
"config-enable-email": "Увімкнути вихідну електронну пошту",
- "config-enable-email-help": "Якщо Ви хочете, що електронна пошта працювала, необхідно виставити коректні [Config-dbsupport-oracle/manual/en/mail.configuration.php налаштування пошти у PHP].\nЯкщо Вам не потрібні жодні можливості електронної пошти у вікі, можете тут їх відімкнути.",
+ "config-enable-email-help": "Якщо Ви хочете, що електронна пошта працювала, необхідно виставити коректні [https://www.php.net/manual/en/mail.configuration.php налаштування пошти у PHP].\nЯкщо Вам не потрібні жодні можливості електронної пошти у вікі, можете тут їх відімкнути.",
"config-email-user": "Увімкнути електронну пошту користувач-користувачеві",
"config-email-user-help": "Дозволити усім користувачам надсилати один одному електронну пошту, якщо вони увімкнули цю можливість у своїх налаштуваннях.",
"config-email-usertalk": "Увімкнути сповіщення про повідомлення на сторінці обговорення користувача",
/** @var StatsdDataFactoryInterface */
protected $stats;
- /** @var BagOStuff */
- protected $dupCache;
+ /** @var WANObjectCache */
+ protected $wanCache;
const QOS_ATOMIC = 1; // integer; "all-or-nothing" job insertions
/**
* @param array $params
+ * - type : A job type
+ * - domain : A DB domain ID
+ * - wanCache : An instance of WANObjectCache to use for caching [default: none]
+ * - stats : An instance of StatsdDataFactoryInterface [default: none]
+ * - claimTTL : Seconds a job can be claimed for exclusive execution [default: forever]
+ * - maxTries : Total times a job can be tried, assuming claims expire [default: 3]
+ * - order : Queue order, one of ("fifo", "timestamp", "random") [default: variable]
+ * - readOnlyReason : Mark the queue as read-only with this reason [default: false]
* @throws JobQueueError
*/
protected function __construct( array $params ) {
}
$this->readOnlyReason = $params['readOnlyReason'] ?? false;
$this->stats = $params['stats'] ?? new NullStatsdDataFactory();
- $this->dupCache = $params['stash'] ?? new EmptyBagOStuff();
+ $this->wanCache = $params['wanCache'] ?? WANObjectCache::newEmpty();
}
/**
* @return bool
*/
protected function doDeduplicateRootJob( IJobSpecification $job ) {
- if ( !$job->hasRootJobParams() ) {
+ $params = $job->hasRootJobParams() ? $job->getRootJobParams() : null;
+ if ( !$params ) {
throw new JobQueueError( "Cannot register root job; missing parameters." );
}
- $params = $job->getRootJobParams();
$key = $this->getRootJobCacheKey( $params['rootJobSignature'] );
- // Callers should call JobQueueGroup::push() before this method so that if the insert
- // fails, the de-duplication registration will be aborted. Since the insert is
- // deferred till "transaction idle", do the same here, so that the ordering is
- // maintained. Having only the de-duplication registration succeed would cause
- // jobs to become no-ops without any actual jobs that made them redundant.
- $timestamp = $this->dupCache->get( $key ); // current last timestamp of this job
- if ( $timestamp && $timestamp >= $params['rootJobTimestamp'] ) {
+ // Callers should call JobQueueGroup::push() before this method so that if the
+ // insert fails, the de-duplication registration will be aborted. Having only the
+ // de-duplication registration succeed would cause jobs to become no-ops without
+ // any actual jobs that made them redundant.
+ $timestamp = $this->wanCache->get( $key ); // last known timestamp of such a root job
+ if ( $timestamp !== false && $timestamp >= $params['rootJobTimestamp'] ) {
return true; // a newer version of this root job was enqueued
}
// Update the timestamp of the last root job started at the location...
- return $this->dupCache->set( $key, $params['rootJobTimestamp'], self::ROOTJOB_TTL );
+ return $this->wanCache->set( $key, $params['rootJobTimestamp'], self::ROOTJOB_TTL );
}
/**
if ( $job->getType() !== $this->type ) {
throw new JobQueueError( "Got '{$job->getType()}' job; expected '{$this->type}'." );
}
- $isDuplicate = $this->doIsRootJobOldDuplicate( $job );
- return $isDuplicate;
+ return $this->doIsRootJobOldDuplicate( $job );
}
/**
* @return bool
*/
protected function doIsRootJobOldDuplicate( IJobSpecification $job ) {
- if ( !$job->hasRootJobParams() ) {
+ $params = $job->hasRootJobParams() ? $job->getRootJobParams() : null;
+ if ( !$params ) {
return false; // job has no de-deplication info
}
- $params = $job->getRootJobParams();
$key = $this->getRootJobCacheKey( $params['rootJobSignature'] );
// Get the last time this root job was enqueued
- $timestamp = $this->dupCache->get( $key );
+ $timestamp = $this->wanCache->get( $key );
+ if ( $timestamp === false || $params['rootJobTimestamp'] > $timestamp ) {
+ // Update the timestamp of the last known root job started at the location...
+ $this->wanCache->set( $key, $params['rootJobTimestamp'], self::ROOTJOB_TTL );
+ }
// Check if a new root job was started at the location after this one's...
return ( $timestamp && $timestamp > $params['rootJobTimestamp'] );
* @return string
*/
protected function getRootJobCacheKey( $signature ) {
- return $this->dupCache->makeGlobalKey(
+ return $this->wanCache->makeGlobalKey(
'jobqueue',
$this->domain,
$this->type,
use Wikimedia\Rdbms\DBConnectionError;
use Wikimedia\Rdbms\DBError;
use MediaWiki\MediaWikiServices;
+use Wikimedia\Rdbms\IMaintainableDatabase;
use Wikimedia\ScopedCallback;
/**
const MAX_JOB_RANDOM = 2147483647; // integer; 2^31 - 1, used for job_random
const MAX_OFFSET = 255; // integer; maximum number of rows to skip
- /** @var WANObjectCache */
- protected $cache;
- /** @var IDatabase|DBError|null */
+ /** @var IMaintainableDatabase|DBError|null */
protected $conn;
/** @var array|null Server configuration array */
* If not specified, the primary DB cluster for the wiki will be used.
* This can be overridden with a custom cluster so that DB handles will
* be retrieved via LBFactory::getExternalLB() and getConnection().
- * - wanCache : An instance of WANObjectCache to use for caching.
* @param array $params
*/
protected function __construct( array $params ) {
} elseif ( isset( $params['cluster'] ) && is_string( $params['cluster'] ) ) {
$this->cluster = $params['cluster'];
}
-
- $this->cache = $params['wanCache'] ?? WANObjectCache::newEmpty();
}
protected function supportedOrders() {
protected function doGetSize() {
$key = $this->getCacheKey( 'size' );
- $size = $this->cache->get( $key );
+ $size = $this->wanCache->get( $key );
if ( is_int( $size ) ) {
return $size;
}
} catch ( DBError $e ) {
throw $this->getDBException( $e );
}
- $this->cache->set( $key, $size, self::CACHE_TTL_SHORT );
+ $this->wanCache->set( $key, $size, self::CACHE_TTL_SHORT );
return $size;
}
$key = $this->getCacheKey( 'acquiredcount' );
- $count = $this->cache->get( $key );
+ $count = $this->wanCache->get( $key );
if ( is_int( $count ) ) {
return $count;
}
} catch ( DBError $e ) {
throw $this->getDBException( $e );
}
- $this->cache->set( $key, $count, self::CACHE_TTL_SHORT );
+ $this->wanCache->set( $key, $count, self::CACHE_TTL_SHORT );
return $count;
}
$key = $this->getCacheKey( 'abandonedcount' );
- $count = $this->cache->get( $key );
+ $count = $this->wanCache->get( $key );
if ( is_int( $count ) ) {
return $count;
}
throw $this->getDBException( $e );
}
- $this->cache->set( $key, $count, self::CACHE_TTL_SHORT );
+ $this->wanCache->set( $key, $count, self::CACHE_TTL_SHORT );
return $count;
}
/** @noinspection PhpUnusedLocalVariableInspection */
$scope = $this->getScopedNoTrxFlag( $dbw );
// Check cache to see if the queue has <= OFFSET items
- $tinyQueue = $this->cache->get( $this->getCacheKey( 'small' ) );
+ $tinyQueue = $this->wanCache->get( $this->getCacheKey( 'small' ) );
$invertedDirection = false; // whether one job_random direction was already scanned
// This uses a replication safe method for acquiring jobs. One could use UPDATE+LIMIT
);
if ( !$row ) {
$tinyQueue = true; // we know the queue must have <= MAX_OFFSET rows
- $this->cache->set( $this->getCacheKey( 'small' ), 1, 30 );
+ $this->wanCache->set( $this->getCacheKey( 'small' ), 1, 30 );
continue; // use job_random
}
}
* @return bool
*/
protected function doDeduplicateRootJob( IJobSpecification $job ) {
- $params = $job->getParams();
- if ( !isset( $params['rootJobSignature'] ) ) {
- throw new MWException( "Cannot register root job; missing 'rootJobSignature'." );
- } elseif ( !isset( $params['rootJobTimestamp'] ) ) {
- throw new MWException( "Cannot register root job; missing 'rootJobTimestamp'." );
- }
- $key = $this->getRootJobCacheKey( $params['rootJobSignature'] );
- // Callers should call JobQueueGroup::push() before this method so that if the insert
- // fails, the de-duplication registration will be aborted. Since the insert is
- // deferred till "transaction idle", do the same here, so that the ordering is
+ // Callers should call JobQueueGroup::push() before this method so that if the
+ // insert fails, the de-duplication registration will be aborted. Since the insert
+ // is deferred till "transaction idle", do the same here, so that the ordering is
// maintained. Having only the de-duplication registration succeed would cause
// jobs to become no-ops without any actual jobs that made them redundant.
$dbw = $this->getMasterDB();
/** @noinspection PhpUnusedLocalVariableInspection */
$scope = $this->getScopedNoTrxFlag( $dbw );
-
- $cache = $this->dupCache;
$dbw->onTransactionCommitOrIdle(
- function () use ( $cache, $params, $key ) {
- $timestamp = $cache->get( $key ); // current last timestamp of this job
- if ( $timestamp && $timestamp >= $params['rootJobTimestamp'] ) {
- return true; // a newer version of this root job was enqueued
- }
-
- // Update the timestamp of the last root job started at the location...
- return $cache->set( $key, $params['rootJobTimestamp'], JobQueueDB::ROOTJOB_TTL );
+ function () use ( $job ) {
+ parent::doDeduplicateRootJob( $job );
},
__METHOD__
);
*/
protected function doFlushCaches() {
foreach ( [ 'size', 'acquiredcount' ] as $type ) {
- $this->cache->delete( $this->getCacheKey( $type ) );
+ $this->wanCache->delete( $this->getCacheKey( $type ) );
}
}
/**
* @throws JobQueueConnectionError
- * @return IDatabase
+ * @return IMaintainableDatabase
*/
protected function getMasterDB() {
try {
/**
* @param int $index (DB_REPLICA/DB_MASTER)
- * @return IDatabase
+ * @return IMaintainableDatabase
*/
protected function getDB( $index ) {
if ( $this->server ) {
? $lbFactory->getExternalLB( $this->cluster )
: $lbFactory->getMainLB( $this->domain );
- return ( $lb->getServerType( $lb->getWriterIndex() ) !== 'sqlite' )
+ if ( $lb->getServerType( $lb->getWriterIndex() ) !== 'sqlite' ) {
// Keep a separate connection to avoid contention and deadlocks;
// However, SQLite has the opposite behavior due to DB-level locking.
- ? $lb->getConnectionRef( $index, [], $this->domain, $lb::CONN_TRX_AUTOCOMMIT )
+ $flags = $lb::CONN_TRX_AUTOCOMMIT;
+ } else {
// Jobs insertion will be defered until the PRESEND stage to reduce contention.
- : $lb->getConnectionRef( $index, [], $this->domain );
+ $flags = 0;
+ }
+
+ return $lb->getMaintenanceConnectionRef( $index, [], $this->domain, $flags );
}
}
private function getCacheKey( $property ) {
$cluster = is_string( $this->cluster ) ? $this->cluster : 'main';
- return $this->cache->makeGlobalKey(
+ return $this->wanCache->makeGlobalKey(
'jobqueue',
$this->domain,
$cluster,
$services = MediaWikiServices::getInstance();
$conf['stats'] = $services->getStatsdDataFactory();
$conf['wanCache'] = $services->getMainWANObjectCache();
- $conf['stash'] = $services->getMainObjectStash();
return JobQueue::factory( $conf );
}
protected static $data = [];
public function __construct( array $params ) {
- parent::__construct( $params );
+ $params['wanCache'] = new WANObjectCache( [ 'cache' => new HashBagOStuff() ] );
- $this->dupCache = new HashBagOStuff();
+ parent::__construct( $params );
}
/**
*
* @file
*/
+
+use MediaWiki\Logger\LoggerFactory;
use Psr\Log\LoggerInterface;
/**
"Non-daemonized mode is no longer supported. Please install the " .
"mediawiki/services/jobrunner service and update \$wgJobTypeConf as needed." );
}
- $this->logger = \MediaWiki\Logger\LoggerFactory::getInstance( 'redis' );
+ $this->logger = LoggerFactory::getInstance( 'redis' );
}
protected function supportedOrders() {
try {
return $conn->lSize( $this->getQueueKey( 'l-unclaimed' ) );
} catch ( RedisException $e ) {
- $this->throwRedisException( $conn, $e );
+ throw $this->handleErrorAndMakeException( $conn, $e );
}
}
return array_sum( $conn->exec() );
} catch ( RedisException $e ) {
- $this->throwRedisException( $conn, $e );
+ throw $this->handleErrorAndMakeException( $conn, $e );
}
}
try {
return $conn->zSize( $this->getQueueKey( 'z-delayed' ) );
} catch ( RedisException $e ) {
- $this->throwRedisException( $conn, $e );
+ throw $this->handleErrorAndMakeException( $conn, $e );
}
}
try {
return $conn->zSize( $this->getQueueKey( 'z-abandoned' ) );
} catch ( RedisException $e ) {
- $this->throwRedisException( $conn, $e );
+ throw $this->handleErrorAndMakeException( $conn, $e );
}
}
throw new RedisException( $err );
}
} catch ( RedisException $e ) {
- $this->throwRedisException( $conn, $e );
+ throw $this->handleErrorAndMakeException( $conn, $e );
}
}
$job = $this->getJobFromFields( $item ); // may be false
} while ( !$job ); // job may be false if invalid
} catch ( RedisException $e ) {
- $this->throwRedisException( $conn, $e );
+ throw $this->handleErrorAndMakeException( $conn, $e );
}
return $job;
$this->incrStats( 'acks', $this->type );
} catch ( RedisException $e ) {
- $this->throwRedisException( $conn, $e );
+ throw $this->handleErrorAndMakeException( $conn, $e );
}
return true;
$conn = $this->getConnection();
try {
- $timestamp = $conn->get( $key ); // current last timestamp of this job
+ $timestamp = $conn->get( $key ); // last known timestamp of such a root job
if ( $timestamp && $timestamp >= $params['rootJobTimestamp'] ) {
return true; // a newer version of this root job was enqueued
}
// Update the timestamp of the last root job started at the location...
return $conn->set( $key, $params['rootJobTimestamp'], self::ROOTJOB_TTL ); // 2 weeks
} catch ( RedisException $e ) {
- $this->throwRedisException( $conn, $e );
+ throw $this->handleErrorAndMakeException( $conn, $e );
}
}
// Get the last time this root job was enqueued
$timestamp = $conn->get( $this->getRootJobCacheKey( $params['rootJobSignature'] ) );
} catch ( RedisException $e ) {
- $timestamp = false;
- $this->throwRedisException( $conn, $e );
+ throw $this->handleErrorAndMakeException( $conn, $e );
}
// Check if a new root job was started at the location after this one's...
return $ok;
} catch ( RedisException $e ) {
- $this->throwRedisException( $conn, $e );
+ throw $this->handleErrorAndMakeException( $conn, $e );
}
}
try {
$uids = $conn->lRange( $this->getQueueKey( 'l-unclaimed' ), 0, -1 );
} catch ( RedisException $e ) {
- $this->throwRedisException( $conn, $e );
+ throw $this->handleErrorAndMakeException( $conn, $e );
}
return $this->getJobIterator( $conn, $uids );
try {
$uids = $conn->zRange( $this->getQueueKey( 'z-delayed' ), 0, -1 );
} catch ( RedisException $e ) {
- $this->throwRedisException( $conn, $e );
+ throw $this->handleErrorAndMakeException( $conn, $e );
}
return $this->getJobIterator( $conn, $uids );
try {
$uids = $conn->zRange( $this->getQueueKey( 'z-claimed' ), 0, -1 );
} catch ( RedisException $e ) {
- $this->throwRedisException( $conn, $e );
+ throw $this->handleErrorAndMakeException( $conn, $e );
}
return $this->getJobIterator( $conn, $uids );
try {
$uids = $conn->zRange( $this->getQueueKey( 'z-abandoned' ), 0, -1 );
} catch ( RedisException $e ) {
- $this->throwRedisException( $conn, $e );
+ throw $this->handleErrorAndMakeException( $conn, $e );
}
return $this->getJobIterator( $conn, $uids );
}
}
} catch ( RedisException $e ) {
- $this->throwRedisException( $conn, $e );
+ throw $this->handleErrorAndMakeException( $conn, $e );
}
return $sizes;
* This function should not be called outside JobQueueRedis
*
* @param string $uid
- * @param RedisConnRef $conn
+ * @param RedisConnRef|Redis $conn
* @return RunnableJob|bool Returns false if the job does not exist
* @throws JobQueueError
* @throws UnexpectedValueException
*/
- public function getJobFromUidInternal( $uid, RedisConnRef $conn ) {
+ public function getJobFromUidInternal( $uid, $conn ) {
try {
$data = $conn->hGet( $this->getQueueKey( 'h-data' ), $uid );
if ( $data === false ) {
return $job;
} catch ( RedisException $e ) {
- $this->throwRedisException( $conn, $e );
+ throw $this->handleErrorAndMakeException( $conn, $e );
}
}
$queues[] = $this->decodeQueueName( $queue );
}
} catch ( RedisException $e ) {
- $this->throwRedisException( $conn, $e );
+ throw $this->handleErrorAndMakeException( $conn, $e );
}
return $queues;
/**
* Get a connection to the server that handles all sub-queues for this queue
*
- * @return RedisConnRef
+ * @return RedisConnRef|Redis
* @throws JobQueueConnectionError
*/
protected function getConnection() {
/**
* @param RedisConnRef $conn
* @param RedisException $e
- * @throws JobQueueError
+ * @return JobQueueError
*/
- protected function throwRedisException( RedisConnRef $conn, $e ) {
+ protected function handleErrorAndMakeException( RedisConnRef $conn, $e ) {
$this->redisPool->handleError( $conn, $e );
- throw new JobQueueError( "Redis server error: {$e->getMessage()}\n" );
+ return new JobQueueError( "Redis server error: {$e->getMessage()}\n" );
}
/**
public function run() {
$lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
$lb = $lbFactory->getMainLB();
- $dbw = $lb->getConnection( DB_MASTER );
+ $dbw = $lb->getConnectionRef( DB_MASTER );
$this->ticket = $lbFactory->getEmptyTransactionTicket( __METHOD__ );
}
// Cut down on the time spent in waitForMasterPos() in the critical section
- $dbr = $lb->getConnection( DB_REPLICA, [ 'recentchanges' ] );
+ $dbr = $lb->getConnectionRef( DB_REPLICA, [ 'recentchanges' ] );
if ( !$lb->waitForMasterPos( $dbr ) ) {
$this->setLastError( "Timed out while pre-waiting for replica DB to catch up" );
return false;
}
// Use a named lock so that jobs for this page see each others' changes
- $lockKey = "CategoryMembershipUpdates:{$page->getId()}";
+ $lockKey = "{$dbw->getDomainID()}:CategoryMembershipChange:{$page->getId()}"; // per-wiki
$scopedLock = $dbw->getScopedLockAndFlush( $lockKey, __METHOD__, 3 );
if ( !$scopedLock ) {
$this->setLastError( "Could not acquire lock '$lockKey'" );
$batchSize = $wgUpdateRowsPerQuery;
$loadBalancer = MediaWikiServices::getInstance()->getDBLoadBalancer();
- $dbw = $loadBalancer->getConnection( DB_MASTER );
- $dbr = $loadBalancer->getConnection( DB_REPLICA, [ 'watchlist' ] );
+ $dbw = $loadBalancer->getConnectionRef( DB_MASTER );
+ $dbr = $loadBalancer->getConnectionRef( DB_REPLICA, [ 'watchlist' ] );
// Wait before lock to try to reduce time waiting in the lock.
if ( !$loadBalancer->waitForMasterPos( $dbr ) ) {
}
// Use a named lock so that jobs for this user see each others' changes
- $lockKey = "ClearUserWatchlistJob:$userId";
+ $lockKey = "{{$dbw->getDomainID()}}:ClearUserWatchlist:$userId"; // per-wiki
$scopedLock = $dbw->getScopedLockAndFlush( $lockKey, __METHOD__, 10 );
if ( !$scopedLock ) {
$this->setLastError( "Could not acquire lock '$lockKey'" );
$lbFactory = $services->getDBLoadBalancerFactory();
$rowsPerQuery = $services->getMainConfig()->get( 'UpdateRowsPerQuery' );
- $dbw = $lbFactory->getMainLB()->getConnection( DB_MASTER );
+ $dbw = $lbFactory->getMainLB()->getConnectionRef( DB_MASTER );
$ticket = $lbFactory->getEmptyTransactionTicket( __METHOD__ );
$timestamp = $this->params['timestamp'] ?? null;
if ( $timestamp === null ) {
// Serialize link update job by page ID so they see each others' changes.
// The page ID and latest revision ID will be queried again after the lock
// is acquired to bail if they are changed from that of loadPageData() above.
- $dbw = $lbFactory->getMainLB()->getConnection( DB_MASTER );
+ // Serialize links updates by page ID so they see each others' changes
+ $dbw = $lbFactory->getMainLB()->getConnectionRef( DB_MASTER );
+ /** @noinspection PhpUnusedLocalVariableInspection */
$scopedLock = LinksUpdate::acquirePageLock( $dbw, $page->getId(), 'job' );
if ( $scopedLock === null ) {
// Another job is already updating the page, likely for a prior revision (T170596)
/** @var float|null */
private $wallClockOverride;
+ /** @var float */
const RANK_TOP = 1.0;
/** @var int Array key that holds the entry's main timestamp (flat key use) */
*
* @param string $key
* @param mixed $value
- * @param float $rank Bottom fraction of the list where keys start off [Default: 1.0]
+ * @param float $rank Bottom fraction of the list where keys start off [default: 1.0]
* @return void
*/
public function set( $key, $value, $rank = self::RANK_TOP ) {
* Check if a key exists
*
* @param string $key
- * @param float $maxAge Ignore items older than this many seconds [optional] (since 1.32)
+ * @param float $maxAge Ignore items older than this many seconds [default: INF]
* @return bool
+ * @since 1.32 Added $maxAge
*/
- public function has( $key, $maxAge = 0.0 ) {
+ public function has( $key, $maxAge = INF ) {
if ( !is_int( $key ) && !is_string( $key ) ) {
throw new UnexpectedValueException(
__METHOD__ . ': invalid key; must be string or integer.' );
* If the item is already set, it will be pushed to the top of the cache.
*
* @param string $key
- * @param float $maxAge Ignore items older than this many seconds [optional] (since 1.32)
- * @return mixed Returns null if the key was not found or is older than $maxAge
+ * @param float $maxAge Ignore items older than this many seconds [default: INF]
+ * @param mixed|null $default Value to return if no key is found [default: null]
+ * @return mixed Returns $default if the key was not found or is older than $maxAge
+ * @since 1.32 Added $maxAge
+ * @since 1.34 Added $default
*/
- public function get( $key, $maxAge = 0.0 ) {
+ public function get( $key, $maxAge = INF, $default = null ) {
if ( !$this->has( $key, $maxAge ) ) {
- return null;
+ return $default;
}
$this->ping( $key );
/**
* @param string|int $key
* @param string|int $field
- * @param float $maxAge Ignore items older than this many seconds [optional] (since 1.32)
+ * @param float $maxAge Ignore items older than this many seconds [default: INF]
* @return bool
+ * @since 1.32 Added $maxAge
*/
- public function hasField( $key, $field, $maxAge = 0.0 ) {
+ public function hasField( $key, $field, $maxAge = INF ) {
$value = $this->get( $key );
if ( !is_int( $field ) && !is_string( $field ) ) {
/**
* @param string|int $key
* @param string|int $field
- * @param float $maxAge Ignore items older than this many seconds [optional] (since 1.32)
+ * @param float $maxAge Ignore items older than this many seconds [default: INF]
* @return mixed Returns null if the key was not found or is older than $maxAge
+ * @since 1.32 Added $maxAge
*/
- public function getField( $key, $field, $maxAge = 0.0 ) {
+ public function getField( $key, $field, $maxAge = INF ) {
if ( !$this->hasField( $key, $field, $maxAge ) ) {
return null;
}
* @since 1.28
* @param string $key
* @param callable $callback Callback that will produce the value
- * @param float $rank Bottom fraction of the list where keys start off [Default: 1.0]
- * @param float $maxAge Ignore items older than this many seconds [Default: 0.0] (since 1.32)
+ * @param float $rank Bottom fraction of the list where keys start off [default: 1.0]
+ * @param float $maxAge Ignore items older than this many seconds [default: INF]
* @return mixed The cached value if found or the result of $callback otherwise
+ * @since 1.32 Added $maxAge
*/
public function getWithSetCallback(
- $key, callable $callback, $rank = self::RANK_TOP, $maxAge = 0.0
+ $key, callable $callback, $rank = self::RANK_TOP, $maxAge = INF
) {
if ( $this->has( $key, $maxAge ) ) {
$value = $this->get( $key );
use Psr\Log\LoggerAwareInterface;
use Psr\Log\LoggerInterface;
use Wikimedia\ScopedCallback;
+use Psr\Log\NullLogger;
/**
* @brief Base class for all file backend classes (including multi-write backends).
if ( !is_callable( $this->profiler ) ) {
$this->profiler = null;
}
- $this->logger = $config['logger'] ?? new \Psr\Log\NullLogger();
+ $this->logger = $config['logger'] ?? new NullLogger();
$this->statusWrapper = $config['statusWrapper'] ?? null;
$this->tmpDirectory = $config['tmpDirectory'] ?? null;
}
// Do not try to tear down any PHP output buffers
const STREAM_ALLOW_OB = 2;
+ /**
+ * Takes HTTP headers in a name => value format and converts them to the weird format
+ * expected by stream().
+ * @param string[] $headers
+ * @return array[] [ $headers, $optHeaders ]
+ * @since 1.34
+ */
+ public static function preprocessHeaders( $headers ) {
+ $rawHeaders = [];
+ $optHeaders = [];
+ foreach ( $headers as $name => $header ) {
+ $nameLower = strtolower( $name );
+ if ( in_array( $nameLower, [ 'range', 'if-modified-since' ], true ) ) {
+ $optHeaders[$nameLower] = $header;
+ } else {
+ $rawHeaders[] = "$name: $header";
+ }
+ }
+ return [ $rawHeaders, $optHeaders ];
+ }
+
/**
* @param string $path Local filesystem path to a file
* @param array $params Options map, which includes:
/** @var float */
protected $connTimeout = 10;
/** @var float */
- protected $reqTimeout = 300;
+ protected $reqTimeout = 900;
/** @var bool */
protected $usePipelining = false;
/** @var int */
* @ingroup FileBackend
*/
use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
use Wikimedia\WaitConditionLoop;
/**
}
$this->session = md5( implode( '-', $random ) );
- $this->logger = $config['logger'] ?? new \Psr\Log\NullLogger();
+ $this->logger = $config['logger'] ?? new NullLogger();
}
/**
*/
use Psr\Log\LoggerAwareInterface;
use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
/**
* Implements functions related to MIME types such as detection and mapping to file extension
$this->detectCallback = $params['detectCallback'] ?? null;
$this->guessCallback = $params['guessCallback'] ?? null;
$this->extCallback = $params['extCallback'] ?? null;
- $this->logger = $params['logger'] ?? new \Psr\Log\NullLogger();
+ $this->logger = $params['logger'] ?? new NullLogger();
$this->loadFiles();
}
/**
* Get an associative array containing the item for each of the keys that have items.
- * @param string[] $keys List of keys
+ * @param string[] $keys List of keys; can be a map of (unused => key) for convenience
* @param int $flags Bitfield; supports READ_LATEST [optional]
- * @return array Map of (key => value) for existing keys
+ * @return mixed[] Map of (key => value) for existing keys; preserves the order of $keys
*/
public function getMulti( array $keys, $flags = 0 ) {
- $valuesBykey = $this->doGetMulti( $keys, $flags );
- foreach ( $valuesBykey as $key => $value ) {
+ $foundByKey = $this->doGetMulti( $keys, $flags );
+
+ $res = [];
+ foreach ( $keys as $key ) {
// Resolve one blob at a time (avoids too much I/O at once)
- $valuesBykey[$key] = $this->resolveSegments( $key, $value );
+ if ( array_key_exists( $key, $foundByKey ) ) {
+ // A value should not appear in the key if a segment is missing
+ $value = $this->resolveSegments( $key, $foundByKey[$key] );
+ if ( $value !== false ) {
+ $res[$key] = $value;
+ }
+ }
}
- return $valuesBykey;
+ return $res;
}
/**
* Get an associative array containing the item for each of the keys that have items.
* @param string[] $keys List of keys
* @param int $flags Bitfield; supports READ_LATEST [optional]
- * @return array Map of (key => value) for existing keys
+ * @return mixed[] Map of (key => value) for existing keys
*/
protected function doGetMulti( array $keys, $flags = 0 ) {
$res = [];
--- /dev/null
+# wikimedia/objectcache
+
+## Statistics
+
+Sent to StatsD under MediaWiki's namespace.
+
+### WANObjectCache
+
+The default WANObjectCache provided by MediaWikiServices disables these
+statistics in processes where `$wgCommandLineMode` is true.
+
+#### `wanobjectcache.{kClass}.{cache_action_and_result}`
+
+Call counter from `WANObjectCache::getWithSetCallback()`.
+
+* Type: Counter.
+* Variable `kClass`: The first part of your cache key.
+* Variable `result`: One of:
+ * `"hit.good"`,
+ * `"hit.refresh"`,
+ * `"hit.volatile"`,
+ * `"hit.stale"`,
+ * `"miss.busy"` (or `"renew.busy"`, if the `minAsOf` is used),
+ * `"miss.compute"` (or `"renew.busy"`, if the `minAsOf` is used).
+
+#### `wanobjectcache.{kClass}.regen_set_delay`
+
+Upon cache miss, this measures the time spent in `WANObjectCache::getWithSetCallback()`,
+from the start of the method to right after the new value has been computed by the callback.
+
+This essentially measures the whole method (including retrieval of any old value,
+validation, any locks for `lockTSE`, and the callbacks), except for the time spent
+in sending the value to the backend server.
+
+* Type: Measure (in milliseconds).
+* Variable `kClass`: The first part of your cache key.
+
+#### `wanobjectcache.{kClass}.ck_touch.{result}`
+
+Call counter from `WANObjectCache::touchCheckKey()`.
+
+* Type: Counter.
+* Variable `kClass`: The first part of your cache key.
+* Variable `result`: One of `"ok"` or `"error"`.
+
+#### `wanobjectcache.{kClass}.ck_reset.{result}`
+
+Call counter from `WANObjectCache::resetCheckKey()`.
+
+* Type: Counter.
+* Variable `kClass`: The first part of your cache key.
+* Variable `result`: One of `"ok"` or `"error"`.
+
+#### `wanobjectcache.{kClass}.delete.{result}`
+
+Call counter from `WANObjectCache::delete()`.
+
+* Type: Counter.
+* Variable `kClass`: The first part of your cache key.
+* Variable `result`: One of `"ok"` or `"error"`.
+
+#### `wanobjectcache.{kClass}.cooloff_bounce`
+
+Upon a cache miss, the `WANObjectCache::getWithSetCallback()` method generally
+recomputes the value from the callback, and stores it for re-use.
+
+If regenerating the value costs more than a certain threshold of time (e.g. 50ms),
+then for popular keys it is likely that many web servers will generate and store
+the value simultaneously when the key is entirely absent from the cache. In this case,
+the cool-off feature can be used to protect backend cache servers against network
+congestion. This protection is implemented with a lock and subsequent cool-off period.
+The winner stores their value, while other web server return their value directly.
+
+This counter is incremented whenever a new value was regenerated but not stored.
+
+* Type: Counter.
+* Variable `kClass`: The first part of your cache key.
+
+When the regeneration callback is slow, these scenarios may use the cool-off feature:
+
+* Storing the first interim value for tombstoned keys.
+
+ If a key is currently tombstoned due to a recent `delete()` action, and thus in "hold-off", then
+ the key may not be written to. A mutex lock will let one web server generate the new value and
+ (until the hold-off is over) the generated value will be considered an interim (temporary) value
+ only. Requests that cannot get the lock will use the last stored interim value.
+ If there is no interim value yet, then requests that cannot get the lock may still generate their
+ own value. Here, the cool-off feature is used to decide which requests stores their interim value.
+
+* Storing the first interim value for stale keys.
+
+ If a key is currently in "hold-off" due to a recent `touchCheckKey()` action, then the key may
+ not be written to. A mutex lock will let one web request generate the new value and (until the
+ hold-off is over) such value will be considered an interim (temporary) value only. Requests that
+ lose the lock, will instead return the last stored interim value, or (if it remained in cache) the
+ stale value preserved from before `touchCheckKey()` was called.
+ If there is no stale value and no interim value yet, then multiple requests may need to
+ generate the value simultaneously. In this case, the cool-off feature is used to decide
+ which requests store their interim value.
+
+ The same logic applies when the callback passed to getWithSetCallback() in the "touchedCallback"
+ parameter starts returning an updated timestamp due to a dependency change.
+
+* Storing the first value when `lockTSE` is used.
+
+ When `lockTSE` is in use, and no stale value is found on the backend, and no `busyValue`
+ callback is provided, then multiple requests may generate the value simultaneously;
+ the cool-off is used to decide which requests store their interim value.
if ( $ttl ) {
$result = $conn->setex( $key, $ttl, $this->serialize( $value ) );
} else {
- // No expiry, that is very different from zero expiry in Redis
$result = $conn->set( $key, $this->serialize( $value ) );
}
} catch ( RedisException $e ) {
$this->debug( "setMulti request to $server failed" );
continue;
}
- foreach ( $batchResult as $value ) {
- if ( $value === false ) {
- $result = false;
- }
- }
+ $result = $result && !in_array( false, $batchResult, true );
} catch ( RedisException $e ) {
$this->handleException( $conn, $e );
$result = false;
$this->debug( "deleteMulti request to $server failed" );
continue;
}
- foreach ( $batchResult as $value ) {
- if ( $value === false ) {
- $result = false;
- }
- }
+ $result = $result && !in_array( false, $batchResult, true );
} catch ( RedisException $e ) {
$this->handleException( $conn, $e );
$result = false;
if ( !$conn ) {
return false;
}
- $expiry = $this->convertToRelative( $expiry );
+
+ $ttl = $this->convertToRelative( $expiry );
try {
- if ( $expiry ) {
- $result = $conn->set(
- $key,
- $this->serialize( $value ),
- [ 'nx', 'ex' => $expiry ]
- );
- } else {
- $result = $conn->setnx( $key, $this->serialize( $value ) );
- }
+ $result = $conn->set(
+ $key,
+ $this->serialize( $value ),
+ $ttl ? [ 'nx', 'ex' => $ttl ] : [ 'nx' ]
+ );
} catch ( RedisException $e ) {
$result = false;
$this->handleException( $conn, $e );
}
$this->logRequest( 'add', $key, $server, $result );
+
return $result;
}
- /**
- * Non-atomic implementation of incr().
- *
- * Probably all callers actually want incr() to atomically initialise
- * values to zero if they don't exist, as provided by the Redis INCR
- * command. But we are constrained by the memcached-like interface to
- * return null in that case. Once the key exists, further increments are
- * atomic.
- * @param string $key Key to increase
- * @param int $value Value to add to $key (Default 1)
- * @return int|bool New value or false on failure
- */
public function incr( $key, $value = 1 ) {
list( $server, $conn ) = $this->getConnection( $key );
if ( !$conn ) {
return false;
}
+
try {
- if ( !$conn->exists( $key ) ) {
- return false;
+ $conn->watch( $key );
+ if ( $conn->exists( $key ) ) {
+ $conn->multi( Redis::MULTI );
+ $conn->incrBy( $key, $value );
+ $batchResult = $conn->exec();
+ if ( $batchResult === false ) {
+ $result = false;
+ } else {
+ $result = end( $batchResult );
+ }
+ } else {
+ $result = false;
+ $conn->unwatch();
}
- // @FIXME: on races, the key may have a 0 TTL
- $result = $conn->incrBy( $key, $value );
} catch ( RedisException $e ) {
+ try {
+ $conn->unwatch(); // sanity
+ } catch ( RedisException $ex ) {
+ // already errored
+ }
$result = false;
$this->handleException( $conn, $e );
}
$this->logRequest( 'incr', $key, $server, $result );
+
+ return $result;
+ }
+
+ public function incrWithInit( $key, $exptime, $value = 1, $init = 1 ) {
+ list( $server, $conn ) = $this->getConnection( $key );
+ if ( !$conn ) {
+ return false;
+ }
+
+ $ttl = $this->convertToRelative( $exptime );
+ $preIncrInit = $init - $value;
+ try {
+ $conn->multi( Redis::MULTI );
+ $conn->set( $key, $preIncrInit, $ttl ? [ 'nx', 'ex' => $ttl ] : [ 'nx' ] );
+ $conn->incrBy( $key, $value );
+ $batchResult = $conn->exec();
+ if ( $batchResult === false ) {
+ $result = false;
+ $this->debug( "incrWithInit request to $server failed" );
+ } else {
+ $result = end( $batchResult );
+ }
+ } catch ( RedisException $e ) {
+ $result = false;
+ $this->handleException( $conn, $e );
+ }
+
+ $this->logRequest( 'incr', $key, $server, $result );
+
return $result;
}
/** Idiom for getWithSetCallback() meaning "no minimum required as-of timestamp" */
const MIN_TIMESTAMP_NONE = 0.0;
+ /** @var int One second into the UNIX timestamp epoch */
+ const EPOCH_UNIX_ONE_SECOND = 1.0;
/** Tiny negative float to use when CTL comes up >= 0 due to clock skew */
const TINY_NEGATIVE = -0.000001;
/** Tiny positive float to use when using "minTime" to assert an inequality */
const TINY_POSTIVE = 0.000001;
- /** Milliseconds of delay after get() where set() storms are a consideration with 'lockTSE' */
+ /** Milliseconds of delay after get() where set() storms are a consideration with "lockTSE" */
const SET_DELAY_HIGH_MS = 50;
/** Min millisecond set() backoff for keys in hold-off (far less than INTERIM_KEY_TTL) */
const RECENT_SET_LOW_MS = 50;
/** Max millisecond set() backoff for keys in hold-off (far less than INTERIM_KEY_TTL) */
const RECENT_SET_HIGH_MS = 100;
+ /** @var int Seconds needed for value generation considered slow */
+ const GENERATION_SLOW_SEC = 3;
+
/** Parameter to get()/getMulti() to return extra information by reference */
const PASS_BY_REF = -1;
/** Cache format version number */
const VERSION = 1;
- const FLD_VERSION = 0; // key to cache version number
+ const FLD_FORMAT_VERSION = 0; // key to WAN cache version number
const FLD_VALUE = 1; // key to the cached value
const FLD_TTL = 2; // key to the original TTL
- const FLD_TIME = 3; // key to the cache time
+ const FLD_TIME = 3; // key to the cache timestamp
const FLD_FLAGS = 4; // key to the flags bitfield (reserved number)
- const FLD_HOLDOFF = 5; // key to any hold-off TTL
+ const FLD_VALUE_VERSION = 5; // key to collection cache version number
+ const FLD_GENERATION_TIME = 6; // key to how long it took to generate the value
+
+ const PURGE_TIME = 0; // key to the tombstone entry timestamp
+ const PURGE_HOLDOFF = 1; // key to the tombstone entry hold-off TTL
const VALUE_KEY_PREFIX = 'WANCache:v:';
const INTERIM_KEY_PREFIX = 'WANCache:i:';
const PURGE_VAL_PREFIX = 'PURGED:';
- const VFLD_DATA = 'WOC:d'; // key to the value of versioned data
- const VFLD_VERSION = 'WOC:v'; // key to the version of the value present
-
const PC_PRIMARY = 'primary:1000'; // process cache name and max key count
/**
$this->region = $params['region'] ?? 'main';
$this->cluster = $params['cluster'] ?? 'wan-main';
$this->mcrouterAware = !empty( $params['mcrouterAware'] );
- $this->epoch = $params['epoch'] ?? 1.0;
+ $this->epoch = $params['epoch'] ?? self::EPOCH_UNIX_ONE_SECOND;
$this->setLogger( $params['logger'] ?? new NullLogger() );
$this->stats = $params['stats'] ?? new NullStatsdDataFactory();
* Consider using getWithSetCallback() instead of get() and set() cycles.
* That method has cache slam avoiding features for hot/expensive keys.
*
- * Pass $info as WANObjectCache::PASS_BY_REF to transform it into a cache key info map.
+ * Pass $info as WANObjectCache::PASS_BY_REF to transform it into a cache key metadata map.
* This map includes the following metadata:
* - asOf: UNIX timestamp of the value or null if the key is nonexistant
* - tombAsOf: UNIX timestamp of the tombstone or null if the key is not tombstoned
* - lastCKPurge: UNIX timestamp of the highest check key or null if none provided
+ * - version: cached value version number or null if the key is nonexistant
*
* Otherwise, $info will transform into the cached value timestamp.
*
$info = [
'asOf' => $infoByKey[$key]['asOf'] ?? null,
'tombAsOf' => $infoByKey[$key]['tombAsOf'] ?? null,
- 'lastCKPurge' => $infoByKey[$key]['lastCKPurge'] ?? null
+ 'lastCKPurge' => $infoByKey[$key]['lastCKPurge'] ?? null,
+ 'version' => $infoByKey[$key]['version'] ?? null
];
} else {
$info = $infoByKey[$key]['asOf'] ?? null; // b/c
* Fetch the value of several keys from cache
*
* Pass $info as WANObjectCache::PASS_BY_REF to transform it into a map of cache keys
- * to cache key info maps, each having the same style as those of WANObjectCache::get().
+ * to cache key metadata maps, each having the same style as those of WANObjectCache::get().
* All the cache keys listed in $keys will have an entry.
*
* Othwerwise, $info will transform into a map of (cache key => cached value timestamp).
// Get the main cache value for each key and validate them
foreach ( $valueKeys as $vKey ) {
$key = substr( $vKey, $vPrefixLen ); // unprefix
- list( $value, $curTTL, $asOf, $tombAsOf ) = isset( $wrappedValues[$vKey] )
- ? $this->unwrap( $wrappedValues[$vKey], $now )
- : [ false, null, null, null ]; // not found
+ list( $value, $keyInfo ) = $this->unwrap( $wrappedValues[$vKey] ?? false, $now );
// Force dependent keys to be seen as stale for a while after purging
// to reduce race conditions involving stale data getting cached
$purgeValues = $purgeValuesForAll;
$lastCKPurge = null; // timestamp of the highest check key
foreach ( $purgeValues as $purge ) {
- $lastCKPurge = max( $purge[self::FLD_TIME], $lastCKPurge );
- $safeTimestamp = $purge[self::FLD_TIME] + $purge[self::FLD_HOLDOFF];
- if ( $value !== false && $safeTimestamp >= $asOf ) {
+ $lastCKPurge = max( $purge[self::PURGE_TIME], $lastCKPurge );
+ $safeTimestamp = $purge[self::PURGE_TIME] + $purge[self::PURGE_HOLDOFF];
+ if ( $value !== false && $safeTimestamp >= $keyInfo['asOf'] ) {
// How long ago this value was invalidated by *this* check key
- $ago = min( $purge[self::FLD_TIME] - $now, self::TINY_NEGATIVE );
+ $ago = min( $purge[self::PURGE_TIME] - $now, self::TINY_NEGATIVE );
// How long ago this value was invalidated by *any* known check key
- $curTTL = min( $curTTL, $ago );
+ $keyInfo['curTTL'] = min( $keyInfo['curTTL'], $ago );
}
}
+ $keyInfo[ 'lastCKPurge'] = $lastCKPurge;
if ( $value !== false ) {
$result[$key] = $value;
}
- if ( $curTTL !== null ) {
- $curTTLs[$key] = $curTTL;
+ if ( $keyInfo['curTTL'] !== null ) {
+ $curTTLs[$key] = $keyInfo['curTTL'];
}
$infoByKey[$key] = ( $info === self::PASS_BY_REF )
- ? [ 'asOf' => $asOf, 'tombAsOf' => $tombAsOf, 'lastCKPurge' => $lastCKPurge ]
- : $asOf; // b/c
+ ? $keyInfo
+ : $keyInfo['asOf']; // b/c
}
$info = $infoByKey;
* @param mixed $value
* @param int $ttl Seconds to live. Special values are:
* - WANObjectCache::TTL_INDEFINITE: Cache forever (default)
+ * - WANObjectCache::TTL_UNCACHEABLE: Do not cache (if the key exists, it is not deleted)
* @param array $opts Options map:
- * - lag: seconds of replica DB lag. Typically, this is either the replica DB lag
+ * - lag: Seconds of replica DB lag. Typically, this is either the replica DB lag
* before the data was read or, if applicable, the replica DB lag before
* the snapshot-isolated transaction the data was read from started.
* Use false to indicate that replication is not running.
* the current time the data was read or (if applicable) the time when
* the snapshot-isolated transaction the data was read from started.
* Default: 0 seconds
- * - pending: whether this data is possibly from an uncommitted write transaction.
+ * - pending: Whether this data is possibly from an uncommitted write transaction.
* Generally, other threads should not see values from the future and
* they certainly should not see ones that ended up getting rolled back.
* Default: false
- * - lockTSE: if excessive replication/snapshot lag is detected, then store the value
+ * - lockTSE: If excessive replication/snapshot lag is detected, then store the value
* with this TTL and flag it as stale. This is only useful if the reads for this key
* use getWithSetCallback() with "lockTSE" set. Note that if "staleTTL" is set
* then it will still add on to this TTL in the excessive lag scenario.
* Default: WANObjectCache::TSE_NONE
- * - staleTTL: seconds to keep the key around if it is stale. The get()/getMulti()
+ * - staleTTL: Seconds to keep the key around if it is stale. The get()/getMulti()
* methods return such stale values with a $curTTL of 0, and getWithSetCallback()
* will call the regeneration callback in such cases, passing in the old value
* and its as-of time to the callback. This is useful if adaptiveTTL() is used
* on the old value's as-of time when it is verified as still being correct.
- * Default: WANObjectCache::STALE_TTL_NONE.
- * - creating: optimize for the case where the key does not already exist.
+ * Default: WANObjectCache::STALE_TTL_NONE
+ * - creating: Optimize for the case where the key does not already exist.
* Default: false
+ * - version: Integer version number signifiying the format of the value.
+ * Default: null
+ * - walltime: How long the value took to generate in seconds. Default: 0.0
* @note Options added in 1.28: staleTTL
* @note Options added in 1.33: creating
+ * @note Options added in 1.34: version, walltime
* @return bool Success
*/
final public function set( $key, $value, $ttl = self::TTL_INDEFINITE, array $opts = [] ) {
$now = $this->getCurrentTime();
+ $lag = $opts['lag'] ?? 0;
+ $age = isset( $opts['since'] ) ? max( 0, $now - $opts['since'] ) : 0;
+ $pending = $opts['pending'] ?? false;
$lockTSE = $opts['lockTSE'] ?? self::TSE_NONE;
$staleTTL = $opts['staleTTL'] ?? self::STALE_TTL_NONE;
- $age = isset( $opts['since'] ) ? max( 0, $now - $opts['since'] ) : 0;
$creating = $opts['creating'] ?? false;
- $lag = $opts['lag'] ?? 0;
+ $version = $opts['version'] ?? null;
+ $walltime = $opts['walltime'] ?? 0.0;
+
+ if ( $ttl < 0 ) {
+ return true;
+ }
// Do not cache potentially uncommitted data as it might get rolled back
- if ( !empty( $opts['pending'] ) ) {
+ if ( $pending ) {
$this->logger->info(
'Rejected set() for {cachekey} due to pending writes.',
[ 'cachekey' => $key ]
}
// Wrap that value with time/TTL/version metadata
- $wrapped = $this->wrap( $value, $logicalTTL ?: $ttl, $now );
+ $wrapped = $this->wrap( $value, $logicalTTL ?: $ttl, $version, $now, $walltime );
$storeTTL = $ttl + $staleTTL;
if ( $creating ) {
foreach ( $rawKeys as $key => $rawKey ) {
$purge = $this->parsePurgeValue( $rawValues[$rawKey] );
if ( $purge !== false ) {
- $time = $purge[self::FLD_TIME];
+ $time = $purge[self::PURGE_TIME];
} else {
// Casting assures identical floats for the next getCheckKeyTime() calls
$now = (string)$this->getCurrentTime();
$version = $opts['version'] ?? null;
$pcTTL = $opts['pcTTL'] ?? self::TTL_UNCACHEABLE;
- // Try the process cache if enabled and the cache callback is not within a cache callback.
- // Process cache use in nested callbacks is not lag-safe with regard to HOLDOFF_TTL since
- // the in-memory value is further lagged than the shared one since it uses a blind TTL.
+ // Use the process cache if requested as long as no outer cache callback is running.
+ // Nested callback process cache use is not lag-safe with regard to HOLDOFF_TTL since
+ // process cached values are more lagged than persistent ones as they are not purged.
if ( $pcTTL >= 0 && $this->callbackDepth == 0 ) {
- $procCache = $this->getProcessCache( $opts['pcGroup'] ?? self::PC_PRIMARY );
- if ( $procCache->has( $key, $pcTTL ) ) {
- return $procCache->get( $key );
+ $pCache = $this->getProcessCache( $opts['pcGroup'] ?? self::PC_PRIMARY );
+ $cached = $pCache->get( $this->getProcessCacheKey( $key, $version ), INF, false );
+ if ( $cached !== false ) {
+ return $cached;
}
} else {
- $procCache = null;
+ $pCache = null;
}
- if ( $version !== null ) {
- $curAsOf = self::PASS_BY_REF;
- $curValue = $this->doGetWithSetCallback(
- $key,
+ $res = $this->fetchOrRegenerate( $key, $ttl, $callback, $opts );
+ list( $value, $valueVersion, $curAsOf ) = $res;
+ if ( $valueVersion !== $version ) {
+ // Current value has a different version; use the variant key for this version.
+ // Regenerate the variant value if it is not newer than the main value at $key
+ // so that purges to the main key propagate to the variant value.
+ list( $value ) = $this->fetchOrRegenerate(
+ $this->makeGlobalKey( 'WANCache-key-variant', md5( $key ), $version ),
$ttl,
- // Wrap the value in an array with version metadata but hide it from $callback
- function ( $oldValue, &$ttl, &$setOpts, $oldAsOf ) use ( $callback, $version ) {
- if ( $this->isVersionedValue( $oldValue, $version ) ) {
- $oldData = $oldValue[self::VFLD_DATA];
- } else {
- // VFLD_DATA is not set if an old, unversioned, key is present
- $oldData = false;
- $oldAsOf = null;
- }
-
- return [
- self::VFLD_DATA => $callback( $oldData, $ttl, $setOpts, $oldAsOf ),
- self::VFLD_VERSION => $version
- ];
- },
- $opts,
- $curAsOf
+ $callback,
+ [ 'version' => null, 'minAsOf' => $curAsOf ] + $opts
);
- if ( $this->isVersionedValue( $curValue, $version ) ) {
- // Current value has the requested version; use it
- $value = $curValue[self::VFLD_DATA];
- } else {
- // Current value has a different version; use the variant key for this version.
- // Regenerate the variant value if it is not newer than the main value at $key
- // so that purges to they key propagate to the variant value.
- $value = $this->doGetWithSetCallback(
- $this->makeGlobalKey( 'WANCache-key-variant', md5( $key ), $version ),
- $ttl,
- $callback,
- [ 'version' => null, 'minAsOf' => $curAsOf ] + $opts
- );
- }
- } else {
- $value = $this->doGetWithSetCallback( $key, $ttl, $callback, $opts );
}
// Update the process cache if enabled
- if ( $procCache && $value !== false ) {
- $procCache->set( $key, $value );
+ if ( $pCache && $value !== false ) {
+ $pCache->set( $this->getProcessCacheKey( $key, $version ), $value );
}
return $value;
* @param int $ttl
* @param callable $callback
* @param array $opts Options map for getWithSetCallback()
- * @param float|null &$asOf Cache generation timestamp of returned value [returned]
- * @return mixed
+ * @return array Ordered list of the following:
+ * - Cached or regenerated value
+ * - Cached or regenerated value version number or null if not versioned
+ * - Timestamp of the cached value or null if there is no value
* @note Callable type hints are not used to avoid class-autoloading
*/
- protected function doGetWithSetCallback( $key, $ttl, $callback, array $opts, &$asOf = null ) {
- $lowTTL = $opts['lowTTL'] ?? min( self::LOW_TTL, $ttl );
- $lockTSE = $opts['lockTSE'] ?? self::TSE_NONE;
- $staleTTL = $opts['staleTTL'] ?? self::STALE_TTL_NONE;
- $graceTTL = $opts['graceTTL'] ?? self::GRACE_TTL_NONE;
+ private function fetchOrRegenerate( $key, $ttl, $callback, array $opts ) {
$checkKeys = $opts['checkKeys'] ?? [];
- $busyValue = $opts['busyValue'] ?? null;
- $popWindow = $opts['hotTTR'] ?? self::HOT_TTR;
- $ageNew = $opts['ageNew'] ?? self::AGE_NEW;
+ $graceTTL = $opts['graceTTL'] ?? self::GRACE_TTL_NONE;
$minAsOf = $opts['minAsOf'] ?? self::MIN_TIMESTAMP_NONE;
+ $hotTTR = $opts['hotTTR'] ?? self::HOT_TTR;
+ $lowTTL = $opts['lowTTL'] ?? min( self::LOW_TTL, $ttl );
+ $ageNew = $opts['ageNew'] ?? self::AGE_NEW;
$touchedCb = $opts['touchedCallback'] ?? null;
$initialTime = $this->getCurrentTime();
$kClass = $this->determineKeyClassForStats( $key );
- // Get the current key value and metadata
+ // Get the current key value and its metadata
$curTTL = self::PASS_BY_REF;
$curInfo = self::PASS_BY_REF; /** @var array $curInfo */
$curValue = $this->get( $key, $curTTL, $checkKeys, $curInfo );
// Apply any $touchedCb invalidation timestamp to get the "last purge timestamp"
list( $curTTL, $LPT ) = $this->resolveCTL( $curValue, $curTTL, $curInfo, $touchedCb );
- // Best possible return value and its corresponding "as of" timestamp
- $value = $curValue;
- $asOf = $curInfo['asOf'];
-
- // Determine if a cached value regeneration is needed or desired
+ // Use the cached value if it exists and is not due for synchronous regeneration
if (
- $this->isValid( $value, $asOf, $minAsOf ) &&
+ $this->isValid( $curValue, $curInfo['asOf'], $minAsOf ) &&
$this->isAliveOrInGracePeriod( $curTTL, $graceTTL )
) {
$preemptiveRefresh = (
$this->worthRefreshExpiring( $curTTL, $lowTTL ) ||
- $this->worthRefreshPopular( $asOf, $ageNew, $popWindow, $initialTime )
+ $this->worthRefreshPopular( $curInfo['asOf'], $ageNew, $hotTTR, $initialTime )
);
-
if ( !$preemptiveRefresh ) {
$this->stats->increment( "wanobjectcache.$kClass.hit.good" );
- return $value;
+ return [ $curValue, $curInfo['version'], $curInfo['asOf'] ];
} elseif ( $this->scheduleAsyncRefresh( $key, $ttl, $callback, $opts ) ) {
$this->stats->increment( "wanobjectcache.$kClass.hit.refresh" );
- return $value;
+ return [ $curValue, $curInfo['version'], $curInfo['asOf'] ];
}
}
+ // Determine if there is stale or volatile cached value that is still usable
$isKeyTombstoned = ( $curInfo['tombAsOf'] !== null );
if ( $isKeyTombstoned ) {
- // Get the interim key value since the key is tombstoned (write-holed)
- list( $value, $asOf ) = $this->getInterimValue( $key, $minAsOf );
+ // Key is write-holed; use the (volatile) interim key as an alternative
+ list( $possValue, $possInfo ) = $this->getInterimValue( $key, $minAsOf );
// Update the "last purge time" since the $touchedCb timestamp depends on $value
- $LPT = $this->resolveTouched( $value, $LPT, $touchedCb );
+ $LPT = $this->resolveTouched( $possValue, $LPT, $touchedCb );
+ } else {
+ $possValue = $curValue;
+ $possInfo = $curInfo;
}
- // Reduce mutex and cache set spam while keys are in the tombstone/holdoff period by
- // checking if $value was genereated by a recent thread much less than a second ago.
+ // Avoid overhead from callback runs, regeneration locks, and cache sets during
+ // hold-off periods for the key by reusing very recently generated cached values
if (
- $this->isValid( $value, $asOf, $minAsOf, $LPT ) &&
- $this->isVolatileValueAgeNegligible( $initialTime - $asOf )
+ $this->isValid( $possValue, $possInfo['asOf'], $minAsOf, $LPT ) &&
+ $this->isVolatileValueAgeNegligible( $initialTime - $possInfo['asOf'] )
) {
$this->stats->increment( "wanobjectcache.$kClass.hit.volatile" );
- return $value;
+ return [ $possValue, $possInfo['version'], $curInfo['asOf'] ];
}
- // Decide if only one thread should handle regeneration at a time
- $useMutex =
+ $lockTSE = $opts['lockTSE'] ?? self::TSE_NONE;
+ $busyValue = $opts['busyValue'] ?? null;
+ $staleTTL = $opts['staleTTL'] ?? self::STALE_TTL_NONE;
+ $version = $opts['version'] ?? null;
+
+ // Determine whether one thread per datacenter should handle regeneration at a time
+ $useRegenerationLock =
// Note that since tombstones no-op set(), $lockTSE and $curTTL cannot be used to
// deduce the key hotness because |$curTTL| will always keep increasing until the
// tombstone expires or is overwritten by a new tombstone. Also, even if $lockTSE
( $curTTL !== null && $curTTL <= 0 && abs( $curTTL ) <= $lockTSE ) ||
// Assume a key is hot if there is no value and a busy fallback is given.
// This avoids stampedes on eviction or preemptive regeneration taking too long.
- ( $busyValue !== null && $value === false );
-
- $hasLock = false;
- if ( $useMutex ) {
- // Attempt to acquire a non-blocking lock specific to the local datacenter
- if ( $this->cache->add( self::MUTEX_KEY_PREFIX . $key, 1, self::LOCK_TTL ) ) {
- // Lock acquired; this thread will recompute the value and update cache
- $hasLock = true;
- } elseif ( $this->isValid( $value, $asOf, $minAsOf ) ) {
- // Not acquired and stale cache value exists; use the stale value
- $this->stats->increment( "wanobjectcache.$kClass.hit.stale" );
-
- return $value;
- } else {
- // Lock not acquired and no stale value exists
- if ( $busyValue !== null ) {
- // Use the busy fallback value if nothing else
+ ( $busyValue !== null && $possValue === false );
+
+ // If a regeneration lock is required, threads that do not get the lock will use any
+ // available stale or volatile value. If there is none, then the cheap/placeholder
+ // value from $busyValue will be used if provided; failing that, all threads will try
+ // to regenerate the value and ignore the lock.
+ if ( $useRegenerationLock ) {
+ $hasLock = $this->cache->add( self::MUTEX_KEY_PREFIX . $key, 1, self::LOCK_TTL );
+ if ( !$hasLock ) {
+ if ( $this->isValid( $possValue, $possInfo['asOf'], $minAsOf ) ) {
+ $this->stats->increment( "wanobjectcache.$kClass.hit.stale" );
+
+ return [ $possValue, $possInfo['version'], $curInfo['asOf'] ];
+ } elseif ( $busyValue !== null ) {
$miss = is_infinite( $minAsOf ) ? 'renew' : 'miss';
$this->stats->increment( "wanobjectcache.$kClass.$miss.busy" );
- return is_callable( $busyValue ) ? $busyValue() : $busyValue;
+ return [
+ is_callable( $busyValue ) ? $busyValue() : $busyValue,
+ $version,
+ $curInfo['asOf']
+ ];
}
}
+ } else {
+ $hasLock = false;
}
- if ( !is_callable( $callback ) ) {
- throw new InvalidArgumentException( "Invalid cache miss callback provided." );
- }
-
- $preCallbackTime = $this->getCurrentTime();
- // Generate the new value from the callback...
+ // Generate the new value given any prior value with a matching version
$setOpts = [];
+ $preCallbackTime = $this->getCurrentTime();
++$this->callbackDepth;
try {
- $value = call_user_func_array( $callback, [ $curValue, &$ttl, &$setOpts, $asOf ] );
+ $value = $callback(
+ ( $curInfo['version'] === $version ) ? $curValue : false,
+ $ttl,
+ $setOpts,
+ ( $curInfo['version'] === $version ) ? $curInfo['asOf'] : null
+ );
} finally {
--$this->callbackDepth;
}
- $valueIsCacheable = ( $value !== false && $ttl >= 0 );
+ $postCallbackTime = $this->getCurrentTime();
- if ( $valueIsCacheable ) {
- $ago = max( $this->getCurrentTime() - $initialTime, 0.0 );
- $this->stats->timing( "wanobjectcache.$kClass.regen_set_delay", 1e3 * $ago );
+ // How long it took to fetch, validate, and generate the value
+ $elapsed = max( $postCallbackTime - $initialTime, 0.0 );
+ // Attempt to save the newly generated value if applicable
+ if (
+ // Callback yielded a cacheable value
+ ( $value !== false && $ttl >= 0 ) &&
+ // Current thread was not raced out of a regeneration lock or key is tombstoned
+ ( !$useRegenerationLock || $hasLock || $isKeyTombstoned ) &&
+ // Key does not appear to be undergoing a set() stampede
+ $this->checkAndSetCooloff( $key, $kClass, $elapsed, $lockTSE, $hasLock )
+ ) {
+ // How long it took to generate the value
+ $walltime = max( $postCallbackTime - $preCallbackTime, 0.0 );
+ // If the key is write-holed then use the (volatile) interim key as an alternative
if ( $isKeyTombstoned ) {
- if ( $this->checkAndSetCooloff( $key, $kClass, $ago, $lockTSE, $hasLock ) ) {
- // Use the interim key value since the key is tombstoned (write-holed)
- $tempTTL = max( self::INTERIM_KEY_TTL, (int)$lockTSE );
- $this->setInterimValue( $key, $value, $tempTTL, $this->getCurrentTime() );
- }
- } elseif ( !$useMutex || $hasLock ) {
- if ( $this->checkAndSetCooloff( $key, $kClass, $ago, $lockTSE, $hasLock ) ) {
- $setOpts['creating'] = ( $curValue === false );
- // Save the value unless a lock-winning thread is already expected to do that
- $setOpts['lockTSE'] = $lockTSE;
- $setOpts['staleTTL'] = $staleTTL;
- // Use best known "since" timestamp if not provided
- $setOpts += [ 'since' => $preCallbackTime ];
- // Update the cache; this will fail if the key is tombstoned
- $this->set( $key, $value, $ttl, $setOpts );
- }
+ $this->setInterimValue( $key, $value, $lockTSE, $version, $walltime );
+ } else {
+ $finalSetOpts = [
+ 'since' => $setOpts['since'] ?? $preCallbackTime,
+ 'version' => $version,
+ 'staleTTL' => $staleTTL,
+ 'lockTSE' => $lockTSE, // informs lag vs performance trade-offs
+ 'creating' => ( $curValue === false ), // optimization
+ 'walltime' => $walltime
+ ] + $setOpts;
+ $this->set( $key, $value, $ttl, $finalSetOpts );
}
}
$miss = is_infinite( $minAsOf ) ? 'renew' : 'miss';
$this->stats->increment( "wanobjectcache.$kClass.$miss.compute" );
- return $value;
+ return [ $value, $version, $curInfo['asOf'] ];
}
/**
* @return bool Whether it is OK to proceed with a key set operation
*/
private function checkAndSetCooloff( $key, $kClass, $elapsed, $lockTSE, $hasLock ) {
+ $this->stats->timing( "wanobjectcache.$kClass.regen_set_delay", 1e3 * $elapsed );
+
// If $lockTSE is set, the lock was bypassed because there was no stale/interim value,
// and $elapsed indicates that regeration is slow, then there is a risk of set()
// stampedes with large blobs. With a typical scale-out infrastructure, CPU and query
* @return array (current time left or null, UNIX timestamp of last purge or null)
* @note Callable type hints are not used to avoid class-autoloading
*/
- protected function resolveCTL( $value, $curTTL, $curInfo, $touchedCallback ) {
+ private function resolveCTL( $value, $curTTL, $curInfo, $touchedCallback ) {
if ( $touchedCallback === null || $value === false ) {
return [ $curTTL, max( $curInfo['tombAsOf'], $curInfo['lastCKPurge'] ) ];
}
- if ( !is_callable( $touchedCallback ) ) {
- throw new InvalidArgumentException( "Invalid expiration callback provided." );
- }
-
$touched = $touchedCallback( $value );
if ( $touched !== null && $touched >= $curInfo['asOf'] ) {
$curTTL = min( $curTTL, self::TINY_NEGATIVE, $curInfo['asOf'] - $touched );
* @return float|null UNIX timestamp of last purge or null
* @note Callable type hints are not used to avoid class-autoloading
*/
- protected function resolveTouched( $value, $lastPurge, $touchedCallback ) {
- if ( $touchedCallback === null || $value === false ) {
- return $lastPurge;
- }
-
- if ( !is_callable( $touchedCallback ) ) {
- throw new InvalidArgumentException( "Invalid expiration callback provided." );
- }
-
- return max( $touchedCallback( $value ), $lastPurge );
+ private function resolveTouched( $value, $lastPurge, $touchedCallback ) {
+ return ( $touchedCallback === null || $value === false )
+ ? $lastPurge // nothing to derive the "touched timestamp" from
+ : max( $touchedCallback( $value ), $lastPurge );
}
/**
* @param string $key
* @param float $minAsOf Minimum acceptable "as of" timestamp
- * @return array (cached value or false, cached value timestamp or null)
+ * @return array (cached value or false, cache key metadata map)
*/
- protected function getInterimValue( $key, $minAsOf ) {
- if ( !$this->useInterimHoldOffCaching ) {
- return [ false, null ]; // disabled
- }
+ private function getInterimValue( $key, $minAsOf ) {
+ $now = $this->getCurrentTime();
+
+ if ( $this->useInterimHoldOffCaching ) {
+ $wrapped = $this->cache->get( self::INTERIM_KEY_PREFIX . $key );
- $wrapped = $this->cache->get( self::INTERIM_KEY_PREFIX . $key );
- list( $value ) = $this->unwrap( $wrapped, $this->getCurrentTime() );
- $valueAsOf = $wrapped[self::FLD_TIME] ?? null;
- if ( $this->isValid( $value, $valueAsOf, $minAsOf ) ) {
- return [ $value, $valueAsOf ];
+ list( $value, $keyInfo ) = $this->unwrap( $wrapped, $now );
+ if ( $this->isValid( $value, $keyInfo['asOf'], $minAsOf ) ) {
+ return [ $value, $keyInfo ];
+ }
}
- return [ false, null ];
+ return $this->unwrap( false, $now );
}
/**
* @param string $key
* @param mixed $value
- * @param int $tempTTL
- * @param float $newAsOf
+ * @param int $ttl
+ * @param int|null $version Value version number
+ * @param float $walltime How long it took to generate the value in seconds
*/
- protected function setInterimValue( $key, $value, $tempTTL, $newAsOf ) {
- $wrapped = $this->wrap( $value, $tempTTL, $newAsOf );
+ private function setInterimValue( $key, $value, $ttl, $version, $walltime ) {
+ $ttl = max( self::INTERIM_KEY_TTL, (int)$ttl );
+ $wrapped = $this->wrap( $value, $ttl, $version, $this->getCurrentTime(), $walltime );
$this->cache->merge(
self::INTERIM_KEY_PREFIX . $key,
function () use ( $wrapped ) {
return $wrapped;
},
- $tempTTL,
+ $ttl,
1
);
}
ArrayIterator $keyedIds, $ttl, callable $callback, array $opts = []
) {
$valueKeys = array_keys( $keyedIds->getArrayCopy() );
- $checkKeys = $opts['checkKeys'] ?? [];
- $pcTTL = $opts['pcTTL'] ?? self::TTL_UNCACHEABLE;
// Load required keys into process cache in one go
$this->warmupCache = $this->getRawKeysForWarmup(
- $this->getNonProcessCachedKeys( $valueKeys, $opts, $pcTTL ),
- $checkKeys
+ $this->getNonProcessCachedKeys( $valueKeys, $opts ),
+ $opts['checkKeys'] ?? []
);
$this->warmupKeyMisses = 0;
$idsByValueKey = $keyedIds->getArrayCopy();
$valueKeys = array_keys( $idsByValueKey );
$checkKeys = $opts['checkKeys'] ?? [];
- $pcTTL = $opts['pcTTL'] ?? self::TTL_UNCACHEABLE;
unset( $opts['lockTSE'] ); // incompatible
unset( $opts['busyValue'] ); // incompatible
// Load required keys into process cache in one go
- $keysGet = $this->getNonProcessCachedKeys( $valueKeys, $opts, $pcTTL );
+ $keysGet = $this->getNonProcessCachedKeys( $valueKeys, $opts );
$this->warmupCache = $this->getRawKeysForWarmup( $keysGet, $checkKeys );
$this->warmupKeyMisses = 0;
*/
final public function reapCheckKey( $key, $purgeTimestamp, &$isStale = false ) {
$purge = $this->parsePurgeValue( $this->cache->get( self::TIME_KEY_PREFIX . $key ) );
- if ( $purge && $purge[self::FLD_TIME] < $purgeTimestamp ) {
+ if ( $purge && $purge[self::PURGE_TIME] < $purgeTimestamp ) {
$isStale = true;
$this->logger->warning( "Reaping stale check key '$key'." );
$ok = $this->cache->changeTTL( self::TIME_KEY_PREFIX . $key, self::TTL_SECOND );
* This must set the key to "PURGED:<UNIX timestamp>:<holdoff>"
*
* @param string $key Cache key
- * @param int $ttl How long to keep the tombstone [seconds]
+ * @param int $ttl Seconds to keep the tombstone around
* @param int $holdoff HOLDOFF_* constant controlling how long to ignore sets for this key
* @return bool Success
*/
/**
* @param string $key
- * @param int $ttl
+ * @param int $ttl Seconds to live
* @param callable $callback
* @param array $opts
* @return bool Success
+ * @note Callable type hints are not used to avoid class-autoloading
*/
private function scheduleAsyncRefresh( $key, $ttl, $callback, $opts ) {
if ( !$this->asyncHandler ) {
$func = $this->asyncHandler;
$func( function () use ( $key, $ttl, $callback, $opts ) {
$opts['minAsOf'] = INF; // force a refresh
- $this->doGetWithSetCallback( $key, $ttl, $callback, $opts );
+ $this->fetchOrRegenerate( $key, $ttl, $callback, $opts );
} );
return true;
* @param int $graceTTL Consider using stale values if $curTTL is greater than this
* @return bool
*/
- protected function isAliveOrInGracePeriod( $curTTL, $graceTTL ) {
+ private function isAliveOrInGracePeriod( $curTTL, $graceTTL ) {
if ( $curTTL > 0 ) {
return true;
} elseif ( $graceTTL <= 0 ) {
}
/**
- * Do not use this method outside WANObjectCache
- *
* @param mixed $value
- * @param int $ttl [0=forever]
+ * @param int $ttl Seconds to live or zero for "indefinite"
+ * @param int|null $version Value version number or null if not versioned
* @param float $now Unix Current timestamp just before calling set()
+ * @param float $walltime How long it took to generate the value in seconds
* @return array
*/
- protected function wrap( $value, $ttl, $now ) {
- return [
- self::FLD_VERSION => self::VERSION,
+ private function wrap( $value, $ttl, $version, $now, $walltime ) {
+ // Returns keys in ascending integer order for PHP7 array packing:
+ // https://nikic.github.io/2014/12/22/PHPs-new-hashtable-implementation.html
+ $wrapped = [
+ self::FLD_FORMAT_VERSION => self::VERSION,
self::FLD_VALUE => $value,
self::FLD_TTL => $ttl,
self::FLD_TIME => $now
];
+ if ( $version !== null ) {
+ $wrapped[self::FLD_VALUE_VERSION] = $version;
+ }
+ if ( $walltime >= self::GENERATION_SLOW_SEC ) {
+ $wrapped[self::FLD_GENERATION_TIME] = $walltime;
+ }
+
+ return $wrapped;
}
/**
- * Do not use this method outside WANObjectCache
- *
- * The cached value will be false if absent/tombstoned/malformed
- *
- * @param array|string|bool $wrapped
+ * @param array|string|bool $wrapped The entry at a cache key
* @param float $now Unix Current timestamp (preferrably pre-query)
- * @return array (cached value or false, current TTL, value timestamp, tombstone timestamp)
+ * @return array (value or false if absent/tombstoned/malformed, value metadata map).
+ * The cache key metadata includes the following metadata:
+ * - asOf: UNIX timestamp of the value or null if there is no value
+ * - curTTL: remaining time-to-live (negative if tombstoned) or null if there is no value
+ * - version: value version number or null if the if there is no value
+ * - tombAsOf: UNIX timestamp of the tombstone or null if there is no tombstone
*/
- protected function unwrap( $wrapped, $now ) {
- // Check if the value is a tombstone
- $purge = $this->parsePurgeValue( $wrapped );
- if ( $purge !== false ) {
- // Purged values should always have a negative current $ttl
- $curTTL = min( $purge[self::FLD_TIME] - $now, self::TINY_NEGATIVE );
- return [ false, $curTTL, null, $purge[self::FLD_TIME] ];
- }
-
- if ( !is_array( $wrapped ) // not found
- || !isset( $wrapped[self::FLD_VERSION] ) // wrong format
- || $wrapped[self::FLD_VERSION] !== self::VERSION // wrong version
- ) {
- return [ false, null, null, null ];
- }
-
- if ( $wrapped[self::FLD_TTL] > 0 ) {
- // Get the approximate time left on the key
- $age = $now - $wrapped[self::FLD_TIME];
- $curTTL = max( $wrapped[self::FLD_TTL] - $age, 0.0 );
+ private function unwrap( $wrapped, $now ) {
+ $value = false;
+ $info = [ 'asOf' => null, 'curTTL' => null, 'version' => null, 'tombAsOf' => null ];
+
+ if ( is_array( $wrapped ) ) {
+ // Entry expected to be a cached value; validate it
+ if (
+ ( $wrapped[self::FLD_FORMAT_VERSION] ?? null ) === self::VERSION &&
+ $wrapped[self::FLD_TIME] >= $this->epoch
+ ) {
+ if ( $wrapped[self::FLD_TTL] > 0 ) {
+ // Get the approximate time left on the key
+ $age = $now - $wrapped[self::FLD_TIME];
+ $curTTL = max( $wrapped[self::FLD_TTL] - $age, 0.0 );
+ } else {
+ // Key had no TTL, so the time left is unbounded
+ $curTTL = INF;
+ }
+ $value = $wrapped[self::FLD_VALUE];
+ $info['version'] = $wrapped[self::FLD_VALUE_VERSION] ?? null;
+ $info['asOf'] = $wrapped[self::FLD_TIME];
+ $info['curTTL'] = $curTTL;
+ }
} else {
- // Key had no TTL, so the time left is unbounded
- $curTTL = INF;
- }
-
- if ( $wrapped[self::FLD_TIME] < $this->epoch ) {
- // Values this old are ignored
- return [ false, null, null, null ];
+ // Entry expected to be a tombstone; parse it
+ $purge = $this->parsePurgeValue( $wrapped );
+ if ( $purge !== false ) {
+ // Tombstoned keys should always have a negative current $ttl
+ $info['curTTL'] = min( $purge[self::PURGE_TIME] - $now, self::TINY_NEGATIVE );
+ $info['tombAsOf'] = $purge[self::PURGE_TIME];
+ }
}
- return [ $wrapped[self::FLD_VALUE], $curTTL, $wrapped[self::FLD_TIME], null ];
+ return [ $value, $info ];
}
/**
* @param string $key String of the format <scope>:<class>[:<class or variable>]...
* @return string A collection name to describe this class of key
*/
- protected function determineKeyClassForStats( $key ) {
+ private function determineKeyClassForStats( $key ) {
$parts = explode( ':', $key, 3 );
return $parts[1] ?? $parts[0]; // sanity
* @return array|bool Array containing a UNIX timestamp (float) and holdoff period (integer),
* or false if value isn't a valid purge value
*/
- protected function parsePurgeValue( $value ) {
+ private function parsePurgeValue( $value ) {
if ( !is_string( $value ) ) {
return false;
}
}
return [
- self::FLD_TIME => (float)$segments[1],
- self::FLD_HOLDOFF => (int)$segments[2],
+ self::PURGE_TIME => (float)$segments[1],
+ self::PURGE_HOLDOFF => (int)$segments[2],
];
}
* @param int $holdoff In seconds
* @return string Wrapped purge value
*/
- protected function makePurgeValue( $timestamp, $holdoff ) {
+ private function makePurgeValue( $timestamp, $holdoff ) {
return self::PURGE_VAL_PREFIX . (float)$timestamp . ':' . (int)$holdoff;
}
- /**
- * @param mixed $value
- * @param int $version
- * @return bool
- */
- protected function isVersionedValue( $value, $version ) {
- return (
- is_array( $value ) &&
- array_key_exists( self::VFLD_DATA, $value ) &&
- array_key_exists( self::VFLD_VERSION, $value ) &&
- $value[self::VFLD_VERSION] === $version
- );
- }
-
/**
* @param string $group
* @return MapCacheLRU
*/
- protected function getProcessCache( $group ) {
+ private function getProcessCache( $group ) {
if ( !isset( $this->processCaches[$group] ) ) {
- list( , $n ) = explode( ':', $group );
- $this->processCaches[$group] = new MapCacheLRU( (int)$n );
+ list( , $size ) = explode( ':', $group );
+ $this->processCaches[$group] = new MapCacheLRU( (int)$size );
}
return $this->processCaches[$group];
}
+ /**
+ * @param string $key
+ * @param int $version
+ * @return string
+ */
+ private function getProcessCacheKey( $key, $version ) {
+ return $key . ' ' . (int)$version;
+ }
+
/**
* @param array $keys
* @param array $opts
- * @param int $pcTTL
- * @return array List of keys
+ * @return string[] List of keys
*/
- private function getNonProcessCachedKeys( array $keys, array $opts, $pcTTL ) {
+ private function getNonProcessCachedKeys( array $keys, array $opts ) {
+ $pcTTL = $opts['pcTTL'] ?? self::TTL_UNCACHEABLE;
+
$keysFound = [];
- if ( isset( $opts['pcTTL'] ) && $opts['pcTTL'] > 0 && $this->callbackDepth == 0 ) {
- $pcGroup = $opts['pcGroup'] ?? self::PC_PRIMARY;
- $procCache = $this->getProcessCache( $pcGroup );
+ if ( $pcTTL > 0 && $this->callbackDepth == 0 ) {
+ $version = $opts['version'] ?? null;
+ $pCache = $this->getProcessCache( $opts['pcGroup'] ?? self::PC_PRIMARY );
foreach ( $keys as $key ) {
- if ( $procCache->has( $key, $pcTTL ) ) {
+ if ( $pCache->has( $this->getProcessCacheKey( $key, $version ), $pcTTL ) ) {
$keysFound[] = $key;
}
}
$masterName = $lb->getServerName( $lb->getWriterIndex() );
if ( $lb->hasStreamingReplicaServers() ) {
- $pos = $lb->getMasterPos();
+ $pos = $lb->getReplicaResumePos();
if ( $pos ) {
$this->logger->debug( __METHOD__ . ": LB for '$masterName' has pos $pos\n" );
$this->shutdownPositions[$masterName] = $pos;
use Psr\Log\NullLogger;
use Wikimedia\ScopedCallback;
use Wikimedia\Timestamp\ConvertibleTimestamp;
-use Wikimedia;
+use Wikimedia\AtEase\AtEase;
use BagOStuff;
use HashBagOStuff;
use LogicException;
/** @var int Writes to this temporary table effect lastDoneWrites() */
private static $TEMP_PSEUDO_PERMANENT = 2;
- /** Number of times to re-try an operation in case of deadlock */
+ /** @var int Number of times to re-try an operation in case of deadlock */
private static $DEADLOCK_TRIES = 4;
- /** Minimum time to wait before retry, in microseconds */
+ /** @var int Minimum time to wait before retry, in microseconds */
private static $DEADLOCK_DELAY_MIN = 500000;
- /** Maximum time to wait before retry */
+ /** @var int Maximum time to wait before retry */
private static $DEADLOCK_DELAY_MAX = 1500000;
- /** How long before it is worth doing a dummy query to test the connection */
+ /** @var int How long before it is worth doing a dummy query to test the connection */
private static $PING_TTL = 1.0;
+ /** @var string Dummy SQL query */
private static $PING_QUERY = 'SELECT 1 AS ping';
+ /** @var float Guess of how many seconds it takes to replicate a small insert */
private static $TINY_WRITE_SEC = 0.010;
+ /** @var float Consider a write slow if it took more than this many seconds */
private static $SLOW_WRITE_SEC = 0.500;
+ /** @var float Assume an insert of this many rows or less should be fast to replicate */
private static $SMALL_WRITE_ROWS = 100;
/**
/**
* Open a new connection to the database (closing any existing one)
*
- * @param string $server Database server host
- * @param string $user Database user name
- * @param string $password Database user password
- * @param string $dbName Database name
+ * @param string|null $server Database server host
+ * @param string|null $user Database user name
+ * @param string|null $password Database user password
+ * @param string|null $dbName Database name
* @param string|null $schema Database schema name
* @param string $tablePrefix Table prefix
* @throws DBConnectionError
*
* This also connects to the database immediately upon object construction
*
- * @param string $dbType A possible DB type (sqlite, mysql, postgres,...)
- * @param array $p Parameter map with keys:
+ * @param string $type A possible DB type (sqlite, mysql, postgres,...)
+ * @param array $params Parameter map with keys:
* - host : The hostname of the DB server
* - user : The name of the database user the client operates under
* - password : The password for the database user
* @throws InvalidArgumentException If the database driver or extension cannot be found
* @since 1.18
*/
- final public static function factory( $dbType, $p = [], $connect = self::NEW_CONNECTED ) {
- $class = self::getClass( $dbType, $p['driver'] ?? null );
+ final public static function factory( $type, $params = [], $connect = self::NEW_CONNECTED ) {
+ $class = self::getClass( $type, $params['driver'] ?? null );
if ( class_exists( $class ) && is_subclass_of( $class, IDatabase::class ) ) {
- // Resolve some defaults for b/c
- $p['host'] = $p['host'] ?? false;
- $p['user'] = $p['user'] ?? false;
- $p['password'] = $p['password'] ?? false;
- $p['dbname'] = $p['dbname'] ?? false;
- $p['flags'] = $p['flags'] ?? 0;
- $p['variables'] = $p['variables'] ?? [];
- $p['tablePrefix'] = $p['tablePrefix'] ?? '';
- $p['schema'] = $p['schema'] ?? null;
- $p['cliMode'] = $p['cliMode'] ?? ( PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg' );
- $p['agent'] = $p['agent'] ?? '';
- if ( !isset( $p['connLogger'] ) ) {
- $p['connLogger'] = new NullLogger();
- }
- if ( !isset( $p['queryLogger'] ) ) {
- $p['queryLogger'] = new NullLogger();
- }
- $p['profiler'] = $p['profiler'] ?? null;
- if ( !isset( $p['trxProfiler'] ) ) {
- $p['trxProfiler'] = new TransactionProfiler();
- }
- if ( !isset( $p['errorLogger'] ) ) {
- $p['errorLogger'] = function ( Exception $e ) {
+ $params += [
+ 'host' => null,
+ 'user' => null,
+ 'password' => null,
+ 'dbname' => null,
+ 'schema' => null,
+ 'tablePrefix' => '',
+ 'flags' => 0,
+ 'variables' => [],
+ 'cliMode' => ( PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg' ),
+ 'agent' => basename( $_SERVER['SCRIPT_NAME'] ) . '@' . gethostname()
+ ];
+
+ $normalizedParams = [
+ // Configuration
+ 'host' => strlen( $params['host'] ) ? $params['host'] : null,
+ 'user' => strlen( $params['user'] ) ? $params['user'] : null,
+ 'password' => is_string( $params['password'] ) ? $params['password'] : null,
+ 'dbname' => strlen( $params['dbname'] ) ? $params['dbname'] : null,
+ 'schema' => strlen( $params['schema'] ) ? $params['schema'] : null,
+ 'tablePrefix' => (string)$params['tablePrefix'],
+ 'flags' => (int)$params['flags'],
+ 'variables' => $params['variables'],
+ 'cliMode' => (bool)$params['cliMode'],
+ 'agent' => (string)$params['agent'],
+ // Objects and callbacks
+ 'profiler' => $params['profiler'] ?? null,
+ 'trxProfiler' => $params['trxProfiler'] ?? new TransactionProfiler(),
+ 'connLogger' => $params['connLogger'] ?? new NullLogger(),
+ 'queryLogger' => $params['queryLogger'] ?? new NullLogger(),
+ 'errorLogger' => $params['errorLogger'] ?? function ( Exception $e ) {
trigger_error( get_class( $e ) . ': ' . $e->getMessage(), E_USER_WARNING );
- };
- }
- if ( !isset( $p['deprecationLogger'] ) ) {
- $p['deprecationLogger'] = function ( $msg ) {
+ },
+ 'deprecationLogger' => $params['deprecationLogger'] ?? function ( $msg ) {
trigger_error( $msg, E_USER_DEPRECATED );
- };
- }
+ }
+ ] + $params;
/** @var Database $conn */
- $conn = new $class( $p );
- if ( $connect == self::NEW_CONNECTED ) {
+ $conn = new $class( $normalizedParams );
+ if ( $connect === self::NEW_CONNECTED ) {
$conn->initConnection();
}
} else {
$fname = false,
callable $inputCallback = null
) {
- Wikimedia\suppressWarnings();
+ AtEase::suppressWarnings();
$fp = fopen( $filename, 'r' );
- Wikimedia\restoreWarnings();
+ AtEase::restoreWarnings();
if ( $fp === false ) {
throw new RuntimeException( "Could not open \"{$filename}\"" );
if ( $this->conn ) {
// Avoid connection leaks for sanity. Normally, resources close at script completion.
// The connection might already be closed in zend/hhvm by now, so suppress warnings.
- Wikimedia\suppressWarnings();
+ AtEase::suppressWarnings();
$this->closeConnection();
- Wikimedia\restoreWarnings();
- $this->conn = false;
+ AtEase::restoreWarnings();
+ $this->conn = null;
}
}
}
protected function doSelectDomain( DatabaseDomain $domain ) {
if ( $domain->getSchema() !== null ) {
- throw new DBExpectedError( $this, __CLASS__ . ": domain schemas are not supported." );
+ throw new DBExpectedError(
+ $this,
+ __CLASS__ . ": domain '{$domain->getId()}' has a schema component"
+ );
}
$database = $domain->getDatabase();
use DateTime;
use DateTimeZone;
-use Wikimedia;
+use Wikimedia\AtEase\AtEase;
use InvalidArgumentException;
use Exception;
use RuntimeException;
* - sslCiphers : array list of allowable ciphers [default: null]
* @param array $params
*/
- function __construct( array $params ) {
+ public function __construct( array $params ) {
$this->lagDetectionMethod = $params['lagDetectionMethod'] ?? 'Seconds_Behind_Master';
$this->lagDetectionOptions = $params['lagDetectionOptions'] ?? [];
$this->useGTIDs = !empty( $params['useGTIDs' ] );
$this->close();
if ( $schema !== null ) {
- throw new DBExpectedError( $this, __CLASS__ . ": domain schemas are not supported." );
+ throw new DBExpectedError( $this, __CLASS__ . ": cannot use schemas ('$schema')" );
}
$this->server = $server;
protected function doSelectDomain( DatabaseDomain $domain ) {
if ( $domain->getSchema() !== null ) {
- throw new DBExpectedError( $this, __CLASS__ . ": domain schemas are not supported." );
+ throw new DBExpectedError(
+ $this,
+ __CLASS__ . ": domain '{$domain->getId()}' has a schema component"
+ );
}
$database = $domain->getDatabase();
* @throws DBUnexpectedError
*/
public function freeResult( $res ) {
- Wikimedia\suppressWarnings();
+ AtEase::suppressWarnings();
$ok = $this->mysqlFreeResult( ResultWrapper::unwrap( $res ) );
- Wikimedia\restoreWarnings();
+ AtEase::restoreWarnings();
if ( !$ok ) {
throw new DBUnexpectedError( $this, "Unable to free MySQL result" );
}
* @throws DBUnexpectedError
*/
public function fetchObject( $res ) {
- Wikimedia\suppressWarnings();
+ AtEase::suppressWarnings();
$row = $this->mysqlFetchObject( ResultWrapper::unwrap( $res ) );
- Wikimedia\restoreWarnings();
+ AtEase::restoreWarnings();
$errno = $this->lastErrno();
// Unfortunately, mysql_fetch_object does not reset the last errno.
* @throws DBUnexpectedError
*/
public function fetchRow( $res ) {
- Wikimedia\suppressWarnings();
+ AtEase::suppressWarnings();
$row = $this->mysqlFetchArray( ResultWrapper::unwrap( $res ) );
- Wikimedia\restoreWarnings();
+ AtEase::restoreWarnings();
$errno = $this->lastErrno();
// Unfortunately, mysql_fetch_array does not reset the last errno.
if ( is_bool( $res ) ) {
$n = 0;
} else {
- Wikimedia\suppressWarnings();
+ AtEase::suppressWarnings();
$n = $this->mysqlNumRows( ResultWrapper::unwrap( $res ) );
- Wikimedia\restoreWarnings();
+ AtEase::restoreWarnings();
}
// Unfortunately, mysql_num_rows does not reset the last errno.
public function lastError() {
if ( $this->conn ) {
# Even if it's non-zero, it can still be invalid
- Wikimedia\suppressWarnings();
+ AtEase::suppressWarnings();
$error = $this->mysqlError( $this->conn );
if ( !$error ) {
$error = $this->mysqlError();
}
- Wikimedia\restoreWarnings();
+ AtEase::restoreWarnings();
} else {
$error = $this->mysqlError();
}
use Wikimedia\Timestamp\ConvertibleTimestamp;
use Wikimedia\WaitConditionLoop;
-use Wikimedia;
+use Wikimedia\AtEase\AtEase;
use Exception;
/**
);
}
+ $this->close();
+
$this->server = $server;
$this->user = $user;
$this->password = $password;
}
$this->connectString = $this->makeConnectionString( $connectVars );
- $this->close();
- $this->installErrorHandler();
+ $this->installErrorHandler();
try {
// Use new connections to let LoadBalancer/LBFactory handle reuse
$this->conn = pg_connect( $this->connectString, PGSQL_CONNECT_FORCE_NEW );
$this->restoreErrorHandler();
throw $ex;
}
-
$phpError = $this->restoreErrorHandler();
if ( !$this->conn ) {
}
public function freeResult( $res ) {
- Wikimedia\suppressWarnings();
+ AtEase::suppressWarnings();
$ok = pg_free_result( ResultWrapper::unwrap( $res ) );
- Wikimedia\restoreWarnings();
+ AtEase::restoreWarnings();
if ( !$ok ) {
throw new DBUnexpectedError( $this, "Unable to free Postgres result\n" );
}
}
public function fetchObject( $res ) {
- Wikimedia\suppressWarnings();
+ AtEase::suppressWarnings();
$row = pg_fetch_object( ResultWrapper::unwrap( $res ) );
- Wikimedia\restoreWarnings();
+ AtEase::restoreWarnings();
# @todo FIXME: HACK HACK HACK HACK debug
# @todo hashar: not sure if the following test really trigger if the object
}
public function fetchRow( $res ) {
- Wikimedia\suppressWarnings();
+ AtEase::suppressWarnings();
$row = pg_fetch_array( ResultWrapper::unwrap( $res ) );
- Wikimedia\restoreWarnings();
+ AtEase::restoreWarnings();
$conn = $this->getBindingHandle();
if ( pg_last_error( $conn ) ) {
return 0;
}
- Wikimedia\suppressWarnings();
+ AtEase::suppressWarnings();
$n = pg_num_rows( ResultWrapper::unwrap( $res ) );
- Wikimedia\restoreWarnings();
+ AtEase::restoreWarnings();
$conn = $this->getBindingHandle();
if ( pg_last_error( $conn ) ) {
}
/**
+ * @param string $prefix Only show tables with this prefix, e.g. mw_
+ * @param string $fname Calling function name
+ * @return string[]
* @suppress SecurityCheck-SQLInjection array_map not recognized T204911
*/
- public function listTables( $prefix = null, $fname = __METHOD__ ) {
+ public function listTables( $prefix = '', $fname = __METHOD__ ) {
$eschemas = implode( ',', array_map( [ $this, 'addQuotes' ], $this->getCoreSchemas() ) );
$result = $this->query(
"SELECT DISTINCT tablename FROM pg_tables WHERE schemaname IN ($eschemas)", $fname );
foreach ( $result as $table ) {
$vars = get_object_vars( $table );
$table = array_pop( $vars );
- if ( !$prefix || strpos( $table, $prefix ) === 0 ) {
+ if ( $prefix == '' || strpos( $table, $prefix ) === 0 ) {
$endArray[] = $table;
}
}
// See https://www.postgresql.org/docs/8.3/sql-set.html
throw new DBUnexpectedError(
$this,
- __METHOD__ . ": a transaction is currently active."
+ __METHOD__ . ": a transaction is currently active"
);
}
use Exception;
use LockManager;
use FSLockManager;
-use InvalidArgumentException;
use RuntimeException;
use stdClass;
* @ingroup Database
*/
class DatabaseSqlite extends Database {
- /** @var bool Whether full text is enabled */
- private static $fulltextEnabled = null;
-
- /** @var string|null Directory */
+ /** @var string|null Directory for SQLite database files listed under their DB name */
protected $dbDir;
- /** @var string File name for SQLite database file */
+ /** @var string|null Explicit path for the SQLite database file */
protected $dbPath;
/** @var string Transaction mode */
protected $trxMode;
/** @var array List of shared database already attached to this connection */
private $alreadyAttached = [];
+ /** @var bool Whether full text is enabled */
+ private static $fulltextEnabled = null;
+
/**
* Additional params include:
* - dbDirectory : directory containing the DB and the lock file directory
- * [defaults to $wgSQLiteDataDir]
* - dbFilePath : use this to force the path of the DB file
* - trxMode : one of (deferred, immediate, exclusive)
* @param array $p
*/
- function __construct( array $p ) {
+ public function __construct( array $p ) {
if ( isset( $p['dbFilePath'] ) ) {
$this->dbPath = $p['dbFilePath'];
- $lockDomain = md5( $this->dbPath );
- // Use "X" for things like X.sqlite and ":memory:" for RAM-only DBs
- if ( !isset( $p['dbname'] ) || !strlen( $p['dbname'] ) ) {
- $p['dbname'] = preg_replace( '/\.sqlite\d?$/', '', basename( $this->dbPath ) );
+ if ( !strlen( $p['dbname'] ) ) {
+ $p['dbname'] = self::generateDatabaseName( $this->dbPath );
}
} elseif ( isset( $p['dbDirectory'] ) ) {
$this->dbDir = $p['dbDirectory'];
- $lockDomain = $p['dbname'];
- } else {
- throw new InvalidArgumentException( "Need 'dbDirectory' or 'dbFilePath' parameter." );
}
- $this->trxMode = isset( $p['trxMode'] ) ? strtoupper( $p['trxMode'] ) : null;
- if ( $this->trxMode &&
- !in_array( $this->trxMode, [ 'DEFERRED', 'IMMEDIATE', 'EXCLUSIVE' ] )
- ) {
- $this->trxMode = null;
- $this->queryLogger->warning( "Invalid SQLite transaction mode provided." );
- }
+ // Set a dummy user to make initConnection() trigger open()
+ parent::__construct( [ 'user' => '@' ] + $p );
- if ( $this->hasProcessMemoryPath() ) {
- $this->lockMgr = new NullLockManager( [ 'domain' => $lockDomain ] );
- } else {
+ $this->trxMode = strtoupper( $p['trxMode'] ?? '' );
+
+ $lockDirectory = $this->getLockFileDirectory();
+ if ( $lockDirectory !== null ) {
$this->lockMgr = new FSLockManager( [
- 'domain' => $lockDomain,
- 'lockDirectory' => is_string( $this->dbDir )
- ? "{$this->dbDir}/locks"
- : dirname( $this->dbPath ) . "/locks"
+ 'domain' => $this->getDomainID(),
+ 'lockDirectory' => $lockDirectory
] );
+ } else {
+ $this->lockMgr = new NullLockManager( [ 'domain' => $this->getDomainID() ] );
}
-
- parent::__construct( $p );
}
protected static function getAttributes() {
return $db;
}
- protected function doInitConnection() {
- if ( $this->dbPath !== null ) {
- // Standalone .sqlite file mode.
- $this->openFile(
- $this->dbPath,
- $this->connectionParams['dbname'],
- $this->connectionParams['tablePrefix']
- );
- } elseif ( $this->dbDir !== null ) {
- // Stock wiki mode using standard file names per DB
- if ( strlen( $this->connectionParams['dbname'] ) ) {
- $this->open(
- $this->connectionParams['host'],
- $this->connectionParams['user'],
- $this->connectionParams['password'],
- $this->connectionParams['dbname'],
- $this->connectionParams['schema'],
- $this->connectionParams['tablePrefix']
- );
- } else {
- // Caller will manually call open() later?
- $this->connLogger->debug( __METHOD__ . ': no database opened.' );
- }
- } else {
- throw new InvalidArgumentException( "Need 'dbDirectory' or 'dbFilePath' parameter." );
- }
- }
-
/**
* @return string
*/
- function getType() {
+ public function getType() {
return 'sqlite';
}
*
* @return bool
*/
- function implicitGroupby() {
+ public function implicitGroupby() {
return false;
}
protected function open( $server, $user, $pass, $dbName, $schema, $tablePrefix ) {
$this->close();
+ // Note that for SQLite, $server, $user, and $pass are ignored
+
if ( $schema !== null ) {
- throw new DBExpectedError( $this, __CLASS__ . ": domain schemas are not supported." );
+ throw new DBExpectedError( $this, __CLASS__ . ": cannot use schemas ('$schema')" );
}
- // Only $dbName is used, the other parameters are irrelevant for SQLite databases
- $this->openFile( self::generateFileName( $this->dbDir, $dbName ), $dbName, $tablePrefix );
- }
+ if ( $this->dbPath !== null ) {
+ $path = $this->dbPath;
+ } elseif ( $this->dbDir !== null ) {
+ $path = self::generateFileName( $this->dbDir, $dbName );
+ } else {
+ throw new DBExpectedError( $this, __CLASS__ . ": DB path or directory required" );
+ }
- /**
- * Opens a database file
- *
- * @param string $fileName
- * @param string $dbName
- * @param string $tablePrefix
- * @throws DBConnectionError
- */
- protected function openFile( $fileName, $dbName, $tablePrefix ) {
- if ( !$this->hasProcessMemoryPath() && !is_readable( $fileName ) ) {
+ if ( !in_array( $this->trxMode, [ '', 'DEFERRED', 'IMMEDIATE', 'EXCLUSIVE' ], true ) ) {
+ throw new DBExpectedError(
+ $this,
+ __CLASS__ . ": invalid transaction mode '{$this->trxMode}'"
+ );
+ }
+
+ if ( !self::isProcessMemoryPath( $path ) && !is_readable( $path ) ) {
$error = "SQLite database file not readable";
$this->connLogger->error(
"Error connecting to {db_server}: {error}",
throw new DBConnectionError( $this, $error );
}
- $this->dbPath = $fileName;
try {
- $this->conn = new PDO(
- "sqlite:$fileName",
+ $conn = new PDO(
+ "sqlite:$path",
'',
'',
[ PDO::ATTR_PERSISTENT => (bool)( $this->flags & self::DBO_PERSISTENT ) ]
);
- $error = 'unknown error';
+ // Set error codes only, don't raise exceptions
+ $conn->setAttribute( PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT );
} catch ( PDOException $e ) {
$error = $e->getMessage();
- }
-
- if ( !$this->conn ) {
$this->connLogger->error(
"Error connecting to {db_server}: {error}",
$this->getLogContext( [ 'method' => __METHOD__, 'error' => $error ] )
throw new DBConnectionError( $this, $error );
}
- try {
- // Set error codes only, don't raise exceptions
- $this->conn->setAttribute( PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT );
-
- $this->currentDomain = new DatabaseDomain( $dbName, null, $tablePrefix );
+ $this->conn = $conn;
+ $this->currentDomain = new DatabaseDomain( $dbName, null, $tablePrefix );
+ try {
$flags = self::QUERY_IGNORE_DBO_TRX | self::QUERY_NO_RETRY;
// Enforce LIKE to be case sensitive, just like MySQL
$this->query( 'PRAGMA case_sensitive_like = 1', __METHOD__, $flags );
// Apply an optimizations or requirements regarding fsync() usage
$sync = $this->connectionVariables['synchronous'] ?? null;
if ( in_array( $sync, [ 'EXTRA', 'FULL', 'NORMAL', 'OFF' ], true ) ) {
- $this->query( "PRAGMA synchronous = $sync", __METHOD__ );
+ $this->query( "PRAGMA synchronous = $sync", __METHOD__, $flags );
}
} catch ( Exception $e ) {
// Connection was not fully initialized and is not safe for use
}
/**
- * @return string SQLite DB file path
+ * @return string|null SQLite DB file path
+ * @throws DBUnexpectedError
* @since 1.25
*/
public function getDbFilePath() {
- return $this->dbPath;
+ return $this->dbPath ?? self::generateFileName( $this->dbDir, $this->getDBname() );
+ }
+
+ /**
+ * @return string|null Lock file directory
+ */
+ public function getLockFileDirectory() {
+ if ( $this->dbPath !== null && !self::isProcessMemoryPath( $this->dbPath ) ) {
+ return dirname( $this->dbPath ) . '/locks';
+ } elseif ( $this->dbDir !== null && !self::isProcessMemoryPath( $this->dbDir ) ) {
+ return $this->dbDir . '/locks';
+ }
+
+ return null;
}
/**
/**
* Generates a database file name. Explicitly public for installer.
* @param string $dir Directory where database resides
- * @param string $dbName Database name
+ * @param string|bool $dbName Database name (or false from Database::factory, validated here)
* @return string
+ * @throws DBUnexpectedError
*/
public static function generateFileName( $dir, $dbName ) {
+ if ( $dir == '' ) {
+ throw new DBUnexpectedError( null, __CLASS__ . ": no DB directory specified" );
+ } elseif ( self::isProcessMemoryPath( $dir ) ) {
+ throw new DBUnexpectedError(
+ null,
+ __CLASS__ . ": cannot use process memory directory '$dir'"
+ );
+ } elseif ( !strlen( $dbName ) ) {
+ throw new DBUnexpectedError( null, __CLASS__ . ": no DB name specified" );
+ }
+
return "$dir/$dbName.sqlite";
}
+ /**
+ * @param string $path
+ * @return string
+ */
+ private static function generateDatabaseName( $path ) {
+ if ( preg_match( '/^(:memory:$|file::memory:)/', $path ) ) {
+ // E.g. "file::memory:?cache=shared" => ":memory":
+ return ':memory:';
+ } elseif ( preg_match( '/^file::([^?]+)\?mode=memory(&|$)/', $path, $m ) ) {
+ // E.g. "file:memdb1?mode=memory" => ":memdb1:"
+ return ":{$m[1]}:";
+ } else {
+ // E.g. "/home/.../some_db.sqlite3" => "some_db"
+ return preg_replace( '/\.sqlite\d?$/', '', basename( $path ) );
+ }
+ }
+
+ /**
+ * @param string $path
+ * @return bool
+ */
+ private static function isProcessMemoryPath( $path ) {
+ return preg_match( '/^(:memory:$|file:(:memory:|[^?]+\?mode=memory(&|$)))/', $path );
+ }
+
/**
* Check if the searchindext table is FTS enabled.
* @return bool False if not enabled.
* @param string $fname Calling function name
* @return IResultWrapper
*/
- function attachDatabase( $name, $file = false, $fname = __METHOD__ ) {
- if ( !$file ) {
- $file = self::generateFileName( $this->dbDir, $name );
- }
- $file = $this->addQuotes( $file );
+ public function attachDatabase( $name, $file = false, $fname = __METHOD__ ) {
+ $file = is_string( $file ) ? $file : self::generateFileName( $this->dbDir, $name );
+ $encFile = $this->addQuotes( $file );
- return $this->query( "ATTACH DATABASE $file AS $name", $fname );
+ return $this->query( "ATTACH DATABASE $encFile AS $name", $fname );
}
protected function isWriteQuery( $sql ) {
}
public function serverIsReadOnly() {
- return ( !$this->hasProcessMemoryPath() && !is_writable( $this->dbPath ) );
- }
+ $path = $this->getDbFilePath();
- /**
- * @return bool
- */
- private function hasProcessMemoryPath() {
- return ( strpos( $this->dbPath, ':memory:' ) === 0 );
+ return ( !self::isProcessMemoryPath( $path ) && !is_writable( $path ) );
}
/**
}
protected function doBegin( $fname = '' ) {
- if ( $this->trxMode ) {
+ if ( $this->trxMode != '' ) {
$this->query( "BEGIN {$this->trxMode}", $fname );
} else {
$this->query( 'BEGIN', $fname );
}
public function lock( $lockName, $method, $timeout = 5 ) {
- // Give better error message for permission problems than just returning false
+ $status = $this->lockMgr->lock( [ $lockName ], LockManager::LOCK_EX, $timeout );
if (
- !is_dir( "{$this->dbDir}/locks" ) &&
- ( !is_writable( $this->dbDir ) || !mkdir( "{$this->dbDir}/locks" ) )
+ $this->lockMgr instanceof FSLockManager &&
+ $status->hasMessage( 'lockmanager-fail-openlock' )
) {
- throw new DBError( $this, "Cannot create directory \"{$this->dbDir}/locks\"." );
+ throw new DBError( $this, "Cannot create directory \"{$this->getLockFileDirectory()}\"" );
}
- return $this->lockMgr->lock( [ $lockName ], LockManager::LOCK_EX, $timeout )->isOK();
+ return $status->isOK();
}
public function unlock( $lockName, $method ) {
// time needed to wait on the next clusters.
$masterPositions = array_fill( 0, count( $lbs ), false );
foreach ( $lbs as $i => $lb ) {
- if ( !$lb->hasStreamingReplicaServers() ) {
- continue; // T29975: no replication; avoid getMasterPos() permissions errors
- } elseif (
- $opts['ifWritesSince'] &&
- $lb->lastMasterChangeTimestamp() < $opts['ifWritesSince']
+ if (
+ // No writes to wait on getting replicated
+ !$lb->hasMasterConnection() ||
+ // No replication; avoid getMasterPos() permissions errors (T29975)
+ !$lb->hasStreamingReplicaServers() ||
+ // No writes since the last replication wait
+ (
+ $opts['ifWritesSince'] &&
+ $lb->lastMasterChangeTimestamp() < $opts['ifWritesSince']
+ )
) {
- continue; // no writes since the last wait
+ continue; // no need to wait
}
+
$masterPositions[$i] = $lb->getMasterPos();
}
public function getServerAttributes( $i );
/**
- * Get the current master position for chronology control purposes
+ * Get the current master replication position
+ *
* @return DBMasterPos|bool Returns false if not applicable
+ * @throws DBError
*/
public function getMasterPos();
+ /**
+ * Get the highest DB replication position for chronology control purposes
+ *
+ * If there is only a master server then this returns false. If replication is present
+ * and correctly configured, then this returns the highest replication position of any
+ * server with an open connection. That position can later be passed to waitFor() on a
+ * new load balancer instance to make sure that queries on the new connections see data
+ * at least as up-to-date as queries (prior to this method call) on the old connections.
+ *
+ * This can be useful for implementing session consistency, where the session
+ * will be resumed accross multiple HTTP requests or CLI script instances.
+ *
+ * @return DBMasterPos|bool Replication position or false if not applicable
+ * @since 1.34
+ */
+ public function getReplicaResumePos();
+
/**
* Disable this load balancer. All connections are closed, and any attempt to
* open a new connection will result in a DBAccessError.
}
public function getMasterPos() {
- # If this entire request was served from a replica DB without opening a connection to the
- # master (however unlikely that may be), then we can fetch the position from the replica DB.
+ $index = $this->getWriterIndex();
+
+ $conn = $this->getAnyOpenConnection( $index );
+ if ( $conn ) {
+ return $conn->getMasterPos();
+ }
+
+ $conn = $this->getConnection( $index, self::CONN_SILENCE_ERRORS );
+ if ( !$conn ) {
+ $this->reportConnectionError();
+ return null; // unreachable due to exception
+ }
+
+ try {
+ $pos = $conn->getMasterPos();
+ } finally {
+ $this->closeConnection( $conn );
+ }
+
+ return $pos;
+ }
+
+ public function getReplicaResumePos() {
+ // Get the position of any existing master server connection
$masterConn = $this->getAnyOpenConnection( $this->getWriterIndex() );
- if ( !$masterConn ) {
- $serverCount = $this->getServerCount();
- for ( $i = 1; $i < $serverCount; $i++ ) {
- $conn = $this->getAnyOpenConnection( $i );
- if ( $conn ) {
- return $conn->getReplicaPos();
- }
- }
- } else {
+ if ( $masterConn ) {
return $masterConn->getMasterPos();
}
- return false;
+ // Get the highest position of any existing replica server connection
+ $highestPos = false;
+ $serverCount = $this->getServerCount();
+ for ( $i = 1; $i < $serverCount; $i++ ) {
+ if ( !empty( $this->servers[$i]['is static'] ) ) {
+ continue; // server does not use replication
+ }
+
+ $conn = $this->getAnyOpenConnection( $i );
+ $pos = $conn ? $conn->getReplicaPos() : false;
+ if ( !$pos ) {
+ continue; // no open connection or could not get position
+ }
+
+ $highestPos = $highestPos ?: $pos;
+ if ( $pos->hasReached( $highestPos ) ) {
+ $highestPos = $pos;
+ }
+ }
+
+ return $highestPos;
}
public function disable() {
use Psr\Log\LoggerAwareInterface;
use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
/**
* Helper class to manage Redis connections.
__CLASS__ . ' requires a Redis client library. ' .
'See https://www.mediawiki.org/wiki/Redis#Setup' );
}
- $this->logger = $options['logger'] ?? new \Psr\Log\NullLogger();
+ $this->logger = $options['logger'] ?? new NullLogger();
$this->connectTimeout = $options['connectTimeout'];
$this->readTimeout = $options['readTimeout'];
$this->persistent = $options['persistent'];
* @deprecated Since 1.28 Use MediaWikiServices::getInstance()->getMainWANObjectCache()
*/
public static function getMainWANInstance() {
+ wfDeprecated( __METHOD__, '1.28' );
return MediaWikiServices::getInstance()->getMainWANObjectCache();
}
* @throws MWException
*/
protected function getDB( $serverIndex ) {
- if ( !isset( $this->conns[$serverIndex] ) ) {
- if ( $serverIndex >= $this->numServers ) {
- throw new MWException( __METHOD__ . ": Invalid server index \"$serverIndex\"" );
- }
+ if ( $serverIndex >= $this->numServers ) {
+ throw new MWException( __METHOD__ . ": Invalid server index \"$serverIndex\"" );
+ }
- # Don't keep timing out trying to connect for each call if the DB is down
- if ( isset( $this->connFailureErrors[$serverIndex] )
- && ( time() - $this->connFailureTimes[$serverIndex] ) < 60
- ) {
- throw $this->connFailureErrors[$serverIndex];
- }
+ # Don't keep timing out trying to connect for each call if the DB is down
+ if (
+ isset( $this->connFailureErrors[$serverIndex] ) &&
+ ( time() - $this->connFailureTimes[$serverIndex] ) < 60
+ ) {
+ throw $this->connFailureErrors[$serverIndex];
+ }
- if ( $this->serverInfos ) {
+ if ( $this->serverInfos ) {
+ if ( !isset( $this->conns[$serverIndex] ) ) {
// Use custom database defined by server connection info
$info = $this->serverInfos[$serverIndex];
$type = $info['type'] ?? 'mysql';
$this->logger->debug( __CLASS__ . ": connecting to $host" );
$db = Database::factory( $type, $info );
$db->clearFlag( DBO_TRX ); // auto-commit mode
+ $this->conns[$serverIndex] = $db;
+ }
+ $db = $this->conns[$serverIndex];
+ } else {
+ // Use the main LB database
+ $lb = MediaWikiServices::getInstance()->getDBLoadBalancer();
+ $index = $this->replicaOnly ? DB_REPLICA : DB_MASTER;
+ if ( $lb->getServerType( $lb->getWriterIndex() ) !== 'sqlite' ) {
+ // Keep a separate connection to avoid contention and deadlocks
+ $db = $lb->getConnection( $index, [], false, $lb::CONN_TRX_AUTOCOMMIT );
} else {
- // Use the main LB database
- $lb = MediaWikiServices::getInstance()->getDBLoadBalancer();
- $index = $this->replicaOnly ? DB_REPLICA : DB_MASTER;
- if ( $lb->getServerType( $lb->getWriterIndex() ) !== 'sqlite' ) {
- // Keep a separate connection to avoid contention and deadlocks
- $db = $lb->getConnection( $index, [], false, $lb::CONN_TRX_AUTOCOMMIT );
- } else {
- // However, SQLite has the opposite behavior due to DB-level locking.
- // Stock sqlite MediaWiki installs use a separate sqlite cache DB instead.
- $db = $lb->getConnection( $index );
- }
+ // However, SQLite has the opposite behavior due to DB-level locking.
+ // Stock sqlite MediaWiki installs use a separate sqlite cache DB instead.
+ $db = $lb->getConnection( $index );
}
-
- $this->logger->debug( sprintf( "Connection %s will be used for SqlBagOStuff", $db ) );
- $this->conns[$serverIndex] = $db;
}
- return $this->conns[$serverIndex];
+ $this->logger->debug( sprintf( "Connection %s will be used for SqlBagOStuff", $db ) );
+
+ return $db;
}
/**
# Show delete and move logs if there were any such events.
# The logging query can DOS the site when bots/crawlers cause 404 floods,
# so be careful showing this. 404 pages must be cheap as they are hard to cache.
- $cache = $services->getMainObjectStash();
- $key = $cache->makeKey( 'page-recent-delete', md5( $title->getPrefixedText() ) );
+ $dbCache = ObjectCache::getInstance( 'db-replicated' );
+ $key = $dbCache->makeKey( 'page-recent-delete', md5( $title->getPrefixedText() ) );
$loggedIn = $this->getContext()->getUser()->isLoggedIn();
$sessionExists = $this->getContext()->getRequest()->getSession()->isPersistent();
- if ( $loggedIn || $cache->get( $key ) || $sessionExists ) {
+ if ( $loggedIn || $dbCache->get( $key ) || $sessionExists ) {
$logTypes = [ 'delete', 'move', 'protect' ];
$dbr = wfGetDB( DB_REPLICA );
$baseRevId = null;
if ( $edittime && $sectionId !== 'new' ) {
$lb = $this->getDBLoadBalancer();
- $dbr = $lb->getConnection( DB_REPLICA );
+ $dbr = $lb->getConnectionRef( DB_REPLICA );
$rev = Revision::loadFromTimestamp( $dbr, $this->mTitle, $edittime );
// Try the master if this thread may have just added it.
// This could be abstracted into a Revision method, but we don't want
&& $lb->getServerCount() > 1
&& $lb->hasOrMadeRecentMasterChanges()
) {
- $dbw = $lb->getConnection( DB_MASTER );
+ $dbw = $lb->getConnectionRef( DB_MASTER );
$rev = Revision::loadFromTimestamp( $dbw, $this->mTitle, $edittime );
}
if ( $rev ) {
$status->value = $logid;
// Show log excerpt on 404 pages rather than just a link
- $cache = MediaWikiServices::getInstance()->getMainObjectStash();
- $key = $cache->makeKey( 'page-recent-delete', md5( $logTitle->getPrefixedText() ) );
- $cache->set( $key, 1, $cache::TTL_DAY );
+ $dbCache = ObjectCache::getInstance( 'db-replicated' );
+ $key = $dbCache->makeKey( 'page-recent-delete', md5( $logTitle->getPrefixedText() ) );
+ $dbCache->set( $key, 1, $dbCache::TTL_DAY );
}
return $status;
protected $type = 'generic';
/** @var bool */
protected $cacheable = false; // does this override getCachedWork() ?
+ /** @var PoolCounter */
+ private $poolCounter;
/**
* @param string $type The class of actions to limit concurrency for (task type)
if ( isset( $info['object'] ) ) {
return false;
}
- return (
+ return !isset( $info['factory'] ) && (
// The implied default for 'class' is ResourceLoaderFileModule
!isset( $info['class'] ) ||
// Explicit default
'image' => $this->getName(),
'variant' => $variant,
'format' => $format,
- 'lang' => $context->getLanguage(),
- 'skin' => $context->getSkin(),
- 'version' => $context->getVersion(),
];
+ if ( $this->varyOnLanguage() ) {
+ $query['lang'] = $context->getLanguage();
+ }
+ // The following parameters are at the end to keep the original order of the parameters.
+ $query['skin'] = $context->getSkin();
+ $query['version'] = $context->getVersion();
return wfAppendQuery( $script, $query );
}
return $png ?: false;
}
}
+
+ /**
+ * Check if the image depends on the language.
+ *
+ * @return bool
+ */
+ private function varyOnLanguage() {
+ return is_array( $this->descriptor ) && (
+ isset( $this->descriptor['ltr'] ) ||
+ isset( $this->descriptor['rtl'] ) ||
+ isset( $this->descriptor['lang'] ) );
+ }
}
* @param string $text
*/
function update( $id, $title, $text ) {
- $dbw = $this->lb->getConnection( DB_MASTER );
+ $dbw = $this->lb->getMaintenanceConnectionRef( DB_MASTER );
$dbw->replace( 'searchindex',
[ 'si_page' ],
[
* Whether fulltext search is supported by current schema
* @return bool
*/
- function fulltextSearchSupported() {
+ private function fulltextSearchSupported() {
+ // Avoid getConnectionRef() in order to get DatabaseSqlite specifically
/** @var DatabaseSqlite $dbr */
$dbr = $this->lb->getConnection( DB_REPLICA );
-
- return $dbr->checkForEnabledSearch();
+ try {
+ return $dbr->checkForEnabledSearch();
+ } finally {
+ $this->lb->reuseConnection( $dbr );
+ }
}
/**
* @param string $title
* @param string $text
*/
- function update( $id, $title, $text ) {
+ public function update( $id, $title, $text ) {
if ( !$this->fulltextSearchSupported() ) {
return;
}
* @param int $id
* @param string $title
*/
- function updateTitle( $id, $title ) {
+ public function updateTitle( $id, $title ) {
if ( !$this->fulltextSearchSupported() ) {
return;
}
use Psr\Log\LoggerInterface;
use BagOStuff;
+use Psr\Log\NullLogger;
/**
* Adapter for PHP's session handling
}
// Anything deleted in $_SESSION and unchanged in Session should be deleted too
// (but not if $_SESSION can't represent it at all)
- \Wikimedia\PhpSessionSerializer::setLogger( new \Psr\Log\NullLogger() );
+ \Wikimedia\PhpSessionSerializer::setLogger( new NullLogger() );
foreach ( $cache as $key => $value ) {
if ( !array_key_exists( $key, $data ) && $session->exists( $key ) &&
\Wikimedia\PhpSessionSerializer::encode( [ $key => true ] )
protected function loadSites() {
$this->sites = new SiteList();
- $dbr = $this->dbLoadBalancer->getConnection( DB_REPLICA );
+ $dbr = $this->dbLoadBalancer->getConnectionRef( DB_REPLICA );
$res = $dbr->select(
'sites',
return true;
}
- $dbw = $this->dbLoadBalancer->getConnection( DB_MASTER );
+ $dbw = $this->dbLoadBalancer->getConnectionRef( DB_MASTER );
$dbw->startAtomic( __METHOD__ );
* @return bool Success
*/
public function clear() {
- $dbw = $this->dbLoadBalancer->getConnection( DB_MASTER );
+ $dbw = $this->dbLoadBalancer->getConnectionRef( DB_MASTER );
$dbw->startAtomic( __METHOD__ );
$ok = $dbw->delete( 'sites', '*', __METHOD__ );
return $out;
}
+ public function execute( $par ) {
+ $this->addHelpLink( 'Help:Redirects' );
+ parent::execute( $par );
+ }
+
/**
* Cache page content model for performance
*
return $params;
}
- public function onAuthChangeFormFields(
- array $requests, array $fieldInfo, array &$formDescriptor, $action
- ) {
- // This method is never called for remove actions.
-
- $extraFields = [];
- Hooks::run( 'ChangePasswordForm', [ &$extraFields ], '1.27' );
- foreach ( $extraFields as $extra ) {
- list( $name, $label, $type, $default ) = $extra;
- $formDescriptor[$name] = [
- 'type' => $type,
- 'name' => $name,
- 'label-message' => $label,
- 'default' => $default,
- ];
-
- }
-
- return parent::onAuthChangeFormFields( $requests, $fieldInfo, $formDescriptor, $action );
- }
-
public function execute( $subPage ) {
$this->setHeaders();
$this->outputHeader();
$this->setHeaders();
$this->outputHeader();
$this->getOutput()->addModuleStyles( 'mediawiki.special' );
+ $this->addHelpLink( 'Help:Diff' );
$form = HTMLForm::factory( 'ooui', [
'Page1' => [
$this->setHeaders();
$this->outputHeader();
$this->checkPermissions();
+ $this->addHelpLink( 'Help:User contributions' );
$out = $this->getOutput();
$out->setPageTitle( $this->msg( 'deletedcontributions-title' ) );
return ( "{$linkA} {$edit} {$arr} {$linkB} {$arr} {$linkC}" );
}
+ public function execute( $par ) {
+ $this->addHelpLink( 'Help:Redirects' );
+ parent::execute( $par );
+ }
+
/**
* Cache page content model and gender distinction for performance
*
$out = $this->getOutput();
$out->addModuleStyles( 'mediawiki.special' );
+ $this->addHelpLink( 'Help:User_rights_and_groups' );
$out->wrapWikiMsg( "<div class=\"mw-listgrouprights-key\">\n$1\n</div>", 'listgrouprights-key' );
}
}
+ public function execute( $par ) {
+ $this->addHelpLink( 'Help:Redirects' );
+ parent::execute( $par );
+ }
+
protected function getGroupName() {
return 'pages';
}
$this->setHeaders();
$this->outputHeader();
$this->getOutput()->addModuleStyles( 'mediawiki.special' );
+ $this->addHelpLink( 'Help:Protected_pages' );
$request = $this->getRequest();
$type = $request->getVal( $this->IdType );
function execute( $par ) {
$this->setHeaders();
$this->outputHeader();
+ $this->addHelpLink( 'Help:Protected_pages' );
$request = $this->getRequest();
$type = $request->getVal( $this->IdType );
function execute( $par ) {
$this->setHeaders();
$this->outputHeader();
+ $this->addHelpLink( 'Manual:Tags' );
$request = $this->getRequest();
switch ( $par ) {
class UncategorizedImagesPage extends ImageQueryPage {
function __construct( $name = 'Uncategorizedimages' ) {
parent::__construct( $name );
+ $this->addHelpLink( 'Help:Categories' );
}
function sortDescending() {
function __construct( $name = 'Uncategorizedpages' ) {
parent::__construct( $name );
+ $this->addHelpLink( 'Help:Categories' );
}
function sortDescending() {
$this->setHeaders();
$this->outputHeader();
+ $this->addHelpLink( 'Help:Deletion_and_undeletion' );
$this->loadRequest( $par );
$this->checkPermissions(); // Needs to be after mTargetObj is set
* @file
* @ingroup Upload
*/
-use MediaWiki\MediaWikiServices;
use MediaWiki\Shell\Shell;
/**
protected $mTempPath;
/** @var TempFSFile|null Wrapper to handle deleting the temp file */
protected $tempFileObj;
-
- protected $mDesiredDestName, $mDestName, $mRemoveTempFile, $mSourceType;
- protected $mTitle = false, $mTitleError = 0;
- protected $mFilteredName, $mFinalExtension;
- protected $mLocalFile, $mStashFile, $mFileSize, $mFileProps;
+ /** @var string|null */
+ protected $mDesiredDestName;
+ /** @var string|null */
+ protected $mDestName;
+ /** @var string|null */
+ protected $mRemoveTempFile;
+ /** @var string|null */
+ protected $mSourceType;
+ /** @var Title|bool */
+ protected $mTitle = false;
+ /** @var int */
+ protected $mTitleError = 0;
+ /** @var string|null */
+ protected $mFilteredName;
+ /** @var string|null */
+ protected $mFinalExtension;
+ /** @var LocalFile */
+ protected $mLocalFile;
+ /** @var UploadStashFile */
+ protected $mStashFile;
+ /** @var int|null */
+ protected $mFileSize;
+ /** @var array|null */
+ protected $mFileProps;
+ /** @var string[] */
protected $mBlackListedExtensions;
- protected $mJavaDetected, $mSVGNSError;
+ /** @var bool|null */
+ protected $mJavaDetected;
+ /** @var string|null */
+ protected $mSVGNSError;
protected static $safeXmlEncodings = [
'UTF-8',
* @todo Replace this with a whitelist filter!
* @param string $element
* @param array $attribs
- * @param array|null $data
+ * @param string|null $data
* @return bool|array
*/
public function checkSvgScriptCallback( $element, $attribs, $data = null ) {
* @return Status[]|bool
*/
public static function getSessionStatus( User $user, $statusKey ) {
- $cache = MediaWikiServices::getInstance()->getMainObjectStash();
- $key = $cache->makeKey( 'uploadstatus', $user->getId() ?: md5( $user->getName() ), $statusKey );
+ $store = self::getUploadSessionStore();
+ $key = self::getUploadSessionKey( $store, $user, $statusKey );
- return $cache->get( $key );
+ return $store->get( $key );
}
/**
*
* The value will be set in cache for 1 day
*
+ * Avoid triggering this method on HTTP GET/HEAD requests
+ *
* @param User $user
* @param string $statusKey
* @param array|bool $value
* @return void
*/
public static function setSessionStatus( User $user, $statusKey, $value ) {
- $cache = MediaWikiServices::getInstance()->getMainObjectStash();
- $key = $cache->makeKey( 'uploadstatus', $user->getId() ?: md5( $user->getName() ), $statusKey );
+ $store = self::getUploadSessionStore();
+ $key = self::getUploadSessionKey( $store, $user, $statusKey );
if ( $value === false ) {
- $cache->delete( $key );
+ $store->delete( $key );
} else {
- $cache->set( $key, $value, $cache::TTL_DAY );
+ $store->set( $key, $value, $store::TTL_DAY );
}
}
+
+ /**
+ * @param BagOStuff $store
+ * @param User $user
+ * @param string $statusKey
+ * @return string
+ */
+ private static function getUploadSessionKey( BagOStuff $store, User $user, $statusKey ) {
+ return $store->makeKey(
+ 'uploadstatus',
+ $user->getId() ?: md5( $user->getName() ),
+ $statusKey
+ );
+ }
+
+ /**
+ * @return BagOStuff
+ */
+ private static function getUploadSessionStore() {
+ return ObjectCache::getInstance( 'db-replicated' );
+ }
}
* @author Michael Dale
*/
class UploadFromChunks extends UploadFromFile {
+ /** @var LocalRepo */
+ private $repo;
+ /** @var UploadStash */
+ public $stash;
+ /** @var User */
+ public $user;
+
protected $mOffset;
protected $mChunkIndex;
protected $mFileKey;
protected $mVirtualTempPath;
- /** @var LocalRepo */
- private $repo;
+
+ /** @noinspection PhpMissingParentConstructorInspection */
/**
* Setup local pointers to stash, repo and user (similar to UploadFromStash)
if ( $mode === 'refresh' ) {
$cache->delete( $key, 1 ); // low tombstone/"hold-off" TTL
} else {
- $lb->getConnection( DB_MASTER )->onTransactionPreCommitOrIdle(
+ $lb->getConnectionRef( DB_MASTER )->onTransactionPreCommitOrIdle(
function () use ( $cache, $key ) {
$cache->delete( $key );
},
}
// Purge old, expired memberships from the DB
- JobQueueGroup::singleton()->push( new UserGroupExpiryJob() );
+ $hasExpiredRow = $dbw->selectField(
+ 'user_groups',
+ '1',
+ [ 'ug_expiry < ' . $dbw->addQuotes( $dbw->timestamp() ) ],
+ __METHOD__
+ );
+ if ( $hasExpiredRow ) {
+ JobQueueGroup::singleton()->lazyPush( new UserGroupExpiryJob() );
+ }
// Check that the values make sense
if ( $this->group === null ) {
$lbFactory = $services->getDBLoadBalancerFactory();
$ticket = $lbFactory->getEmptyTransactionTicket( __METHOD__ );
- $dbw = $services->getDBLoadBalancer()->getConnection( DB_MASTER );
+ $dbw = $services->getDBLoadBalancer()->getConnectionRef( DB_MASTER );
- $lockKey = $dbw->getDomainID() . ':usergroups-prune'; // specific to this wiki
+ $lockKey = "{$dbw->getDomainID()}:UserGroupMembership:purge"; // per-wiki
$scopedLock = $dbw->getScopedLockAndFlush( $lockKey, __METHOD__, 0 );
if ( !$scopedLock ) {
return false; // already running
}
$oldRev = $this->revisionLookup->getRevisionById( $oldid );
+ if ( !$oldRev ) {
+ // Oldid given but does not exist (probably deleted)
+ return false;
+ }
+
$nextRev = $this->revisionLookup->getNextRevision( $oldRev );
if ( !$nextRev ) {
// Oldid given and is the latest revision for this title; clear the timestamp.
'〇周后' => '〇周後',
'〇只' => '〇隻',
'〇余' => '〇餘',
+'》里' => '》裡',
'“' => '「',
'”' => '」',
'‘' => '『',
'包准' => '包準',
'包谷' => '包穀',
'包扎' => '包紮',
+'包制' => '包製',
'匏系' => '匏繫',
'北山索面' => '北山索麵',
'北仑河' => '北崙河',
'后安路' => '后安路',
'后平路' => '后平路',
'后庄' => '后庄',
-'后座' => '后座',
'后母戊' => '后母戊',
'后海湾' => '后海灣',
'后海灣' => '后海灣',
'方便面' => '方便麵',
'方向' => '方向',
'方法里' => '方法裡',
+'于吉林' => '於吉林',
'于震中' => '於震中',
'于震前' => '於震前',
'于震后' => '於震後',
'松口镇' => '松口鎮',
'松山庄' => '松山庄',
'松溪县' => '松谿縣',
+'松开始' => '松開始',
'板荡' => '板蕩',
'林宏岳' => '林宏嶽',
'林杰樑' => '林杰樑',
'片里' => '片裡',
'片言只语' => '片言隻語',
'版图里' => '版圖裡',
+'版本里' => '版本裡',
'牙签' => '牙籤',
'牛只' => '牛隻',
'物欲' => '物慾',
'理次发' => '理次髮',
'理发动' => '理發動',
'理发展' => '理發展',
+'理发放' => '理發放',
'理发现' => '理發現',
'理发生' => '理發生',
'理发表' => '理發表',
'空蒙' => '空濛',
'空荡' => '空蕩',
'空荡荡' => '空蕩蕩',
+'空里' => '空裡',
'空钟' => '空鐘',
'空余' => '空餘',
'窒欲' => '窒慾',
'制成' => '製成',
'制毒' => '製毒',
'制法' => '製法',
+'制汉字' => '製漢字',
'制浆' => '製漿',
'制片' => '製片',
'制版' => '製版',
'托交' => '託交',
'托付' => '託付',
'托克逊' => '託克遜',
-'托儿' => '託兒',
'托古讽今' => '託古諷今',
'托名' => '託名',
'托命' => '託命',
'这只比' => '這只比',
'这只用' => '這只用',
'这只能' => '這只能',
+'这只要' => '這只要',
'这只限' => '這只限',
'这只需' => '這只需',
'这只须' => '這只須',
'那只比' => '那只比',
'那只用' => '那只用',
'那只能' => '那只能',
+'那只要' => '那只要',
'那只限' => '那只限',
'那只需' => '那只需',
'那只须' => '那只須',
'厘革' => '釐革',
'金仆姑' => '金僕姑',
'金城里' => '金城里',
+'金发放' => '金發放',
'金范' => '金範',
'金圣叹' => '金聖歎',
'金表情' => '金表情',
'闯荡' => '闖蕩',
'闯炼' => '闖鍊',
'关系' => '關係',
+'关注：' => '關注：',
+'關注：' => '關注：',
'关系列' => '關系列',
'关系所' => '關系所',
'关系科' => '關系科',
'島' => '岛',
'峽' => '峡',
'崍' => '崃',
-'崑' => '昆',
'崗' => '岗',
'崙' => '仑',
'崢' => '峥',
'昇汞' => '升汞',
'陞用' => '升用',
'陞補' => '升补',
+'昇起' => '升起',
'陞遷' => '升迁',
'昇降' => '升降',
'卓著' => '卓著',
'旋乾转坤' => '旋乾转坤',
'無言不讎' => '无言不雠',
'曠若發矇' => '旷若发矇',
+'崑崙' => '昆仑',
+'崑岡' => '昆冈',
+'崑劇' => '昆剧',
+'崑山' => '昆山',
+'崑嵛' => '昆嵛',
+'崑承湖' => '昆承湖',
+'崑曲' => '昆曲',
+'崑腔' => '昆腔',
+'崑蘇' => '昆苏',
+'崑調' => '昆调',
'易·乾' => '易·乾',
'易經·乾' => '易经·乾',
'易经·乾' => '易经·乾',
'瀋液' => '渖液',
'满拚自尽' => '满拚自尽',
'滿拚自盡' => '满拚自尽',
+'靈崑' => '灵昆',
'薰習' => '熏习',
'薰心' => '熏心',
'薰沐' => '熏沐',
'老么' => '老幺',
'肉乾乾' => '肉干干',
'肘手鍊足' => '肘手链足',
+'蘇崑' => '苏昆',
'甦醒' => '苏醒',
'苧烯' => '苧烯',
'薴烯' => '苧烯',
'蔡孝乾' => '蔡孝乾',
'蔡絛' => '蔡絛',
'行餘' => '行馀',
+'西崑' => '西昆',
'覆蓋' => '覆盖',
'見微知著' => '见微知著',
'見著' => '见著',
'局域网' => '區域網',
'局域网络' => '區域網路',
'十杆' => '十桿',
-'特立尼达和托巴哥' => '千里達托貝哥',
-'特立尼達和多巴哥' => '千里達托貝哥',
+'特立尼达和托巴哥' => '千里達及托巴哥',
+'特立尼達和多巴哥' => '千里達及托巴哥',
'不列颠哥伦比亚省' => '卑詩省',
'南朝鲜' => '南韓',
'卡斯特罗' => '卡斯楚',
'塞维利亚' => '塞維亞',
'西維爾' => '塞維亞',
'塞黑' => '塞蒙',
+'塔希提' => '大溪地',
'共和联邦' => '大英國協',
'英联邦' => '大英國協',
'英聯邦' => '大英國協',
'尼日尔' => '尼日',
'尼日爾' => '尼日',
'雅马哈' => '山葉',
-'巴厘岛' => '峇里島',
+'巴厘' => '峇里',
'特朗普' => '川普',
'机床' => '工具機',
'機床' => '工具機',
'萌島' => '曼島',
'马恩岛' => '曼島',
'木杆' => '木桿',
+'尾班車' => '末班車',
'列奥纳多' => '李奧納多',
'杜塞尔多夫' => '杜塞道夫',
'杜塞爾多夫' => '杜塞道夫',
'圣基茨和尼维斯' => '聖克里斯多福及尼維斯',
'聖吉斯納域斯' => '聖克里斯多福及尼維斯',
'聖佐治' => '聖喬治',
+'圣多美和普林西比' => '聖多美普林西比',
+'聖多美和普林西比' => '聖多美普林西比',
'圣文森特和格林纳丁斯' => '聖文森及格瑞那丁',
'聖文森特和格林納丁斯' => '聖文森及格瑞那丁',
'圣赫勒拿' => '聖赫倫那',
'扎伊爾' => '薩伊',
'素檀' => '蘇丹',
'苏里南' => '蘇利南',
+'蘇里南' => '蘇利南',
'浮罗交怡' => '蘭卡威',
'浮羅交怡' => '蘭卡威',
'劳拉' => '蘿拉',
'香煙' => '香菸',
'馬里共和國' => '馬利共和國',
'马里共和国' => '馬利共和國',
+'馬拉維' => '馬拉威',
'马拉维' => '馬拉威',
'馬勒當拿' => '馬拉度納',
'马拉多纳' => '馬拉度納',
'IP地址' => 'IP位址',
'·威尔士' => '·威爾士',
'·威爾士' => '·威爾士',
+'》里' => '》裏',
'一地里' => '一地裏',
'三十六著' => '三十六着',
'三極體' => '三極管',
'夢著述' => '夢著述',
'夢著錄' => '夢著錄',
'梦里' => '夢裏',
+'塔希提' => '大溪地',
'天里' => '天裏',
'宇航员' => '太空人',
'夾著' => '夾着',
'山里的' => '山裏的',
'甘比亞' => '岡比亞',
'岸裡' => '岸裡',
-'巴厘岛' => '峇里島',
+'巴厘' => '峇里',
'工作台' => '工作枱',
'已占' => '已佔',
'巴塞罗那' => '巴塞隆拿',
'爭著錄' => '爭著錄',
'墙里' => '牆裏',
'版图里' => '版圖裏',
+'版本里' => '版本裏',
'版权信息' => '版權資訊',
-'千里達托貝哥' => '特立尼達和多巴哥',
+'千里達及托巴哥' => '特立尼達和多巴哥',
'牽著' => '牽着',
'牽著作' => '牽著作',
'牽著名' => '牽著名',
'空著者' => '空著者',
'空著述' => '空著述',
'空著錄' => '空著錄',
+'空里' => '空裏',
'太空梭' => '穿梭機',
'航天飞机' => '穿梭機',
'穿著' => '穿着',
'聖喬治' => '聖佐治',
'圣基茨和尼维斯' => '聖吉斯納域斯',
'聖克里斯多福及尼維斯' => '聖吉斯納域斯',
+'聖多美普林西比' => '聖多美和普林西比',
'聖文森及格瑞那丁' => '聖文森特和格林納丁斯',
'聖露西亞' => '聖盧西亞',
'聖馬利諾' => '聖馬力諾',
'藏著者' => '藏著者',
'藏著述' => '藏著述',
'藏著錄' => '藏著錄',
+'蘇利南' => '蘇里南',
'蘊涵著' => '蘊涵着',
'蘸著' => '蘸着',
'蘸著作' => '蘸著作',
'馬拉度納' => '馬勒當拿',
'马拉多纳' => '馬勒當拿',
'马拉特·萨芬' => '馬拉特·沙芬',
+'馬拉威' => '馬拉維',
'馬斯垂克' => '馬斯特里赫特',
'馬爾地夫' => '馬爾代夫',
'馬利共和國' => '馬里共和國',
'駕著者' => '駕著者',
'駕著述' => '駕著述',
'駕著錄' => '駕著錄',
+'駛著' => '駛着',
'騎著' => '騎着',
'騎著作' => '騎著作',
'騎著名' => '騎著名',
'騙著者' => '騙著者',
'騙著述' => '騙著述',
'騙著錄' => '騙著錄',
-'驶著' => '驶着',
'体里' => '體裏',
'高畫質' => '高清',
'高著' => '高着',
'全球資訊網' => '万维网',
'三十六著' => '三十六着',
'三極體' => '三极管',
+'上落客' => '上下客',
'下著' => '下着',
'下著作' => '下著作',
'下著名' => '下著名',
'下著稱' => '下著称',
'下著者' => '下著者',
'下著述' => '下著述',
+'落車' => '下车',
'卑詩省' => '不列颠哥伦比亚省',
'不著' => '不着',
'不著書' => '不著书',
'聖露西亞' => '圣卢西亚',
'聖克里斯多福及尼維斯' => '圣基茨和尼维斯',
'聖吉斯納域斯' => '圣基茨和尼维斯',
+'聖多美普林西比' => '圣多美和普林西比',
'聖文森及格瑞那丁' => '圣文森特和格林纳丁斯',
'聖馬利諾' => '圣马力诺',
'蓋亞那' => '圭亚那',
'朝著稱' => '朝著称',
'朝著者' => '朝著者',
'朝著述' => '朝著述',
+'尾班車' => '末班车',
'賓·拉登' => '本·拉登',
'本份' => '本分',
'賓拉登' => '本拉登',
'牽著述' => '牵著述',
'千里達' => '特立尼达',
'千里達及托巴哥' => '特立尼达和多巴哥',
-'千里達托貝哥' => '特立尼达和托巴哥',
'德蕾莎·梅伊' => '特蕾莎·梅',
'文翠珊' => '特蕾莎·梅',
'狗隻' => '犬只',
"delete-legend": "Выдаліць",
"historywarning": "<strong>Папярэджаньне</strong>: старонка, якую Вы зьбіраецеся выдаліць, мае гісторыю з $1 {{PLURAL:$1|вэрсіі|вэрсіяў|вэрсіяў}}:",
"historyaction-submit": "Паказаць вэрсіі",
- "confirmdeletetext": "Ð\97аÑ\80аз Ð\92Ñ\8b вÑ\8bдалÑ\96Ñ\86е Ñ\81Ñ\82аÑ\80онкÑ\83 Ñ\80азам з Ñ\83Ñ\81Ñ\91й гÑ\96Ñ\81Ñ\82оÑ\80Ñ\8bÑ\8fй зÑ\8cменаÑ\9e.\nÐ\9aалÑ\96 лаÑ\81ка, паÑ\86Ñ\8cвеÑ\80дзÑ\96Ñ\86е, Ñ\88Ñ\82о Ð\92Ñ\8b зÑ\8cбÑ\96Ñ\80аеÑ\86еÑ\81Ñ\8f гÑ\8dÑ\82а зÑ\80абÑ\96Ñ\86Ñ\8c Ñ\96 Ñ\88Ñ\82о Ð\92ы разумееце ўсе наступствы, а таксама робіце гэта ў адпаведнасьці з [[{{MediaWiki:Policy-url}}|правіламі]].",
+ "confirmdeletetext": "Ð\97аÑ\80аз вÑ\8b вÑ\8bдалÑ\96Ñ\86е Ñ\81Ñ\82аÑ\80онкÑ\83 Ñ\80азам з Ñ\83Ñ\81Ñ\91й гÑ\96Ñ\81Ñ\82оÑ\80Ñ\8bÑ\8fй зÑ\8cменаÑ\9e.\nÐ\9aалÑ\96 лаÑ\81ка, паÑ\86Ñ\8cвеÑ\80дзÑ\96Ñ\86е, Ñ\88Ñ\82о вÑ\8b зÑ\8cбÑ\96Ñ\80аеÑ\86еÑ\81Ñ\8f гÑ\8dÑ\82а зÑ\80абÑ\96Ñ\86Ñ\8c Ñ\96 Ñ\88Ñ\82о вы разумееце ўсе наступствы, а таксама робіце гэта ў адпаведнасьці з [[{{MediaWiki:Policy-url}}|правіламі]].",
"actioncomplete": "Дзеяньне выкананае",
"actionfailed": "Дзеяньне ня выкананае",
"deletedtext": "«$1» была выдаленая.\nЗапісы пра выдаленыя старонкі зьмяшчаюцца ў $2.",
"dellogpage": "Журнал выдаленьняў",
- "dellogpagetext": "Сьпіс апошніх выдаленьняў.",
+ "dellogpagetext": "Ð\9dÑ\96жÑ\8dй знаÑ\85одзÑ\96Ñ\86Ñ\86а Ñ\81ьпіс апошніх выдаленьняў.",
"deletionlog": "журнал выдаленьняў",
"log-name-create": "Журнал стварэньня старонак",
"log-description-create": "Ніжэй знаходзіцца сьпіс апошніх стварэньняў старонак.",
"history": "История",
"history_short": "История",
"history_small": "история",
- "updatedmarker": "пÑ\80оменено оÑ\82 поÑ\81ледноÑ\82о ми посещение",
+ "updatedmarker": "пÑ\80оменено оÑ\82 поÑ\81ледноÑ\82о Ð\92и посещение",
"printableversion": "Версия за печат",
"permalink": "Постоянна препратка",
"print": "Печат",
"deleteprotected": "Не можете да изтриете страницата, защото е защитена.",
"deleting-backlinks-warning": "<strong>Внимание:</strong> [[Special:WhatLinksHere/{{FULLPAGENAME}}|Други страници]] сочат към или включват като шаблон страницата, която се опитвате да изтриете.",
"rollback": "Отмяна на промените",
+ "rollback-confirmation-confirm": "Моля потвърдете:",
+ "rollback-confirmation-yes": "Отмяна",
"rollback-confirmation-no": "Отказ",
"rollbacklink": "отмяна",
"rollbacklinkcount": "отмяна на $1 {{PLURAL:$1|редакция|редакции}}",
"blocklist-userblocks": "Скриване блокирането на потребителски сметки",
"blocklist-tempblocks": "Скриване на временни блокирания",
"blocklist-addressblocks": "Скриване на отделни блокирания на IP адреси",
+ "blocklist-type-opt-sitewide": "За всички уикита",
+ "blocklist-type-opt-partial": "Частично",
"blocklist-rangeblocks": "Скриване на блокиранията по IP диапазон",
"blocklist-timestamp": "Дата и час",
"blocklist-target": "Цел",
"watchlistedit-clear-titles": "Заглавия:",
"watchlistedit-clear-submit": "Изчистване на списъка за наблюдение (Необратимо!)",
"watchlistedit-clear-done": "Списъкът за наблюдение беше изчистен.",
+ "watchlistedit-clear-jobqueue": "Вашият списък за наблюдение се изчиства. Това може да отнеме известно време!",
"watchlistedit-clear-removed": "{{PLURAL:$1|1 заглавие беше премахнато|$1 заглавия бяха премахнати}}:",
"watchlistedit-too-many": "Има твърде много страници за показване.",
"watchlisttools-clear": "Изчистване на списъка за наблюдение",
"redirect-file": "Име на файл",
"redirect-logid": "Номер на записа",
"redirect-not-exists": "Стойността не е намерена",
+ "redirect-not-numeric": "Стойността не е числова",
"fileduplicatesearch": "Търсене на повтарящи се файлове",
"fileduplicatesearch-summary": "Търсене на повтарящи се файлове на база хеш стойности.",
"fileduplicatesearch-filename": "Име на файл:",
"tag-mw-contentmodelchange": "промяна на модела на съдържание",
"tag-mw-new-redirect": "Ново пренасочване",
"tag-mw-removed-redirect": "Премахнато пренасочване",
+ "tag-mw-changed-redirect-target": "Промяна целта на пренасочване",
+ "tag-mw-changed-redirect-target-description": "Редакции, променящи целта на пренасочване",
"tag-mw-blank": "Изтриване на съдържанието",
"tag-mw-replace": "Заменено",
+ "tag-mw-replace-description": "Редакции, премахващи над 90% от съдържанието на страница",
"tag-mw-rollback": "Отмяна",
"tag-mw-undo": "Отмяна",
"tags-title": "Етикети",
"powersearch-togglelabel": "تاوتوێ بکە:",
"powersearch-toggleall": "ھەموویان",
"powersearch-togglenone": "ھیچیان",
- "powersearch-remember": "ھەڵبژاردەکانت بۆ گەڕانەکانی تر لە بیر بێت",
+ "powersearch-remember": "بەبیرھێناوەی ھەڵبژاردەکان بۆ گەڕانەکانی داھاتوو",
"search-external": "گەڕانی دەرەکی",
"searchdisabled": "گەڕانی {{SITENAME}} ئێستە کار ناکات.\nدەتوانی بۆ ئێستا لە گەڕانی گووگڵ کەڵک وەرگری.\nلەیادت بێت لەوانەیە پێرستەکانیان بۆ گەڕانی ناو {{SITENAME}}، کاتبەسەرچوو بێت.",
"preferences": "ھەڵبژاردەکان",
"navigation": "Navigazione",
"and": " è",
"actions": "Azzione",
+ "namespaces": "Spazii",
"variants": "Variante",
+ "navigation-heading": "Navigazione",
"errorpagetitle": "Errore",
"returnto": "Vultà à $1.",
"tagline": "À prupositu di {{SITENAME}}",
"specialpage": "Pagina speciale",
"personaltools": "Strumenti persunali",
"talk": "Discussione",
+ "views": "Viste sfarenti",
"toolbox": "Stuvigli",
"mediawikipage": "Vede i missaghji",
"templatepage": "Vede a pagina di mudellu",
"categorypage": "Vede a pagina di categuria",
"viewtalkpage": "Vede a discussione",
"otherlanguages": "In altre lingue",
+ "redirectedfrom": "(Reindirizzamentu da $1)",
"redirectpagesub": "Pagina di reindirizzamentu",
"redirectto": "Reindirizzamentu à:",
- "lastmodifiedat": "Ultima mudifica di sta pagina u $1 à e $2.",
+ "lastmodifiedat": "Ùltima mudìfica di sta pàgina u $1 à e $2.",
"protectedpage": "Pagina prutetta",
"jumpto": "Andà à:",
"jumptonavigation": "navigazione",
"loginlanguagelabel": "Lingua: $1",
"pt-login": "Cunnessione",
"pt-login-button": "Cunnessione",
+ "pt-createaccount": "Registramentu",
"pt-userlogout": "Scunnessione",
"retypenew": "Scrive torna a nova parulla secreta:",
"resetpass-submit-cancel": "Cancillà",
"currentrev": "Ultima revisione",
"currentrev-asof": "Versione attuale di e $1",
"revisionasof": "Versione di e $1",
- "revision-info": "Versione di e $4 à e $5 di $2",
+ "revision-info": "Versione di e $4 à e $5 da {{GENDER:$6|$2}}$7",
"previousrevision": "← Versione menu ricente",
"nextrevision": "Versione più nova →",
"currentrevisionlink": "Ultima revisione",
"searchprofile-everything": "Tuttu",
"searchprofile-advanced": "Avanzatu",
"searchprofile-articles-tooltip": "Circà in $1",
+ "searchprofile-images-tooltip": "Circà schedarii",
"searchprofile-everything-tooltip": "Circà dapertuttu (incluse e pagine di discussione)",
"search-result-size": "$1 ({{PLURAL:$2|1 parolla|$2 parolle}})",
"search-redirect": "(Reindirizzamentu da $1)",
"hide": "piattà",
"show": "mustrà",
"minoreditletter": "m",
+ "newpageletter": "N",
"boteditletter": "b",
"rc-enhanced-hide": "Nasconde i dittagli",
"recentchangeslinked": "Mudifiche assuciate",
"file-anchor-link": "Schedariu",
"filehist": "Cronolugia di l'imagine",
"filehist-deleteone": "supprimà",
+ "filehist-current": "attuale",
+ "filehist-datetime": "Data/Óra",
+ "filehist-thumb": "Previsualizzazione",
+ "filehist-thumbtext": "Previsualizzazione di a versione di",
"filehist-user": "Cuntributore",
"filehist-dimensions": "Dimensione",
"filehist-comment": "Cummentu",
"watchlistfor2": "Per $1 ($2)",
"watch": "Suvità",
"unwatch": "Ùn suvità micca",
- "wlshowlast": "Mustrà l'ultime $1 ore $2 ghjorni",
+ "wlshowlast": "Mustrà l'ùltime $1 ore $2 ghjorni",
"enotif_reset": "Marcà tutte e pagine visitate",
"created": "creatu",
"changed": "cambiatu",
"import-logentry-upload-detail": "$1 {{PLURAL:$1|revisione|revisione}}",
"tooltip-pt-userpage": "{{GENDER:|A to}} pàgina di cuntributore",
"tooltip-pt-mytalk": "{{GENDER:|A to}} pàgina di discussione",
- "tooltip-pt-preferences": "{{GENDER:|E to}}} preferenze",
+ "tooltip-pt-preferences": "{{GENDER:|E to}} preferenze",
"tooltip-pt-watchlist": "Lista di e pagine ch'è tù suviti",
"tooltip-pt-mycontris": "Lista di {{GENDER:|e to}} cuntribuzioni",
"tooltip-pt-login": "U registramentu hè suggeritu, micca ubligatoriu",
"tooltip-pt-logout": "Esce da a sessione",
"tooltip-ca-talk": "Vede e discussione relative à sta pagina",
- "tooltip-ca-edit": "Pò mudificà 'ssa pagina. Per piacè improda l'ozzione di previsualisazzione prima di salvà",
+ "tooltip-ca-edit": "Mudificà 'ssa pagina",
"tooltip-ca-addsection": "Cumincià una nova sezzione",
"tooltip-ca-viewsource": "Sta pagina hè prutetta, ma si pò vede u so codice surghjente",
"tooltip-ca-history": "Versione precedente di sta pagina",
"tooltip-t-whatlinkshere": "Listinu di tutte e pagine chì sò ligate à quessa",
"tooltip-t-recentchangeslinked": "Versione di l'ultime mudifiche à e pagine legate à quessa",
"tooltip-t-contributions": "Listinu di e mudifiche {{GENDER:$1|di 'ssu cuntributore}}",
+ "tooltip-t-upload": "Incaricà un schedariu",
"tooltip-t-specialpages": "Listinu di tutte e pagine spiciale",
"tooltip-t-print": "Versione stampevule di 'ssa pagina",
"tooltip-t-permalink": "Ligame permanente à e revisione di sta pagina",
"tooltip-ca-nstab-user": "Vede a pagina di cuntributore",
"tooltip-ca-nstab-special": "Questa hè una pàgina particulare chi ùn si pó micca esse mudificata",
"tooltip-ca-nstab-project": "Vede a pagina di u prugettu",
+ "tooltip-ca-nstab-image": "Vede pàgina di schedariu",
"tooltip-ca-nstab-template": "Vede u mudellu",
"tooltip-ca-nstab-category": "Vede a pagina di categuria",
"tooltip-minoredit": "Signalà com'è mudifica minore",
"noimages": "Nulla da vede.",
"ilsubmit": "Ricerca",
"bydate": "per data",
+ "namespacesall": "tutti",
"monthsall": "tutti",
"confirm_purge_button": "D'accordu",
"table_pager_next": "Pagina seguente",
"logentry-move-move": "$1 {{GENDER:$2|hà spustatu}} a pagina $3 à $4",
"logentry-newusers-create": "U participante $3 hè statu creatu da $1",
"rightsnone": "(nessunu)",
- "searchsuggest-search": "Ricerca",
+ "searchsuggest-search": "Circà in {{SITENAME}}",
"expand_templates_output": "Risultatu"
}
"Weblars",
"Kranix",
"Psl85",
- "Dipsacus fullonum"
+ "Dipsacus fullonum",
+ "Fugithora"
]
},
"tog-underline": "Understreg link:",
"history": "Sidehistorik",
"history_short": "Historik",
"history_small": "historik",
- "updatedmarker": "opdateret siden seneste besøg",
+ "updatedmarker": "opdateret siden dit seneste besøg",
"printableversion": "Udskriftsvenlig udgave",
"permalink": "Permanent link",
"print": "Udskriv",
"virus-scanfailed": "scan fejlede (fejlkode $1)",
"virus-unknownscanner": "ukendt antivirus:",
"logouttext": "<strong>Du er nu logget af.</strong>\n\nBemærk, at nogle sider stadigvæk kan vises som om du var logget på, indtil du tømmer din browsers cache.",
+ "logging-out-notify": "Du bliver logget ud, vent venligst.",
+ "logout-failed": "Kan ikke logge ud nu: $1",
"cannotlogoutnow-title": "Kan ikke logge af på nuværende tidspunkt",
"cannotlogoutnow-text": "Det er ikke muligt at logge af når du bruger $1.",
"welcomeuser": "Velkommen, $1!",
"autoblockedtext": "Deine IP-Adresse wurde automatisch gesperrt, da sie von einem anderen Benutzer genutzt wurde, der von $1 gesperrt wurde.\nAls Grund wurde angegeben:\n\n:''$2''\n\n* Beginn der Sperre: $8\n* Ende der Sperre: $6\n* Sperre betrifft: $7\n\nDu kannst $1 oder einen der anderen [[{{MediaWiki:Grouppage-sysop}}|Administratoren]] kontaktieren, um über die Sperre zu diskutieren.\n\nDu kannst die „{{int:emailuser}}“-Funktion nicht nutzen, solange keine gültige E-Mail-Adresse in deinen [[Special:Preferences|Benutzerkonto-Einstellungen]] eingetragen ist oder diese Funktion für dich gesperrt wurde.\n\nDeine aktuelle IP-Adresse ist $3, und die Sperr-ID ist $5.\nBitte füge alle Informationen jeder Anfrage hinzu, die du stellst.",
"systemblockedtext": "Dein Benutzername oder deine IP-Adresse wurde von MediaWiki automatisch gesperrt.\nDer angegebene Grund ist:\n\n:<em>$2</em>\n\n* Beginn der Sperre: $8\n* Ablauf der Sperre: $6\n* Sperre betrifft: $7\n\nDeine aktuelle IP-Adresse ist $3.\nBitte gib alle oben stehenden Details in jeder Anfrage an.",
"blockednoreason": "keine Begründung angegeben",
+ "blockedtext-composite": "<strong>Dein Benutzername oder deine IP-Adresse wurde gesperrt.</strong>\n\nDer Angegebene Grund ist:\n\n:<em>$2</em>\n\n* Beginn der Sperre: $8\n* Ablauf der längsten Sperre: $6\n\nDeine aktuelle IP-Adresse ist $3.\nBitte gib alle oben stehenden Details in jeder Anfrage an.",
+ "blockedtext-composite-reason": "Es gibt mehrere Sperren gegen dein Benutzerkonto und/oder deine IP-Adresse",
"whitelistedittext": "Du musst dich $1, um Seiten bearbeiten zu können.",
"confirmedittext": "Du musst deine E-Mail-Adresse erst bestätigen, bevor du Bearbeitungen durchführen kannst. Bitte ergänze und bestätige deine E-Mail in den [[Special:Preferences|Einstellungen]].",
"nosuchsectiontitle": "Abschnitt nicht gefunden",
"mw-widgets-abandonedit-title": "Bist du sicher?",
"mw-widgets-copytextlayout-copy": "Kopieren",
"mw-widgets-copytextlayout-copy-fail": "Der Text konnte nicht in die Zwischenablage kopiert werden.",
+ "mw-widgets-copytextlayout-copy-success": "Text in die Zwischenablage kopiert.",
"mw-widgets-dateinput-no-date": "Kein Datum ausgewählt",
"mw-widgets-dateinput-placeholder-day": "JJJJ-MM-TT",
"mw-widgets-dateinput-placeholder-month": "JJJJ-MM",
"restrictionsfield-help": "Eine IP-Adresse oder ein CIDR-Bereich pro Zeile. Um alles zu aktivieren, verwende:\n<pre>\n0.0.0.0/0\n::/0\n</pre>",
"edit-error-short": "Fehler: $1",
"edit-error-long": "Fehler:\n\n$1",
+ "specialmute": "Stumm",
+ "specialmute-success": "Deine Stummschaltungseinstellungen wurden aktualisiert. Schau dir alle stummgeschalteten Benutzer in [[Special:Preferences|deinen Einstellungen]] an.",
+ "specialmute-submit": "Bestätigen",
+ "specialmute-label-mute-email": "E-Mails von diesem Benutzer stummschalten",
+ "specialmute-header": "Bitte wähle deine Stummschaltungseinstellungen für {{BIDI:[[User:$1]]}}.",
+ "specialmute-error-invalid-user": "Der gesuchte Benutzername konnte nicht gefunden werden.",
+ "specialmute-error-email-blacklist-disabled": "Das Stummschalten von E-Mails von Benutzern ist nicht aktiviert.",
+ "specialmute-error-email-preferences": "Du musst deine E-Mail Adresse bestätigen bevor du einen Benutzer bestätigen kannst. Du kannst dies [[Special:Preferences|in deinen Einstellungen]] tun.",
+ "specialmute-email-footer": "Um deine E-Mail Einstellungen für {{BIDI:$2}} zu verwalten besuche bitte $1.",
+ "specialmute-login-required": "Bitte melde dich an um deine Stummschaltungseinstellungen zu ändern.",
"revid": "Version $1",
"pageid": "Seitenkennung $1",
"interfaceadmin-info": "$1\n\nBerechtigungen für das Bearbeiten von wikiweiten CSS/JS/JSON-Dateien wurden kürzlich vom Recht <code>editinterface</code> getrennt. Falls du nicht verstehst, warum du diesen Fehler erhältst, siehe [[mw:MediaWiki_1.32/interface-admin]].",
"Macofe",
"Matma Rex",
"Fitoschido",
- "Vlad5250"
+ "Vlad5250",
+ "J budissin"
]
},
"tog-underline": "Wótkaze pódšmarnuś:",
"nstab-template": "Pśedłoga",
"nstab-help": "Pomoc",
"nstab-category": "Kategorija",
+ "mainpage-nstab": "Głowny bok",
"nosuchaction": "Toś tu akciju njedajo",
"nosuchactiontext": "Akcija, kótaruž URL pódawa, jo njepłaśiwa.\nSy se snaź zapisał pśi zapódaśu URL abo sy slědował wopacnemu wótkazoju.\nTo by mógło teke programěrowańska zmólka w {{GRAMMAR:lokatiw|{{SITENAME}}}} byś.",
"nosuchspecialpage": "Toś ten specialny bok njeeksistěrujo",
"currentevents": "אקטואליה",
"currentevents-url": "Project:אקטואליה",
"disclaimers": "הבהרות משפטיות",
- "disclaimerpage": "Project:×\94×\91×\94ר×\94 ×\9eשפ×\98×\99ת",
+ "disclaimerpage": "Project:×\94×\91×\94ר×\95ת ×\9eשפ×\98×\99×\95ת",
"edithelp": "עזרה בעריכה",
"helppage-top-gethelp": "עזרה",
"mainpage": "עמוד ראשי",
"pt-createaccount": "יצירת חשבון",
"pt-userlogout": "יציאה מהחשבון",
"php-mail-error-unknown": "שגיאה לא ידועה בפונקציה mail() של PHP.",
- "user-mail-no-addy": "×\94ת×\91צע × ×\99ס×\99×\95×\9f ×\9cש×\9c×\99×\97ת ×\94×\95×\93×¢×\94 ×\9c×\9c×\90 ×\9bת×\95×\91ת ×\93×\95×\90×´ל.",
- "user-mail-no-body": "× ×\99ס×\99×\95×\9f ×\9cש×\9c×\95×\97 דוא\"ל עם תוכן ריק או קצר מאוד.",
+ "user-mail-no-addy": "×\94ת×\91צע × ×\99ס×\99×\95×\9f ×\9cש×\9c×\99×\97ת ×\94×\95×\93עת ×\93×\95×\90\"×\9c ×\9c×\9c×\90 ×\9bת×\95×\91ת ×\93×\95×\90\"ל.",
+ "user-mail-no-body": "×\94ת×\91צע × ×\99ס×\99×\95×\9f ×\9cש×\9c×\99×\97ת ×\94×\95×\93עת דוא\"ל עם תוכן ריק או קצר מאוד.",
"changepassword": "שינוי סיסמה",
"resetpass_announce": "כדי לסיים את הכניסה לחשבון, יש להגדיר סיסמה חדשה.",
"resetpass_text": "<!-- יש להוסיף טקסט כאן -->",
"autoblockedtext": "כתובת ה־IP שלך נחסמה באופן אוטומטי כיוון שמשתמש אחר, שנחסם על־ידי $1, השתמש בה.\nהסיבה שניתנה לחסימה היא:\n\n:<em>$2</em>\n\n* תחילת החסימה: $8\n* פקיעת החסימה: $6\n* החסימה שבוצעה: $7\n\nבאפשרותך ליצור קשר עם $1 או עם כל אחד מ[[{{MediaWiki:Grouppage-sysop}}|מפעילי המערכת]] האחרים כדי לדון בחסימה.\n\nכמו־כן, באפשרותך להשתמש בתכונת \"{{int:emailuser}}\", אלא אם לא ציינת כתובת דוא\"ל תקפה ב[[Special:Preferences|העדפות המשתמש שלך]] או אם נחסמת משליחת דוא\"ל.\n\nכתובת ה־IP הנוכחית שלך היא $3, ומספר החסימה שלך הוא #$5.\nיש לציין את כל הפרטים הללו בכל פנייה לבירור החסימה.",
"systemblockedtext": "שם המשתמש או כתובת ה־IP שלך נחסמו באופן אוטומטי על־ידי תוכנת מדיה־ויקי.\nהסיבה שניתנה לחסימה היא:\n\n:<em>$2</em>\n\n* תחילת החסימה: $8\n* פקיעת החסימה: $6\n* החסימה שבוצעה: $7\n\nכתובת ה־IP הנוכחית שלך היא $3.\nיש לציין את כל הפרטים הללו בכל פנייה לבירור החסימה.",
"blockednoreason": "לא ניתנה סיבה",
- "blockedtext-composite": "<strong>ש×\9d ×\94×\9eשת×\9eש ×\90×\95 ×\9bת×\95×\91ת ×\94Ö¾IP ש×\9c×\9b×\9d × ×\97ס×\9e×\95 ×\9eער×\99×\9b×\94.</strong>\n\n×\94ס×\99×\91×\94 ×©× ×\99×ª× ×\94 ×\94×\99×\90:\n\n:<em>$2</em>.\n\n* ת×\97×\99×\9cת ×\94×\97ס×\99×\9e×\94: $8\n* פק×\99עת ×\94×\97ס×\99×\9e×\94 ×\94×\90ר×\95×\9b×\94 ×\91×\99×\95תר: $6\n\n×\9bת×\95×\91ת ×\94Ö¾IP ×\94× ×\95×\9b×\97×\99ת ש×\9c×\9a ×\94×\99×\90 $3.\n×\99ש ×\9cספק ×\90ת ×\9b×\9c ×\94×\9e×\99×\93×¢ ×\94× \"×\9c ×¢×\91×\95ר ×\9b×\9c ×\94ש×\90×\99×\9cת×\95ת ש×\90ת×\9d ×\9e×\91צע×\99×\9d.",
- "blockedtext-composite-reason": "×\99×©× ×\9f ×\9eספר ×\97ס×\99×\9e×\95ת ×¢×\9c ×\94×\97ש×\91×\95×\9f ש×\9c×\9a ×\95/×\90×\95 ×\9bת×\95×\91ת ×\94Ö¾IP ש×\9c×\9a",
+ "blockedtext-composite": "<strong>ש×\9d ×\94×\9eשת×\9eש ×\90×\95 ×\9bת×\95×\91ת ×\94Ö¾IP ש×\9c×\9a × ×\97ס×\9e×\95.</strong>\n\n×\94ס×\99×\91×\94 ×©× ×\99×ª× ×\94 ×\9c×\9b×\9a ×\94×\99×\90:\n\n:<em>$2</em>.\n\n* ת×\97×\99×\9cת ×\94×\97ס×\99×\9e×\94: $8\n* פק×\99עת ×\94×\97ס×\99×\9e×\94 ×\94×\90ר×\95×\9b×\94 ×\91×\99×\95תר: $6\n\n×\9bת×\95×\91ת ×\94Ö¾IP ×\94× ×\95×\9b×\97×\99ת ש×\9c×\9a ×\94×\99×\90 $3.\n×\99ש ×\9cצ×\99×\99×\9f ×\90ת ×\9b×\9c ×\94פר×\98×\99×\9d ×\94×\9c×\9c×\95 ×\91×\9b×\9c ×¤× ×\99×\99×\94 ×\9c×\91×\99ר×\95ר ×\94×\97ס×\99×\9e×\94.",
+ "blockedtext-composite-reason": "×\94×\95פע×\9c×\95 ×\9eספר ×\97ס×\99×\9e×\95ת ×¢×\9c ×\97ש×\91×\95×\9f ×\94×\9eשת×\9eש ש×\9c×\9a ×\90×\95 ×¢×\9c ×\9bת×\95×\91ת ×\94Ö¾IP ש×\9c×\9a (×\90×\95 ×¢×\9c ×©× ×\99×\94×\9d)",
"whitelistedittext": "נדרשת $1 כדי לערוך דפים.",
"confirmedittext": "יש לאמת את כתובת הדוא\"ל לפני עריכת דפים.\nנא להגדיר ולאמת את כתובת הדוא\"ל שלך באמצעות [[Special:Preferences|העדפות המשתמש]] שלך.",
"nosuchsectiontitle": "הפסקה לא נמצאה",
"gender-male": "הוא עורך דפים בוויקי",
"gender-female": "היא עורכת דפים בוויקי",
"prefs-help-gender": "לא חובה למלא העדפה זו.\nהמערכת משתמשת במידע הזה כדי לפנות אליך/אלייך ולציין את שם המשתמש שלך במין הדקדוקי הנכון.\nהמידע יהיה ציבורי.",
- "email": "דוא״ל",
+ "email": "דוא\"ל",
"prefs-help-realname": "לא חובה למלא את השם האמיתי.\nאם סופק, הוא עשוי לשמש כדי לייחס לך את עבודתך.",
"prefs-help-email": "כתובת דואר אלקטרוני היא אופציונלית, אבל היא חיונית לאיפוס הסיסמה במקרה ש{{GENDER:|תשכח|תשכחי}} אותה.",
"prefs-help-email-others": "באפשרותך גם לאפשר למשתמשים ליצור איתך קשר באמצעות דוא\"ל דרך קישור בדף המשתמש או בדף השיחה שלך.\nכתובת הדוא\"ל שלך לא תיחשף כשמשתמשים יצרו איתך קשר.",
"mw-widgets-abandonedit-discard": "ביטול העריכות",
"mw-widgets-abandonedit-keep": "המשך עריכה",
"mw-widgets-abandonedit-title": "בטוח?",
- "mw-widgets-copytextlayout-copy": "העתק",
+ "mw-widgets-copytextlayout-copy": "העתקה",
"mw-widgets-copytextlayout-copy-fail": "ההעתקה ללוח נכשלה.",
"mw-widgets-copytextlayout-copy-success": "הועתק ללוח.",
"mw-widgets-dateinput-no-date": "לא נבחר תאריך",
"edit-error-short": "שגיאה: $1",
"edit-error-long": "שגיאות:\n\n$1",
"specialmute": "השתקה",
- "specialmute-success": "העדפות ההשתקה שלך עודכנו. ר' את כל המשתמשים המושתקים ב[[Special:Preferences|העדפות שלך]].",
+ "specialmute-success": "העדפות ההשתקה שלך עודכנו. רשימת כל המשתמשים המושתקים זמינה ב[[Special:Preferences|העדפות שלך]].",
"specialmute-submit": "אישור",
- "specialmute-label-mute-email": "×\9c×\94שת×\99ק דואר אלקטרוני מהמשתמש הזה",
- "specialmute-header": "× ×\90 ×\9c×\91×\97×\95ר ×\90ת העדפות ההשתקה שלך עבור {{BIDI:[[User:$1]]}}.",
+ "specialmute-label-mute-email": "×\94שתקת ×\94×\95×\93×¢×\95ת דואר אלקטרוני מהמשתמש הזה",
+ "specialmute-header": "×\91×\97×\99ר×\95ת העדפות ההשתקה שלך עבור {{BIDI:[[User:$1]]}}.",
"specialmute-error-invalid-user": "שם המשתמש המבוקש לא נמצא.",
- "specialmute-error-email-blacklist-disabled": "השתקת משתמשים משליחת דואר אלקטרוני אליך אינה מופעלת.",
+ "specialmute-error-email-blacklist-disabled": "×\94×\90פשר×\95ת ×\9c×\94שתקת ×\9eשת×\9eש×\99×\9d ×\9eש×\9c×\99×\97ת ×\93×\95×\90ר ×\90×\9cק×\98ר×\95× ×\99 ×\90×\9c×\99×\9a ×\90×\99× ×\94 ×\9e×\95פע×\9cת.",
"specialmute-error-email-preferences": "יש לאמת את כתובת הדואר האלקטרוני שלך לפני שתהיה לך אפשרות להשתיק משתמש. אפשר לעשות זאת מהדף [[Special:Preferences]].",
- "specialmute-email-footer": "×\9b×\93×\99 ×\9c× ×\94×\9c ×\90ת ×\94×\94×¢×\93פ×\95ת ×¢×\91×\95ר {{BIDI:$2}} × ×\90 לבקר בדף <$1>.",
- "specialmute-login-required": "× ×\90 ×\9c×\94×\99×\9b× ×¡ ×\9c×\97ש×\91×\95×\9f ×\9b×\93×\99 ×\9cש×\91ות את העדפות ההשתקה שלך.",
+ "specialmute-email-footer": "×\9b×\93×\99 ×\9c× ×\94×\9c ×\90ת ×\94×¢×\93פ×\95ת ק×\91×\9cת ×\94×\93×\95×\90ר ×\94×\90×\9cק×\98ר×\95× ×\99 ×©× ×©×\9c×\97 ×¢×\9cÖ¾×\99×\93×\99 {{BIDI:$2}}, ×\91×\90פשר×\95ת×\9a לבקר בדף <$1>.",
+ "specialmute-login-required": "× ×\93רשת ×\9b× ×\99ס×\94 ×\9c×\97ש×\91×\95×\9f ×\9b×\93×\99 ×\9c×©× ות את העדפות ההשתקה שלך.",
"revid": "גרסה $1",
"pageid": "מזהה דף $1",
"interfaceadmin-info": "$1\n\nההרשאות לעריכת קובצי CSS/JS/JSON של האתר כולו הופרדו לאחרונה מההרשאה <code>editinterface</code>. אם לא ברור לך מדוע קיבלת את הודעת השגיאה הזאת, ר' [[mw:MediaWiki_1.32/interface-admin]].",
"logentry-pagelang-pagelang": "$1 {{GENDER:$2|promijenio|promijenila}} je jezik stranice $3 iz $4 u $5.",
"mediastatistics": "Statistika datoteka",
"mediastatistics-summary": "Slijede statistike postavljenih datoteka koje pokazuju zadnju inačicu datoteke. Starije ili izbrisane inačice nisu prikazane.",
- "mediastatistics-nfiles": "$1 ($2%)",
+ "mediastatistics-nfiles": "$1 ($2 %)",
"mediastatistics-nbytes": "{{PLURAL:$1|$1 bajt|$1 bajta|$1 bajtova}} ($2; $3 %)",
"mediastatistics-bytespertype": "Ukupna veličina datoteka za ovaj odlomak: {{PLURAL:$1|$1 bajt|$1 bajta|$1 bajtova}} ($2; $3%).",
"mediastatistics-allbytes": "Ukupna veličina svih datoteka: {{PLURAL:$1|$1 bajt|$1 bajta|$1 bajtova}} ($2).",
"specialmute-success": "Vaše postavke utišavanja su uspješno ažurirane. Vidite sve utišane korisnike ovdje: [[Special:Preferences]].",
"specialmute-submit": "Potvrdi",
"specialmute-error-invalid-user": "Korisničko ime koje ste tražili nije moguće pronaći.",
- "specialmute-error-email-preferences": "Morate potvrditi svoju email adresu prije nego što možete utišati ovoga korisnika. To možete učiniti putem [[Special:Preferences]].",
- "specialmute-login-required": "Molimo Vas prijavite se da biste promijenili postavke.",
+ "specialmute-error-email-preferences": "Morate potvrditi svoju adresu e-pošte prije nego što možete utišati ovoga korisnika. To možete učiniti putem [[Special:Preferences]].",
+ "specialmute-login-required": "Molimo Vas, prijavite se da biste promijenili postavke.",
"gotointerwiki": "Napuštate projekt {{SITENAME}}",
"gotointerwiki-invalid": "Navedeni naslov nije valjan.",
"gotointerwiki-external": "Napuštate projekt {{SITENAME}} da biste posjetili zasebno mrežno mjesto [[$2]].\n\n<strong>[$1 Nastavljate na $1]</strong>",
"history": "Riwayat halaman",
"history_short": "Versi terdahulu",
"history_small": "riwayat",
- "updatedmarker": "diubah sejak kunjungan terakhir saya",
+ "updatedmarker": "berubah sejak kunjungan terakhir saya",
"printableversion": "Versi cetak",
"permalink": "Pranala permanen",
"print": "Cetak",
"autoblockedtext": "Alamat IP Anda telah terblokir secara otomatis karena digunakan oleh pengguna lain, yang diblokir oleh $1. Pemblokiran dilakukan dengan alasan:\n\n:<em>$2</em>\n\n* Diblokir sejak: $8\n* Blokir kedaluwarsa pada: $6\n* Sasaran pemblokiran: $7\n\nAnda dapat menghubungi $1 atau [[{{MediaWiki:Grouppage-sysop}}|pengurus]] lainnya untuk membicarakan pemblokiran ini.\n\nAnda tidak dapat menggunakan fitur \"{{int:emailuser}}\" kecuali Anda telah memasukkan alamat surel yang sah di [[Special:Preferences|preferensi akun]] Anda dan Anda tidak diblokir untuk menggunakannya.\n\nAlamat IP Anda saat ini adalah $3, dan ID pemblokiran adalah #$5.\nTolong sertakan informasi-informasi ini dalam setiap pertanyaan Anda.",
"systemblockedtext": "Nama pengguna atau alamat IP Anda telah diblokir secara otomatis oleh MediaWiki.\nAlasan yang diberikan adalah:\n\n:<em>$2</em>\n\n* Diblokir sejak: $8\n* Blokir kedaluwarsa pada: $6\n* Sasaran pemblokiran: $7\n\nAlamat IP Anda saat ini adalah $3\nMohon sertakan semua perincian di atas dalam setiap pertanyaan yang Anda ajukan.",
"blockednoreason": "tidak ada alasan yang diberikan",
+ "blockedtext-composite-reason": "Ada pemblokiran berganda terhadap akun Anda dan/atau alamat IP Anda.",
"whitelistedittext": "Anda harus $1 untuk dapat menyunting halaman.",
"confirmedittext": "Anda harus mengkonfirmasikan dulu alamat surel Anda sebelum menyunting halaman.\nHarap masukkan dan validasikan alamat surel Anda melalui [[Special:Preferences|halaman preferensi pengguna]] Anda.",
"nosuchsectiontitle": "Bagian tidak ditemukan",
"mw-widgets-abandonedit-discard": "Buang suntingan",
"mw-widgets-abandonedit-keep": "Lanjutkan penyuntingan",
"mw-widgets-abandonedit-title": "Apakah Anda yakin?",
+ "mw-widgets-copytextlayout-copy": "Salin",
+ "mw-widgets-copytextlayout-copy-fail": "Gagal menyalin ke papan klip.",
+ "mw-widgets-copytextlayout-copy-success": "Salin ke papan klip.",
"mw-widgets-dateinput-no-date": "Tanggal tidak ada yang terpilih",
"mw-widgets-dateinput-placeholder-day": "TTTT-BB-HH",
"mw-widgets-dateinput-placeholder-month": "TTTT-BB",
"restrictionsfield-help": "Satu alamat IP atau rentang CIDR per baris. Untuk mengaktifkan semuanya, gunakan:\n<pre>0.0.0.0/0\n::/0</pre>",
"edit-error-short": "Galat: $1",
"edit-error-long": "Galat:\n\n$1",
+ "specialmute": "Diam",
+ "specialmute-submit": "Konfirmasi",
"revid": "revisi $1",
"pageid": "ID halaman $1",
"rawhtml-notallowed": "Tag <html> tidak dapat digunakan di luar halaman normal.",
"logentry-partialblock-block-ns": "{{PLURAL:$1|名前空間}} $2",
"logentry-partialblock-block": "$1 が {{GENDER:$4|$3}} に対して $7 からの編集を $5 {{GENDER:$2||ブロックしました}} $6",
"logentry-partialblock-reblock": "$1 が {{GENDER:$4|$3}} に対する $7 のブロックの期限を $5 に{{GENDER:$2|変更しました}} $6",
+ "logentry-non-editing-block-block": "$1 が {{GENDER:$4|$3}} に対して編集以外の処理を $5 $6 で{{GENDER:$2||ブロックしました}}",
+ "logentry-non-editing-block-reblock": "$1 が {{GENDER:$4|$3}} に対する特定の編集以外の処理のブロックの期限を $5 $6 に{{GENDER:$2|変更しました}}",
"logentry-suppress-block": "$1 が {{GENDER:$4|$3}} を$5で{{GENDER:$2|ブロックしました}} $6",
"logentry-suppress-reblock": "$1 が {{GENDER:$4|$3}} のブロックの期限を$5に{{GENDER:$2|変更しました}} $6",
"logentry-import-upload": "$1 がファイルをアップロードして $3 を{{GENDER:$2|インポートしました}}",
"edit-error-short": "エラー: $1",
"edit-error-long": "エラー:\n\n\n\n$1",
"specialmute": "ミュート",
+ "specialmute-success": "ミュートの個人設定が更新されました。[[Special:Preferences|ご自分の個人設定ページ]]でミューとした利用者の一覧を確認できます。",
+ "specialmute-submit": "確定",
"specialmute-label-mute-email": "この利用者からのウィキメールをミュートする",
+ "specialmute-header": "{{BIDI:[[User:$1]]}}さんに対するミュートを個人設定で選択してください。",
"specialmute-error-invalid-user": "あなたが要求した利用者名は見つかりませんでした。",
+ "specialmute-error-email-blacklist-disabled": "利用者からメールを受け取らないようにするミュートは設定されていません。",
+ "specialmute-error-email-preferences": "発信者をミューとする準備として、ご自分のeメールアドレスの認証が必要です。手続きは[[Special:Preferences|個人設定]]のページで行います。",
+ "specialmute-email-footer": "{{BIDI:$2}}のeメール発信者の個人設定を変更するには<$1>を開いてください。",
+ "specialmute-login-required": "ミュートの個人設定を変更するにはログインしてください。",
"revid": "版 $1",
"pageid": "ページID $1",
"interfaceadmin-info": "$1\n\nサイト全体のCSS/JavaScriptの編集権限は、最近<code>editinterface</code> 権限から分離されました。なぜこのエラーが表示されたのかわからない場合は、[[mw:MediaWiki_1.32/interface-admin]]をご覧ください。",
"Delim",
"Comjun04",
"Son77391",
- "Jango"
+ "Jango",
+ "D6283"
]
},
"tog-underline": "링크에 밑줄 긋기:",
"logentry-block-block": "$1님이 {{GENDER:$4|$3}}님을 $5 {{GENDER:$2|차단했습니다}} $6",
"logentry-block-unblock": "$1님이 {{GENDER:$4|$3}}님의 {{GENDER:$2|차단을 해제했습니다}}",
"logentry-block-reblock": "$1 님이 {{GENDER:$4|$3}} 님의 차단 기간을 $5(으)로 {{GENDER:$2|바꾸었습니다}} $6",
- "logentry-partialblock-block": "$1님이 {{GENDER:$4|$3}}님을 $7 {{PLURAL:$8|문서를|문서들을}} 편집하지 못하도록 $5 {{GENDER:$2|차단}}했습니다. $6",
+ "logentry-partialblock-block": "$1님이 {{GENDER:$4|$3}}님을 $7 편집하지 못하도록 $5 {{GENDER:$2|차단}}했습니다. $6",
"logentry-suppress-block": "$1님이 {{GENDER:$4|$3}} 사용자를 $5 {{GENDER:$2|차단했습니다}} $6",
"logentry-suppress-reblock": "$1 님이 {{GENDER:$4|$3}} 님의 차단 기간을 $5(으)로 {{GENDER:$2|바꾸었습니다}} $6",
"logentry-import-upload": "$1님이 $3 문서를 파일 올리기로 {{GENDER:$2|가져왔습니다}}",
"edit-error-short": "오류: $1",
"edit-error-long": "오류:\n\n$1",
"specialmute": "알림 미표시",
- "specialmute-success": "ì\95\8c림 미í\91\9cì\8b\9c í\99\98ê²½ ì\84¤ì \95ì\9d´ ì\84±ê³µì \81ì\9c¼ë¡\9c ì\97\85ë\8d°ì\9d´í\8a¸ë\90\98ì\97\88ì\8aµë\8b\88ë\8b¤. [[Special:Preferences]]에서 알림이 표시되지 않는 모든 사용자를 확인하십시오.",
+ "specialmute-success": "ì\95\8c림 미í\91\9cì\8b\9c í\99\98ê²½ ì\84¤ì \95ì\9d´ ì\97\85ë\8d°ì\9d´í\8a¸ë\90\98ì\97\88ì\8aµë\8b\88ë\8b¤. [[Special:Preferences|í\99\98ê²½ ì\84¤ì \95]]에서 알림이 표시되지 않는 모든 사용자를 확인하십시오.",
"specialmute-submit": "확인",
"specialmute-label-mute-email": "이 사용자의 이메일 알림을 표시하지 않습니다",
"specialmute-header": "{{BIDI:[[User:$1]]}}의 알림 미표시 환경 설정을 선택해 주십시오.",
"versionrequired": "Dibutuahan MediaWiki versi $1",
"versionrequiredtext": "MediaWiki versi $1 dibutuahan untuak manggunoan laman ko. Caliak [[Special:Version|versi laman]]",
"ok": "OK",
- "pagetitle": "$1 - {{SITENAME}} bahaso Minang",
+ "pagetitle": "$1 - {{SITENAME}} Minangkabau",
"pagetitle-view-mainpage": "{{SITENAME}} bahaso Minang",
"backlinksubtitle": "← $1",
"retrievedfrom": "Didapek dari \"$1\"",
"minoredit": "Chisto è nu cagnamiénto piccerillo",
"watchthis": "Tiene d'uocchio sta paggena",
"savearticle": "Sarva 'a paggena",
- "savechanges": "Sarva 'e cagnamiénte",
+ "savechanges": "Sarva",
"publishpage": "Pubbreca paggena",
"publishchanges": "Pubbreca 'e cagnamiente",
"savearticle-start": "Sarva 'a paggena...",
"search-filter-title-prefix": "ߞߐߜߍ ߡߍ߲ ߠߎ߬ ߞߎ߲߬ߕߐ߮ ߦߋ߫ ߘߊߡߌ߬ߣߊ߬ ߟߊ߫ \"$1\" ߡߊ߬ ߏ߬ ߟߎ߫ ߟߋ߬ ߘߐߙߐ߲߫ ߢߌߣߌ߲ ߦߴߌ ߘߐ߫.",
"search-filter-title-prefix-reset": "ߞߐߜߍ ߓߍ߯ ߢߌߣߌ߲߫",
"searchresults-title": "ߣߌ߲߬ \"$1\" ߢߌߣߌ߲ߠߌ߲ ߞߐߝߟߌ",
+ "titlematches": "ߞߐߜߍ ߞߎ߲߬ߕߐ߮ ߓߍ߲߬ߢߐ߲߰ߡߊ߬ߣߍ߲߫",
"prevn": "ߕߊ߬ߡߌ߲߬ߣߍ߲ ߠߎ߬ {{PLURAL:$1|$1}}",
"nextn": "ߟߊߕߎ߲߰ߠߊ {{PLURAL:$1|$1}}",
"prev-page": "ߞߐߜߍ ߢߍߕߊ",
"right-editmyuserjs": "ߌ ߖߘߍ߬ߞߊ߬ߣߌ߲߬ JavaScript ߞߐߕߐ߮ ߟߎ߬ ߡߊߦߟߍ߬ߡߊ߲߫",
"right-viewmywatchlist": "ߌ ߖߘߍ߬ߞߊ߬ߣߌ߲߬ ߜߋ߬ߟߎ߲߬ߠߌ߲߬ ߛߙߍߘߍ ߦߋ߫",
"right-editmyoptions": "ߌ ߖߘߍ߬ߞߊ߬ߣߌ߲߬ ߟߊߝߌߛߦߊߟߌ ߡߊߦߟߍ߬ߡߊ߲߫",
+ "right-import": "ߞߐߜߍ ߟߎ߬ ߟߊߛߣߍ߫ ߞߊ߬ ߓߐ߫ ߥߞߌ ߕߐ߭ ߟߎ߬ ߘߐ߫",
+ "right-importupload": "ߞߐߜߍ ߟߎ߬ ߟߊߛߣߍ߫ ߞߊ߬ ߓߐ߫ ߞߐߕߐ߯ ߟߊߦߟߍ߬ߣߍ߲ ߠߎ߬ ߘߐ߫",
+ "right-patrol": "ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߘߏ ߟߎ߬ ߟߊ߫ ߓߍ߬ߙߍ߲߬ߓߍ߬ߙߍ߲߬ߣߍ߲ ߠߎ߬ ߣߐ߬ߣߐ߬.",
+ "right-autopatrol": "ߒ ߖߍ߬ߘߍ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߣߍ߲ ߠߎ߬ ߞߍ߫ ߓߍ߬ߙߍ߲߬ߓߍ߬ߙߍ߲߬ߣߍ߲ ߘߌ߫ ߞߍ߲ߒߖߘߍߦߋ߫ ߓߟߏߡߊ߬",
+ "right-patrolmarks": "ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߞߎߘߊ ߟߎ߬ ߦߋ߫ ߓߍ߬ߙߍ߲߬ߓߍ߬ߙߍ߲߬ߠߌ߲߫ ߣߐ߬ߣߐ߬ߣߍ߲ ߘߌ߫",
"right-unwatchedpages": "ߞߐߜߍ߫ ߜߋ߬ߟߎ߲߬ߓߊߟߌ ߟߎ߬ ߛߙߍߘߍ ߦߋ߫",
"right-mergehistory": "ߞߐߜߍ ߟߊ߫ ߘߐ߬ߝߐ ߟߎ߬ ߞߍߢߐ߲߮ߞߊ߲߬",
"right-userrights": "ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߤߊߞߍ ߓߍ߯ ߡߊߦߟߍ߬ߡߊ߲߫",
"rcfilters-filterlist-feedbacklink": "ߌ ߤߊߞߟߌߣߊ߲ ߝߐ߫ ߊ߲ ߧߋ߫ ߞߊ߬ ߓߍ߲߬ ߛߍ߲ߛߍ߲ߟߊ߲ ߖߐ߯ߙߊ߲ ߠߊ߫ ߞߏ ߡߊ߬.",
"rcfilters-highlightbutton-title": "ߞߐߝߟߌ߫ ߡߊߦߋߙߋ߲ߣߍ߲ ߠߎ߬",
"rcfilters-highlightmenu-title": "ߞߐ߬ߟߐ ߘߏ߫ ߓߊߓߌ߬ߟߊ߬",
+ "rcfilters-filterlist-noresults": "ߛߍ߲ߛߍ߲ߟߊ߲߫ ߡߊ߫ ߛߐ߬ߘߐ߲߬",
"rcfilters-filter-editsbyself-label": "ߡߍ߲ ߠߎ߬ ߡߊߦߟߍ߬ߡߊ߲߬ߣߍ߲߬ ߌ ߓߟߏ߫",
"rcfilters-filter-editsbyself-description": "ߌ ߖߘߍ߬ߞߊ߬ߣߌ߲߬ ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲.",
"rcfilters-filter-editsbyother-label": "ߘߏ ߟߎ߬ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߠߎ߬",
"filedelete-reason-dropdown": "* ߖߏ߰ߛߌ߬ߟߌ ߟߎ߬ ߝߊ߲߬ߓߊ ߞߎ߲߭\n** ߓߊߦߟߍߡߊ߲ ߤߊߞߍ ߕߌߢߍߟߌ\n** ߞߐߕߐ߯ ߓߊߟߌߣߍ߲ ߠߎ߬",
"filedelete-edit-reasonlist": "ߖߏ߰ߛߌ߬ߟߌ ߞߎ߲߭ ߡߊߦߟߍ߬ߡߊ߲߫",
"filedelete-maintenance-title": "ߞߐߕߐ߮ ߕߍ߫ ߛߐ߲߬ ߖߏ߰ߛߌ߬ ߟߊ߫",
+ "mimetype": "MIME ߛߎ߮ߦߊ:",
+ "download": "ߟߊ߬ߖߌ߰ߒ߬ߞߎ߲߬ߠߌ߲",
+ "unwatchedpages": "ߞߐߜߍ߫ ߜߋ߬ߟߎ߲߬ߓߊߟߌ ߟߎ߬",
+ "listredirects": "ߟߊ߬ߞߎ߲߬ߛߌ߲߬ߠߌ߲ ߛߙߍߘߍ ߟߎ߬",
+ "listduplicatedfiles": "ߞߐߕߐ߯ ߓߊߟߌߣߍ߲ ߠߎ߬ ߛߙߍߘߍ",
+ "listduplicatedfiles-entry": "[[:File:$1|$1]] ߓߘߊ߫ [[$3|{{PLURAL:$2|ߓߊߟߌ߫|ߟߎ߬ ߓߊߟߌߣߍ߲߫}}]]",
+ "unusedtemplates": "ߞߙߊߞߏ߫ ߟߊߓߊ߯ߙߊߓߊߟߌ ߟߎ߬",
"unusedtemplateswlh": "ߛߘߌ߬ߜߋ߲ ߜߘߍ ߟߎ߬",
"randompage": "ߞߎ߲߬ߝߍ߬ ߞߐߜߍ",
+ "randompage-nopages": "ߞߐߕߐ߯ ߛߌ߫ ߕߍ߫ ߢߌ߲߬ ߠߎ߬ ߘߐ߫ \n{{PLURAL:$2|ߕߐ߯ߛߓߍ ߞߣߍ|ߕߐ߯ߛߓߍ߫ ߞߣߍ ߟߎ߬}}: $1.",
"randomincategory": "ߓߍ߲߬ߛߋ߲߬ߡߊ߬ ߞߐߜߍ ߦߌߟߡߊ ߘߐ߫",
+ "randomincategory-invalidcategory": "$1 ߕߍ߫ ߦߌߟߡߊ߫ ߕߐ߯ ߓߍ߲߬ߣߍ߲߬ ߘߌ߫.",
"randomincategory-nopages": "ߞߐߜߍ߫ ߛߌ߫ ߕߍ߫ [[:Category:$1|$1]] ߘߌ߫ ߦߌߟߡߊ",
"randomincategory-category": "ߦߌߟߡߊ",
"randomincategory-legend": "ߓߍ߲߬ߛߋ߲߬ߡߊ߬ ߞߐߜߍ ߦߌߟߡߊ ߘߐ߫",
"statistics-pages": "ߞߐߜߍ ߟߎ߬",
"statistics-pages-desc": "ߞߐߜߍ ߡߍ߲ ߓߍ߯ ߦߋ߫ ߥߞߌ ߞߊ߲߬߸ ߦߏ߫ ߞߎߡߊߢߐ߲߯ߦߊ߫ ߞߐߜߍ߸ ߟߊ߬ߞߎ߲߬ߛߌ߲߬ߠߌ߲߸ ߊ߬ ߣߌ߫.",
"statistics-files": "ߞߐߕߐ߮ ߟߊߦߟߍ߬ߣߍ߲ ߠߎ߬",
+ "statistics-edits-average": "ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߡߎ߰ߡߍ ߡߍ߲ ߞߍߣߍ߲߫ ߞߐߜߍ ߡߊ߬",
+ "statistics-users": "ߟߊߓߊ߯ߙߊߓߊ߯ ߛߙߍߘߍߦߊߣߍ߲ ߠߎ߬",
+ "statistics-users-active-desc": "ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߡߍ߲ ߠߎ߬ ߝߊߘߌ߲ߧߊ߫ ߘߊ߫ ߞߏ߫ ߘߏ߫ ߞߍ {{PLURAL:$1|ߕߟߋ߬|$1 ߕߋ߬ߟߋ}} ߟߎ߬ ߞߘߐ߫.",
"pageswithprop-submit": "ߕߊ߯",
"double-redirect-fixer": "ߟߊ߬ߞߎ߲߬ߛߌ߲߬ߠߌ߲ ߘߐߓߍ߲߬ߟߊ߲",
"brokenredirects-edit": "ߊ߬ ߡߊߦߟߍ߬ߡߊ߲߬",
"apisandbox-dynamic-parameters-add-label": "ߟߊ߬ߓߍ߲߬ߢߐ߲߰ߡߊ ߟߊߘߏ߲߬",
"apisandbox-dynamic-parameters-add-placeholder": "ߟߊ߬ߓߍ߲߬ߢߐ߲߰ߡߊ ߕߐ߮",
"apisandbox-dynamic-error-exists": "ߟߊ߬ߓߍ߲߬ߢߐ߲߰ߡߊ ߕߐ߮ \"$1\" ߦߋ߫ ߦߋ߲߬ ߞߘߐ߬ߡߊ߲߬.",
+ "apisandbox-fetch-token": "ߖߐߟߐ߲ߞߐ ߞߍߒߖߘߍߦߋ߫ ߟߝߊߟߌ",
"apisandbox-add-multi": "ߟߊ߬ߘߏ߲߬ߠߌ߲",
"apisandbox-results": "ߞߐߖߋߓߌ ߟߎ߬",
"apisandbox-sending-request": "API ߡߊ߬ߢߌ߬ߣߌ߲߬ߞߊ߬ߟߌ ߗߋߟߌ ߦߴߌ ߘߐ߫...",
"allpagessubmit": "ߥߊ߫",
"allpages-hide-redirects": "ߟߊ߬ߞߎ߲߬ߛߌ߲߬ߠߌ߲ ߢߡߊߘߏ߲߰",
"categories": "ߦߌߟߡߊ ߟߎ߬",
+ "categoriesfrom": "ߦߌߟߡߊ ߟߎ߬ ߦߌ߬ߘߊ߬ߟߌ ߟߊߝߟߐ߫ ߣߌ߲߬ ߡߊ߬:",
+ "deletedcontributions": "ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߊ߫ ߓߟߏߡߊߜߍ߲ ߠߎ߬ ߓߘߊ߫ ߖߏ߬ߛߌ߬",
+ "deletedcontributions-title": "ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߊ߫ ߓߟߏߡߊߜߍ߲ ߓߘߊ߫ ߓߊ߲߫ ߖߏ߬ߛߌ߬ ߟߊ߫",
+ "sp-deletedcontributions-contribs": "ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ ߠߎ߬",
"linksearch": "ߞߐߞߊ߲ߠߊ ߛߘߌ߬ߜߋ߲ ߢߌߣߌ߲ߠߌ߲",
+ "linksearch-ns": "ߕߐ߯ߛߓߍ ߞߣߍ:",
+ "linksearch-ok": "ߢߌߣߌ߲ߠߌ߲",
+ "linksearch-line": "$1 ߦߋ߫ ߛߘߌ߬ߜߋ߲ ߠߋ߬ ߘߌ߫ ߞߊ߬ ߓߐ߫ $2",
+ "listusersfrom": "ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߎ߬ ߦߌ߬ߘߊ߬ߟߌ ߟߊߝߟߐ߫ ߣߌ߲߬ ߡߊ߬:",
+ "listusers-submit": "ߦߌ߬ߘߊ߬ߟߌ",
+ "listusers-noresult": "ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߕߴߦߋ߲߬",
"activeusers-noresult": "ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߕߴߦߋ߲߬",
"listgrouprights-members": "(ߛߌ߲߬ߝߏ߲ ߠߎ߫ ߛߙߍߘߍ)",
"emailuser": "ߗߋߛߓߍ ߗߋ߫ ߣߌ߲߬ ߕߌ߭ ߡߊ߬",
"log-action-filter-suppress-block": "Сокрытие пользователя через блокировки",
"log-action-filter-suppress-reblock": "Сокрытие пользователя через повторное блокирование",
"log-action-filter-upload-upload": "Новая загрузка",
- "log-action-filter-upload-overwrite": "Ð\9fовÑ\82оÑ\80но загÑ\80Ñ\83зиÑ\82Ñ\8c",
- "log-action-filter-upload-revert": "Ð\9eÑ\82каÑ\82иÑ\82Ñ\8c",
+ "log-action-filter-upload-overwrite": "Ð\9fеÑ\80езапиÑ\81Ñ\8c Ñ\84айла",
+ "log-action-filter-upload-revert": "Ð\92озвÑ\80аÑ\82 Ñ\81Ñ\82аÑ\80ой веÑ\80Ñ\81ии Ñ\84айла",
"authmanager-authn-not-in-progress": "Проверка подлинности не выполняется или данные сессии были утеряны. Пожалуйста, начните снова с самого начала.",
"authmanager-authn-no-primary": "Предоставленные учётные данные не могут быть проверены на подлинность.",
"authmanager-authn-no-local-user": "Предоставленные учётные данные не связаны ни с одним участником этой вики.",
"revertmerge": "растави",
"mergelogpagetext": "Испод се налази списак најновијих обједињавања историја једне странице у другу.",
"history-title": "Историја измена странице „$1”",
- "difference-title": "Разлика између измена на страници „$1”",
+ "difference-title": "$1 — разлика између измена",
"difference-title-multipage": "Разлика између страница „$1“ и „$2“",
"difference-multipage": "(разлике између страница)",
"lineno": "Ред $1:",
"svg-long-desc": "SVG датотека, номинално $1 × $2 пиксела, величина: $3",
"svg-long-desc-animated": "Анимирана SVG датотека, номинално: $1 × $2 пиксела, величина: $3",
"svg-long-error": "Неважећа SVG датотека: $1",
- "show-big-image": "Ð\9fÑ\80вобиÑ\82на датотека",
+ "show-big-image": "Ð\9eÑ\80игинална датотека",
"show-big-image-preview": "Величина овог приказа: $1.",
"show-big-image-preview-differ": "Величина $3 прегледа за ову $2 датотеку је $1.",
"show-big-image-other": "$2 {{PLURAL:$2|друга резолуција|друге резолуције|других резолуција}}: $1.",
__METHOD__ );
$lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
+ $dbDomain = $lbFactory->getLocalDomainID();
+
$n = 0;
foreach ( $result as $row ) {
$pageId = intval( $row->page_id );
[ 'rev_page' => $pageId ],
__METHOD__ );
if ( !$latestTime ) {
- $this->output( wfWikiID() . " $pageId [[$name]] can't find latest rev time?!\n" );
+ $this->output( "$dbDomain $pageId [[$name]] can't find latest rev time?!\n" );
continue;
}
$revision = Revision::loadFromTimestamp( $dbw, $title, $latestTime );
if ( is_null( $revision ) ) {
- $this->output( wfWikiID()
- . " $pageId [[$name]] latest time $latestTime, can't find revision id\n" );
+ $this->output(
+ "$dbDomain $pageId [[$name]] latest time $latestTime, can't find revision id\n"
+ );
continue;
}
$id = $revision->getId();
- $this->output( wfWikiID() . " $pageId [[$name]] latest time $latestTime, rev id $id\n" );
+ $this->output( "$dbDomain $pageId [[$name]] latest time $latestTime, rev id $id\n" );
if ( $this->hasOption( 'fix' ) ) {
$page = WikiPage::factory( $title );
$page->updateRevisionOn( $dbw, $revision );
$this->outputStatus( 'Done!' );
if ( $this->hasOption( 'fix' ) ) {
- $this->outputStatus( ' Cleaned up invalid DB keys on ' . wfWikiID() . "!\n" );
+ $dbDomain = WikiMap::getCurrentWikiDbDomain()->getId();
+ $this->outputStatus( " Cleaned up invalid DB keys on $dbDomain!\n" );
}
}
}
if ( count( $batchPaths ) ) { // left-overs
$this->copyFileBatch( array_keys( $batchPaths ), $backendRel, $src, $dst );
- $batchPaths = []; // done
}
$this->output( "\tCopied $count file(s).\n" );
}
if ( count( $batchPaths ) ) { // left-overs
$this->delFileBatch( array_keys( $batchPaths ), $backendRel, $dst );
- $batchPaths = []; // done
}
$this->output( "\tDeleted $count file(s).\n" );
$ops = [];
$fsFiles = [];
$copiedRel = []; // for output message
- $wikiId = $src->getWikiId();
+ $domainId = $src->getDomainId();
// Download the batch of source files into backend cache...
if ( $this->hasOption( 'missingonly' ) ) {
$srcPath = $src->getRootStoragePath() . "/$backendRel/$srcPathRel";
$dstPath = $dst->getRootStoragePath() . "/$backendRel/$srcPathRel";
if ( $this->hasOption( 'utf8only' ) && !mb_check_encoding( $srcPath, 'UTF-8' ) ) {
- $this->error( "$wikiId: Detected illegal (non-UTF8) path for $srcPath." );
+ $this->error( "$domainId: Detected illegal (non-UTF8) path for $srcPath." );
continue;
} elseif ( !$this->hasOption( 'missingonly' )
&& $this->filesAreSame( $src, $dst, $srcPath, $dstPath )
if ( !$fsFile ) {
$src->clearCache( [ $srcPath ] );
if ( $src->fileExists( [ 'src' => $srcPath, 'latest' => 1 ] ) === false ) {
- $this->error( "$wikiId: File '$srcPath' was listed but does not exist." );
+ $this->error( "$domainId: File '$srcPath' was listed but does not exist." );
} else {
- $this->error( "$wikiId: Could not get local copy of $srcPath." );
+ $this->error( "$domainId: Could not get local copy of $srcPath." );
}
continue;
} elseif ( !$fsFile->exists() ) {
// FSFileBackends just return the path for getLocalReference() and paths with
// illegal slashes may get normalized to a different path. This can cause the
// local reference to not exist...skip these broken files.
- $this->error( "$wikiId: Detected possible illegal path for $srcPath." );
+ $this->error( "$domainId: Detected possible illegal path for $srcPath." );
continue;
}
$fsFiles[] = $fsFile; // keep TempFSFile objects alive as needed
// Note: prepare() is usually fast for key/value backends
$status = $dst->prepare( [ 'dir' => dirname( $dstPath ), 'bypassReadOnly' => 1 ] );
if ( !$status->isOK() ) {
- $this->error( print_r( $status->getErrorsArray(), true ) );
- $this->fatalError( "$wikiId: Could not copy $srcPath to $dstPath." );
+ $this->error( print_r( Status::wrap( $status )->getWikiText(), true ) );
+ $this->fatalError( "$domainId: Could not copy $srcPath to $dstPath." );
}
$ops[] = [ 'op' => 'store',
'src' => $fsFile->getPath(), 'dst' => $dstPath, 'overwrite' => 1 ];
}
$elapsed_ms = floor( ( microtime( true ) - $t_start ) * 1000 );
if ( !$status->isOK() ) {
- $this->error( print_r( $status->getErrorsArray(), true ) );
- $this->fatalError( "$wikiId: Could not copy file batch." );
+ $this->error( print_r( Status::wrap( $status )->getWikiText(), true ) );
+ $this->fatalError( "$domainId: Could not copy file batch." );
} elseif ( count( $copiedRel ) ) {
$this->output( "\n\tCopied these file(s) [{$elapsed_ms}ms]:\n\t" .
implode( "\n\t", $copiedRel ) . "\n\n" );
) {
$ops = [];
$deletedRel = []; // for output message
- $wikiId = $dst->getWikiId();
+ $domainId = $dst->getDomainId();
// Determine what files need to be copied over...
foreach ( $dstPathsRel as $dstPathRel ) {
}
$elapsed_ms = floor( ( microtime( true ) - $t_start ) * 1000 );
if ( !$status->isOK() ) {
- $this->error( print_r( $status->getErrorsArray(), true ) );
- $this->fatalError( "$wikiId: Could not delete file batch." );
+ $this->error( print_r( Status::wrap( $status )->getWikiText(), true ) );
+ $this->fatalError( "$domainId: Could not delete file batch." );
} elseif ( count( $deletedRel ) ) {
$this->output( "\n\tDeleted these file(s) [{$elapsed_ms}ms]:\n\t" .
implode( "\n\t", $deletedRel ) . "\n\n" );
return;
} elseif ( count( $promotions ) !== 0 ) {
+ $dbDomain = WikiMap::getCurrentWikiDbDomain()->getId();
$promoText = "User:{$username} into " . implode( ', ', $promotions ) . "...\n";
if ( $exists ) {
- $this->output( wfWikiID() . ": Promoting $promoText" );
+ $this->output( "$dbDomain: Promoting $promoText" );
} else {
- $this->output( wfWikiID() . ": Creating and promoting $promoText" );
+ $this->output( "$dbDomain: Creating and promoting $promoText" );
}
}
if ( !$exists ) {
# Increment site_stats.ss_users
- $ssu = new SiteStatsUpdate( 0, 0, 0, 0, 1 );
+ $ssu = SiteStatsUpdate::factory( [ 'users' => 1 ] );
$ssu->doUpdate();
}
yuml
yyyymmddhhiiss
zcmd
-zerobanner
zerobar
zerobutton
-zeroconfig
zerodontask
-zerodot
zeroinfo
zeronet
-zeroportal
zfile
zhdaemon
zhengzhu
$pageRatePart = '-';
$revRatePart = '-';
}
+
+ $dbDomain = WikiMap::getCurrentWikiDbDomain()->getId();
$this->progress( sprintf(
"%s: %s (ID %d) %d pages (%0.1f|%0.1f/sec all|curr), "
. "%d revs (%0.1f|%0.1f/sec all|curr), ETA %s [max %d]",
- $now, wfWikiID(), $this->ID, $this->pageCount, $pageRate,
+ $now, $dbDomain, $this->ID, $this->pageCount, $pageRate,
$pageRatePart, $this->revCount, $revRate, $revRatePart, $etats,
$this->maxCount
) );
$pageRatePart = '-';
$revRatePart = '-';
}
+
+ $dbDomain = WikiMap::getCurrentWikiDbDomain()->getId();
$this->progress( sprintf(
"%s: %s (ID %d) %d pages (%0.1f|%0.1f/sec all|curr), "
. "%d revs (%0.1f|%0.1f/sec all|curr), %0.1f%%|%0.1f%% "
. "prefetched (all|curr), ETA %s [max %d]",
- $now, wfWikiID(), $this->ID, $this->pageCount, $pageRate,
+ $now, $dbDomain, $this->ID, $this->pageCount, $pageRate,
$pageRatePart, $this->revCount, $revRate, $revRatePart,
$fetchRate, $fetchRatePart, $etats, $this->maxCount
) );
$delta = microtime( true ) - $start;
$rate = ( $delta == 0.0 ) ? 0.0 : $migrated / $delta;
$this->output( sprintf( "%s %d (%0.1f%%) done in %0.1f secs (%0.3f accounts/sec).\n",
- wfWikiID(),
+ WikiMap::getCurrentWikiDbDomain()->getId(),
$migrated,
min( $max, $lastUser ) / $lastUser * 100.0,
$delta,
索羅門群島 所罗门群岛
汶萊 文莱
史瓦濟蘭 斯威士兰
+史瓦帝尼 斯威士兰
斯洛維尼亞 斯洛文尼亚
紐西蘭 新西兰
格瑞那達 格林纳达
波士尼亞與赫塞哥維納 波斯尼亚和黑塞哥维那
辛巴威 津巴布韦
宏都拉斯 洪都拉斯
-千里達托貝哥 特立尼达和托巴哥
萬那杜 瓦努阿图
溫納圖 瓦努阿图
葛摩 科摩罗
電視影集 电视系列剧
原子筆 圆珠笔
智慧卡 智能卡
+尾班車 末班车
+落車 下车
+上落客 上下客
鐵達尼號 泰坦尼克号
轉殖 克隆
空中巴士 空中客车
卑詩省 不列颠哥伦比亚省
丹帕沙 登巴萨
峇里 巴厘
-史瓦帝尼 斯威士兰
皮特肯 皮特凯恩
安地卡 安提瓜
撒拉威阿拉伯 阿拉伯撒哈拉
格瑞那丁 格林纳丁斯
普立茲獎 普利策奖
富比士 福布斯
+聖多美普林西比 圣多美和普林西比
公寓里 公寓裏
窝里斗 窩裏鬥
镇里 鎮裏
+》里 》裏
+空里 空裏
+版本里 版本裏
苑裡 苑裡
霄裡 霄裡
岸裡 岸裡
寫著 寫着
遇著 遇着
殺著 殺着
-驶è\91\97 驶着
+é§\9bè\91\97 é§\9b着
著筆 着筆
著鞭 着鞭
著法 着法
厄瓜多尔 厄瓜多爾
厄瓜多爾 厄瓜多爾
厄瓜多 厄瓜多爾
+馬拉威 馬拉維
百慕大 百慕達
厄利垂亞 厄立特里亞
吉布地 吉布堤
索羅門群島 所羅門群島
文莱 汶萊
史瓦濟蘭 斯威士蘭
+史瓦帝尼 斯威士蘭
斯洛維尼亞 斯洛文尼亞
紐西蘭 新西蘭
格瑞那達 格林納達
沙烏地阿拉伯 沙特阿拉伯
辛巴威 津巴布韋
宏都拉斯 洪都拉斯
-千里達托貝哥 特立尼達和多巴哥
+千里達及托巴哥 特立尼達和多巴哥
萬那杜 瓦努阿圖
葛摩 科摩羅
寮國 老撾
北朝鲜 北韓
寮語 老撾語
寮人民民主共和國 老撾人民民主共和國
+蘇利南 蘇里南
莱特湾 雷伊泰灣
萊特灣 雷伊泰灣
蘭卡威 浮羅交怡
帕拉林匹克 殘疾人奧林匹克
不列颠哥伦比亚省 卑詩省
丹帕沙 登巴薩
-巴厘岛 峇里島
-史瓦帝尼 斯威士蘭
+巴厘 峇里
皮特凯恩 皮特肯
安地卡 安提瓜
撒拉威阿拉伯 阿拉伯撒哈拉
疯牛病 瘋牛症
狂牛症 瘋牛症
普利策奖 普立茲獎
+聖多美普林西比 聖多美和普林西比
+塔希提 大溪地
剖釐 剖厘
一釐 一厘
昇平 升平
+昇起 升起
飛昇 飞升
提昇 提升
高昇 高升
滿拚自盡 满拚自尽
拚生尽死 拚生尽死
拚生盡死 拚生尽死
+崑劇 昆剧
+崑山 昆山
+崑岡 昆冈
+崑崙 昆仑
+崑嵛 昆嵛
+崑曲 昆曲
+崑腔 昆腔
+崑蘇 昆苏
+崑調 昆调
+蘇崑 苏昆
+西崑 西昆
+靈崑 灵昆
+崑承湖 昆承湖
所罗门群岛 索羅門群島
所羅門群島 索羅門群島
文莱 汶萊
-斯威士兰 史瓦濟蘭
-斯威士蘭 史瓦濟蘭
+斯威士兰 史瓦帝尼
+斯威士蘭 史瓦帝尼
斯洛文尼亚 斯洛維尼亞
斯洛文尼亞 斯洛維尼亞
新西兰 紐西蘭
津巴布韦 辛巴威
津巴布韋 辛巴威
洪都拉斯 宏都拉斯
-特立尼达和托巴哥 千里達托貝哥
-特立尼達和多巴哥 千里達托貝哥
+特立尼达和托巴哥 千里達及托巴哥
+特立尼達和多巴哥 千里達及托巴哥
瑙鲁 諾魯
瑙魯 諾魯
瓦努阿图 萬那杜
内罗毕 奈洛比
內羅畢 奈洛比
苏里南 蘇利南
+蘇里南 蘇利南
莫桑比克 莫三比克
莱索托 賴索托
萊索托 賴索托
金沙薩 金夏沙
达累斯萨拉姆 三蘭港
马拉维 馬拉威
+馬拉維 馬拉威
留尼汪 留尼旺
布隆方丹 布隆泉
厄瓜多 厄瓜多
东南亚国家联盟 東南亞國家協會
東南亞國家聯盟 東南亞國家協會
哥特式 哥德式
+尾班車 末班車
落車 下車
上落客 上下客
集装箱 貨櫃
不列颠哥伦比亚省 卑詩省
登巴萨 丹帕沙
登巴薩 丹帕沙
-巴厘岛 峇里島
-斯威士兰 史瓦帝尼
-斯威士蘭 史瓦帝尼
+巴厘 峇里
皮特凯恩 皮特肯
安提瓜 安地卡
阿拉伯撒哈拉 撒拉威阿拉伯
格林納丁斯 格瑞那丁
空中客车 空中巴士
普利策奖 普立茲獎
+圣多美和普林西比 聖多美普林西比
+聖多美和普林西比 聖多美普林西比
+塔希提 大溪地
黄岩县 黃巖縣
黄岩区 黃巖區
北仑河 北崙河
+昆剧 崑劇
+昆山 崑山
+昆冈 崑岡
+昆仑 崑崙
昆嵛 崑嵛
-昆承湖 崑承湖
+昆曲 崑曲
+昆腔 崑腔
+昆苏 崑蘇
+昆调 崑調
+苏昆 蘇崑
+西昆 西崑
灵昆 靈崑
+昆承湖 崑承湖
龙岩 龍巖
扑冬 撲鼕
冬冬鼓 鼕鼕鼓
U+05C6D屭|U+05C43屃|
U+05C85岅|U+05742坂|
U+05CDD峝|U+05CD2峒|
-U+05D11崑|U+06606昆|
U+05D19崙|U+04ED1仑|
U+05D57嵗|U+05C81岁|
U+05D7D嵽|U+2BD87𫶇|
這只比
這只限
這只應
+這只要
這只不過
這只包括
那只能
那只比
那只限
那只應
+那只要
那只不過
那只包括
多只能
黑奴籲天錄
林郁方
讚歌
-崑山
-崑曲
-崑腔
-崑調
-崑劇
-崑蘇
-蘇崑
一干家中
星期後
依依不捨
于禁
于敏中
註：# 不作“注：”
+關注：
劃為# 不作“划為”
一個# 避免“個裡”的錯誤
兩個
殿裡
隊裡
詞裡
+》裡
+空裡
+版本裡
裏白 #植物常用名
烏蘇里 #分詞用
夸脫
于丹
于冕
于吉
+於吉林
于堅
于姓
于氏
米瀋
拾瀋
姦污
-託兒
同人誌
文學誌
衝着
燉製
煮製
熬製
+包製
+製漢字 #和製漢字等
遏制 #以下分詞用
管制
抑制
胎發生
結發育
結發表
+金發放
+理發放
古人有云
昔人有云
云敞
哈囉喂
松口鎮
岩松了
+松開始
沙瑯
琺瑯
菜餚
關系統
關系所
關系科
-崑崙
-崑山
-崑劇
-崑曲
-崑腔
-崑蘇
-崑調
-崑岡
-西崑
-蘇崑
銹病
嚐糞
if ( $delete ) {
$this->output( "Updating site stats..." );
$ga = $isGoodArticle ? -1 : 0; // if it was good, decrement that too
- $stats = new SiteStatsUpdate( 0, -$count, $ga, -1 );
+ $stats = SiteStatsUpdate::factory( [
+ 'edits' => -$count,
+ 'articles' => $ga,
+ 'pages' => -1
+ ] );
$stats->doUpdate();
$this->output( "done.\n" );
}
if ( $this->replicaId !== false ) {
$header .= "({$this->replicaId})";
}
- $header .= ' ' . wfWikiID();
+ $header .= ' ' . WikiMap::getCurrentWikiDbDomain()->getId();
LegacyLogger::emit( sprintf( "%-50s %s\n", $header, $msg ), $file );
}
$src = FileBackendGroup::singleton()->get( $this->getOption( 'src' ) );
$posDir = $this->getOption( 'posdir' );
- $posFile = $posDir ? $posDir . '/' . wfWikiID() : false;
+ if ( $posDir != '' ) {
+ $posFile = "$posDir/" . rawurlencode( $src->getDomainId() );
+ } else {
+ $posFile = false;
+ }
if ( $this->hasOption( 'posdump' ) ) {
// Just dump the current position into the specified position dir
require_once __DIR__ . '/Maintenance.php';
use Wikimedia\Rdbms\IMaintainableDatabase;
+use Wikimedia\Rdbms\DatabaseSqlite;
/**
* Maintenance script to run database schema updates.
$this->fatalError( $text );
}
- $this->output( "Going to run database updates for " . wfWikiID() . "\n" );
+ $dbDomain = WikiMap::getCurrentWikiDbDomain()->getId();
+ $this->output( "Going to run database updates for $dbDomain\n" );
if ( $db->getType() === 'sqlite' ) {
/** @var IMaintainableDatabase|DatabaseSqlite $db */
$this->output( "Using SQLite file: '{$db->getDbFilePath()}'\n" );
}
public function execute() {
- $posFile = $this->getOption( 'p', 'searchUpdate.' . wfWikiID() . '.pos' );
+ $dbDomain = WikiMap::getCurrentWikiDbDomain()->getId();
+ $posFile = $this->getOption( 'p', 'searchUpdate.' . rawurlencode( $dbDomain ) . '.pos' );
$end = $this->getOption( 'e', wfTimestampNow() );
if ( $this->hasOption( 's' ) ) {
$start = $this->getOption( 's' );
</exclude>
</groups>
<filter>
- <whitelist addUncoveredFilesFromWhitelist="true">
+ <whitelist addUncoveredFilesFromWhitelist="false">
<directory suffix=".php">includes</directory>
<directory suffix=".php">languages</directory>
<directory suffix=".php">maintenance</directory>
+ <directory suffix=".php">extensions</directory>
+ <directory suffix=".php">skins</directory>
<exclude>
<directory suffix=".php">languages/messages</directory>
<file>languages/data/normalize-ar.php</file>
font-weight: bold;
}
-/* success and error messages */
+/* Error, warning and success messages */
.error,
.warning,
.success {
}
.warning {
- color: #705000;
+ color: #ac6600;
}
.success {
- color: #009000;
+ color: #14866d;
}
.errorbox,
padding: 0.5em 1em;
margin-bottom: 1em;
display: inline-block;
- zoom: 1;
- *display: inline; /* stylelint-disable-line declaration-block-no-duplicate-properties */
}
.errorbox h2,
.warningbox h2,
.successbox h2 {
- font-size: 1em;
color: inherit;
+ font-size: 1em;
font-weight: bold;
display: inline;
margin: 0 0.5em 0 0;
}
.errorbox {
- color: #d33;
- border-color: #fac5c5;
- background-color: #fae3e3;
+ background-color: #fee7e6;
+ color: #000;
+ border-color: #d33;
}
.warningbox {
- color: #705000;
- border-color: #fde29b;
- background-color: #fdf1d1;
+ background-color: #fef6e7;
+ color: #000;
+ border-color: #fc3;
}
.successbox {
- color: #008000;
- border-color: #b7fdb5;
- background-color: #e1fddf;
+ background-color: #d5fdf4;
+ color: #000;
+ border-color: #14866d;
}
/* general info/warning box for SP */
.mw-infobox {
- border: 2px solid #ff7f00;
+ border: 2px solid #fc3;
margin: 0.5em;
clear: left;
overflow: hidden;
// Text colors
@colorText: @colorGray2;
+@colorTextEmphasized: @colorGray1;
@colorTextLight: @colorGray5;
@colorButtonText: @colorGray2;
@colorButtonTextHighlight: @colorGray4;
// Form input sizes, equal to OOUI at 14px base font-size
@sizeInputBinary: 1.5625em;
+
+// Messages
+@backgroundColorError: #fee7e6;
+@borderColorError: #d33;
+@backgroundColorWarning: #fef6e7;
+@borderColorWarning: #fc3;
.box-sizing( border-box );
font-size: 0.9em;
margin: 0 0 1em 0;
- padding: 0.5em;
+ padding: 0.5em 1em;
word-wrap: break-word;
}
// Colours taken from those for .errorbox in shared.css
.error {
- color: @colorErrorText;
- border: 1px solid #fac5c5;
- background-color: #fae3e3;
+ background-color: @backgroundColorError;
+ color: @colorTextEmphasized;
+ border: 1px solid @borderColorError;
}
// Colours taken from those for .warningbox in shared.css
.warning {
- color: @colorWarningText;
- border: 1px solid #fde29b;
- background-color: #fdf1d1;
+ background-color: @backgroundColorWarning;
+ color: @colorTextEmphasized;
+ border: 1px solid @borderColorWarning;
}
// This specifies styling for individual field validation error messages.
public static function applyInitialConfig() {
global $wgMainCacheType, $wgMessageCacheType, $wgParserCacheType, $wgMainWANCache;
global $wgMainStash;
+ global $wgObjectCaches;
global $wgLanguageConverterCacheType, $wgUseDatabaseMessages;
global $wgLocaltimezone, $wgLocalisationCacheConf;
global $wgSearchType;
$wgLanguageConverterCacheType = 'hash';
// Uses db-replicated in DefaultSettings
$wgMainStash = 'hash';
+ // Use hash instead of db
+ $wgObjectCaches['db-replicated'] = $wgObjectCaches['hash'];
// Use memory job queue
$wgJobTypeConf = [
'default' => [ 'class' => JobQueueMemory::class, 'order' => 'fifo' ],
// Wipe WANObjectCache process cache, which is invalidated by article insertion
// due to T144706
- ObjectCache::getMainWANInstance()->clearProcessCache();
+ MediaWikiServices::getInstance()->getMainWANObjectCache()->clearProcessCache();
$this->executeSetupSnippets( $teardown );
}
protected $type = ResourceLoaderModule::LOAD_GENERAL;
protected $targets = [ 'phpunit' ];
protected $shouldEmbed = null;
+ protected $mayValidateScript = false;
public function __construct( $options = [] ) {
foreach ( $options as $key => $value ) {
}
public function getScript( ResourceLoaderContext $context ) {
- return $this->validateScriptFile( 'input', $this->script );
+ if ( $this->mayValidateScript ) {
+ // This enables the validation check that replaces invalid
+ // scripts with a warning message.
+ // Based on $wgResourceLoaderValidateJS
+ return $this->validateScriptFile( 'input', $this->script );
+ } else {
+ return $this->script;
+ }
}
public function getStyles( ResourceLoaderContext $context ) {
/**
* @dataProvider provideDomainCheck
- * @covers \MediaWiki\Revision\RevisionStore::checkDatabaseWikiId
+ * @covers \MediaWiki\Revision\RevisionStore::checkDatabaseDomain
*/
public function testDomainCheck( $wikiId, $dbName, $dbPrefix ) {
$this->setMwGlobals(
<?php
+use MediaWiki\Interwiki\InterwikiLookup;
use MediaWiki\Linker\LinkTarget;
use MediaWiki\MediaWikiServices;
use Wikimedia\TestingAccessWrapper;
# Title, expected base, optional message
[ 'User:John_Doe/subOne/subTwo', 'John Doe' ],
[ 'User:Foo / Bar / Baz', 'Foo ' ],
+ [ 'Talk:////', '////' ],
+ [ 'Template:////', '////' ],
+ [ 'Template:Foo////', 'Foo' ],
+ [ 'Template:Foo////Bar', 'Foo' ],
];
}
];
}
+ public function provideSubpage() {
+ // NOTE: avoid constructing Title objects in the provider, since it may access the database.
+ return [
+ [ 'Foo', 'x', new TitleValue( NS_MAIN, 'Foo/x' ) ],
+ [ 'Foo#bar', 'x', new TitleValue( NS_MAIN, 'Foo/x' ) ],
+ [ 'User:Foo', 'x', new TitleValue( NS_USER, 'Foo/x' ) ],
+ [ 'wiki:User:Foo', 'x', new TitleValue( NS_MAIN, 'User:Foo/x', '', 'wiki' ) ],
+ ];
+ }
+
+ /**
+ * @dataProvider provideSubpage
+ * @covers Title::getSubpage
+ */
+ public function testSubpage( $title, $sub, LinkTarget $expected ) {
+ $interwikiLookup = $this->getMock( InterwikiLookup::class );
+ $interwikiLookup->expects( $this->any() )
+ ->method( 'isValidInterwiki' )
+ ->willReturnCallback(
+ function ( $prefix ) {
+ return $prefix == 'wiki';
+ }
+ );
+
+ $this->setService( 'InterwikiLookup', $interwikiLookup );
+
+ $title = Title::newFromText( $title );
+ $expected = Title::newFromLinkTarget( $expected );
+ $actual = $title->getSubpage( $sub );
+
+ // NOTE: convert to string for comparison
+ $this->assertSame( $expected->getPrefixedText(), $actual->getPrefixedText(), 'text form' );
+ $this->assertTrue( $expected->equals( $actual ), 'Title equality' );
+ }
+
public static function provideNewFromTitleValue() {
return [
[ new TitleValue( NS_MAIN, 'Foo' ) ],
$this->assertEquals( $wiki, WikiMap::getWikiFromUrl( $url ) );
}
- public function provideGetWikiIdFromDomain() {
+ public function provideGetWikiIdFromDbDomain() {
return [
[ 'db-prefix_', 'db-prefix_' ],
[ wfWikiID(), wfWikiID() ],
}
/**
- * @dataProvider provideGetWikiIdFromDomain
+ * @dataProvider provideGetWikiIdFromDbDomain
* @covers WikiMap::getWikiIdFromDbDomain()
*/
- public function testGetWikiIdFromDomain( $domain, $wikiId ) {
+ public function testGetWikiIdFromDbDomain( $domain, $wikiId ) {
$this->assertEquals( $wikiId, WikiMap::getWikiIdFromDbDomain( $domain ) );
}
new TitleValue( 1, 'ApiQueryWatchlistRawIntegrationTestPage1' ),
] );
- ObjectCache::getMainWANInstance()->clearProcessCache();
+ MediaWikiServices::getInstance()->getMainWANObjectCache()->clearProcessCache();
$result = $this->doListWatchlistRawRequest( [
'wrowner' => $otherUser->getName(),
'wrtoken' => '1234567890',
}
) );
$lb1->method( 'getMasterPos' )->willReturn( $m1Pos );
+ $lb1->method( 'getReplicaResumePos' )->willReturn( $m1Pos );
$lb1->method( 'getServerName' )->with( 0 )->willReturn( 'master1' );
// Master DB 2
$mockDB2 = $this->getMockBuilder( IDatabase::class )
}
) );
$lb2->method( 'getMasterPos' )->willReturn( $m2Pos );
+ $lb2->method( 'getReplicaResumePos' )->willReturn( $m2Pos );
$lb2->method( 'getServerName' )->with( 0 )->willReturn( 'master2' );
$bag = new HashBagOStuff();
}
/**
- * @covers LoadBalancer::getLocalDomainID()
- * @covers LoadBalancer::resolveDomainID()
+ * @covers \Wikimedia\Rdbms\LoadBalancer::getConnection()
+ * @covers \Wikimedia\Rdbms\LoadBalancer::getLocalDomainID()
+ * @covers \Wikimedia\Rdbms\LoadBalancer::resolveDomainID()
+ * @covers \Wikimedia\Rdbms\LoadBalancer::haveIndex()
+ * @covers \Wikimedia\Rdbms\LoadBalancer::isNonZeroLoad()
*/
public function testWithoutReplica() {
global $wgDBname;
}
] );
+ $this->assertEquals( 1, $lb->getServerCount() );
+ $this->assertFalse( $lb->hasReplicaServers() );
+ $this->assertFalse( $lb->hasStreamingReplicaServers() );
+
+ $this->assertTrue( $lb->haveIndex( 0 ) );
+ $this->assertFalse( $lb->haveIndex( 1 ) );
+ $this->assertFalse( $lb->isNonZeroLoad( 0 ) );
+ $this->assertFalse( $lb->isNonZeroLoad( 1 ) );
+
$ld = DatabaseDomain::newFromId( $lb->getLocalDomainID() );
$this->assertEquals( $wgDBname, $ld->getDatabase(), 'local domain DB set' );
$this->assertEquals( $this->dbPrefix(), $ld->getTablePrefix(), 'local domain prefix set' );
$lb->closeAll();
}
+ /**
+ * @covers \Wikimedia\Rdbms\LoadBalancer::getConnection()
+ * @covers \Wikimedia\Rdbms\LoadBalancer::getReaderIndex()
+ * @covers \Wikimedia\Rdbms\LoadBalancer::getWriterIndex()
+ * @covers \Wikimedia\Rdbms\LoadBalancer::haveIndex()
+ * @covers \Wikimedia\Rdbms\LoadBalancer::isNonZeroLoad()
+ * @covers \Wikimedia\Rdbms\LoadBalancer::getServerName()
+ * @covers \Wikimedia\Rdbms\LoadBalancer::getServerInfo()
+ * @covers \Wikimedia\Rdbms\LoadBalancer::getServerType()
+ * @covers \Wikimedia\Rdbms\LoadBalancer::getServerAttributes()
+ */
public function testWithReplica() {
global $wgDBserver;
$this->assertTrue( $lb->hasReplicaServers() );
$this->assertTrue( $lb->hasStreamingReplicaServers() );
+ $this->assertTrue( $lb->haveIndex( 0 ) );
+ $this->assertTrue( $lb->haveIndex( 1 ) );
+ $this->assertFalse( $lb->isNonZeroLoad( 0 ) );
+ $this->assertTrue( $lb->isNonZeroLoad( 1 ) );
+
+ for ( $i = 0; $i < $lb->getServerCount(); ++$i ) {
+ $this->assertType( 'string', $lb->getServerName( $i ) );
+ $this->assertType( 'array', $lb->getServerInfo( $i ) );
+ $this->assertType( 'string', $lb->getServerType( $i ) );
+ $this->assertType( 'array', $lb->getServerAttributes( $i ) );
+ }
+
$dbw = $lb->getConnection( DB_MASTER );
$this->assertTrue( $dbw->getLBInfo( 'master' ), 'master shows as master' );
$this->assertEquals(
'cluster master set' );
$this->assertTrue( $dbr->getFlag( $dbw::DBO_TRX ), "DBO_TRX set on replica" );
$this->assertWriteForbidden( $dbr );
+ $this->assertEquals( $dbr->getLBInfo( 'serverIndex' ), $lb->getReaderIndex() );
if ( !$lb->getServerAttributes( $lb->getWriterIndex() )[$dbw::ATTR_DB_LEVEL_LOCKING] ) {
$dbwAuto = $lb->getConnection( DB_MASTER, [], false, $lb::CONN_TRX_AUTOCOMMIT );
}
/**
- * @covers LoadBalancer::openConnection()
- * @covers LoadBalancer::getAnyOpenConnection()
+ * @covers \Wikimedia\Rdbms\LoadBalancer::getConnection()
+ * @covers \Wikimedia\Rdbms\LoadBalancer::openConnection()
+ * @covers \Wikimedia\Rdbms\LoadBalancer::getAnyOpenConnection()
+ * @covers \Wikimedia\Rdbms\LoadBalancer::getWriterIndex()
*/
function testOpenConnection() {
$lb = $this->newSingleServerLocalLoadBalancer();
$lb->closeAll();
}
+ /**
+ * @covers \Wikimedia\Rdbms\LoadBalancer::openConnection()
+ * @covers \Wikimedia\Rdbms\LoadBalancer::getWriterIndex()
+ * @covers \Wikimedia\Rdbms\LoadBalancer::forEachOpenMasterConnection()
+ * @covers \Wikimedia\Rdbms\LoadBalancer::setTransactionListener()
+ * @covers \Wikimedia\Rdbms\LoadBalancer::beginMasterChanges()
+ * @covers \Wikimedia\Rdbms\LoadBalancer::finalizeMasterChanges()
+ * @covers \Wikimedia\Rdbms\LoadBalancer::approveMasterChanges()
+ * @covers \Wikimedia\Rdbms\LoadBalancer::commitMasterChanges()
+ * @covers \Wikimedia\Rdbms\LoadBalancer::runMasterTransactionIdleCallbacks()
+ * @covers \Wikimedia\Rdbms\LoadBalancer::runMasterTransactionListenerCallbacks()
+ */
public function testTransactionCallbackChains() {
global $wgDBserver, $wgDBname, $wgDBuser, $wgDBpassword, $wgDBtype, $wgSQLiteDataDir;
$conn2->close();
}
+ /**
+ * @covers \Wikimedia\Rdbms\LoadBalancer::getConnectionRef
+ * @covers \Wikimedia\Rdbms\LoadBalancer::getConnection()
+ */
public function testDBConnRefReadsMasterAndReplicaRoles() {
$lb = $this->newSingleServerLocalLoadBalancer();
}
/**
+ * @covers \Wikimedia\Rdbms\LoadBalancer::getConnectionRef
* @expectedException \Wikimedia\Rdbms\DBReadOnlyRoleError
*/
public function testDBConnRefWritesReplicaRole() {
}
/**
+ * @covers \Wikimedia\Rdbms\LoadBalancer::getConnectionRef
* @expectedException \Wikimedia\Rdbms\DBReadOnlyRoleError
*/
public function testDBConnRefWritesReplicaRoleIndex() {
}
/**
+ * @covers \Wikimedia\Rdbms\LoadBalancer::getConnectionRef
* @expectedException \Wikimedia\Rdbms\DBReadOnlyRoleError
*/
public function testDBConnRefWritesReplicaRoleInsert() {
$rConn->insert( 'test', [ 't' => 1 ], __METHOD__ );
}
+ /**
+ * @covers \Wikimedia\Rdbms\LoadBalancer::getConnection()
+ * @covers \Wikimedia\Rdbms\LoadBalancer::getMaintenanceConnectionRef()
+ */
public function testQueryGroupIndex() {
$lb = $this->newMultiServerLocalLoadBalancer( [ 'defaultGroup' => false ] );
/** @var LoadBalancer $lbWrapper */
$rRC = $lb->getConnectionRef( DB_REPLICA, [ 'recentchanges' ] );
$rWL = $lb->getConnectionRef( DB_REPLICA, [ 'watchlist' ] );
+ $rRCMaint = $lb->getMaintenanceConnectionRef( DB_REPLICA, [ 'recentchanges' ] );
+ $rWLMaint = $lb->getMaintenanceConnectionRef( DB_REPLICA, [ 'watchlist' ] );
$this->assertEquals( 3, $rRC->getLBInfo( 'serverIndex' ) );
$this->assertEquals( 3, $rWL->getLBInfo( 'serverIndex' ) );
+ $this->assertEquals( 3, $rRCMaint->getLBInfo( 'serverIndex' ) );
+ $this->assertEquals( 3, $rWLMaint->getLBInfo( 'serverIndex' ) );
$rLog = $lb->getConnectionRef( DB_REPLICA, [ 'logging', 'watchlist' ] );
$logIndexPicked = $rLog->getLBInfo( 'serverIndex' );
$rGeneric = $lb->getConnectionRef( DB_REPLICA );
$this->assertEquals( $lb->getWriterIndex(), $rGeneric->getLBInfo( 'serverIndex' ) );
}
+
+ /**
+ * @covers \Wikimedia\Rdbms\LoadBalancer::getLazyConnectionRef
+ */
+ public function testGetLazyConnectionRef() {
+ $lb = $this->newMultiServerLocalLoadBalancer();
+
+ $rMaster = $lb->getLazyConnectionRef( DB_MASTER );
+ $rReplica = $lb->getLazyConnectionRef( 1 );
+ $this->assertFalse( $lb->getAnyOpenConnection( 0 ) );
+ $this->assertFalse( $lb->getAnyOpenConnection( 1 ) );
+
+ $rMaster->getType();
+ $rReplica->getType();
+ $rMaster->getDomainID();
+ $rReplica->getDomainID();
+ $this->assertFalse( $lb->getAnyOpenConnection( 0 ) );
+ $this->assertFalse( $lb->getAnyOpenConnection( 1 ) );
+
+ $rMaster->query( "SELECT 1", __METHOD__ );
+ $this->assertNotFalse( $lb->getAnyOpenConnection( 0 ) );
+
+ $rReplica->query( "SELECT 1", __METHOD__ );
+ $this->assertNotFalse( $lb->getAnyOpenConnection( 0 ) );
+ $this->assertNotFalse( $lb->getAnyOpenConnection( 1 ) );
+ }
}
$fi = SiteStats::images();
$ai = SiteStats::articles();
+ $this->assertEquals( 0, DeferredUpdates::pendingUpdatesCount() );
+
$dbw->begin( __METHOD__ ); // block opportunistic updates
- $update = SiteStatsUpdate::factory( [ 'pages' => 2, 'images' => 1, 'edits' => 2 ] );
- $this->assertEquals( 0, DeferredUpdates::pendingUpdatesCount() );
- $update->doUpdate();
+ DeferredUpdates::addUpdate(
+ SiteStatsUpdate::factory( [ 'pages' => 2, 'images' => 1, 'edits' => 2 ] )
+ );
$this->assertEquals( 1, DeferredUpdates::pendingUpdatesCount() );
// Still the same
--- /dev/null
+<?php
+
+use PHPUnit\Framework\TestCase;
+
+class HTTPFileStreamerTest extends TestCase {
+
+ /**
+ * @covers HTTPFileStreamer::preprocessHeaders
+ * @dataProvider providePreprocessHeaders
+ */
+ public function testPreprocessHeaders( array $input, array $expectedRaw, array $expectedOpt ) {
+ list( $actualRaw, $actualOpt ) = HTTPFileStreamer::preprocessHeaders( $input );
+ $this->assertSame( $expectedRaw, $actualRaw );
+ $this->assertSame( $expectedOpt, $actualOpt );
+ }
+
+ public function providePreprocessHeaders() {
+ return [
+ [
+ [ 'Vary' => 'cookie', 'Cache-Control' => 'private' ],
+ [ 'Vary: cookie', 'Cache-Control: private' ],
+ [],
+ ],
+ [
+ [
+ 'Range' => 'bytes=(123-456)',
+ 'Content-Type' => 'video/mp4',
+ 'If-Modified-Since' => 'Wed, 21 Oct 2015 07:28:00 GMT',
+ ],
+ [ 'Content-Type: video/mp4' ],
+ [ 'range' => 'bytes=(123-456)', 'if-modified-since' => 'Wed, 21 Oct 2015 07:28:00 GMT' ],
+ ],
+ ];
+ }
+
+}
);
}
+ /**
+ * @covers MapCacheLRU::has()
+ * @covers MapCacheLRU::get()
+ * @covers MapCacheLRU::set()
+ */
+ function testMissing() {
+ $raw = [ 'a' => 1, 'b' => 2, 'c' => 3 ];
+ $cache = MapCacheLRU::newFromArray( $raw, 3 );
+
+ $this->assertFalse( $cache->has( 'd' ) );
+ $this->assertNull( $cache->get( 'd' ) );
+ $this->assertNull( $cache->get( 'd', 0.0, null ) );
+ $this->assertFalse( $cache->get( 'd', 0.0, false ) );
+ }
+
/**
* @covers MapCacheLRU::has()
* @covers MapCacheLRU::get()
* @param int $ttl
*/
public function testSetAndGet( $value, $ttl ) {
+ $cache = $this->cache;
+
$curTTL = null;
$asOf = null;
- $key = $this->cache->makeKey( 'x', wfRandomString() );
+ $key = $cache->makeKey( 'x', wfRandomString() );
- $this->cache->get( $key, $curTTL, [], $asOf );
+ $cache->get( $key, $curTTL, [], $asOf );
$this->assertNull( $curTTL, "Current TTL is null" );
$this->assertNull( $asOf, "Current as-of-time is infinite" );
$t = microtime( true );
- $this->cache->set( $key, $value, $ttl );
- $this->assertEquals( $value, $this->cache->get( $key, $curTTL, [], $asOf ) );
+ $cache->set( $key, $value, $cache::TTL_UNCACHEABLE );
+ $cache->get( $key, $curTTL, [], $asOf );
+ $this->assertNull( $curTTL, "Current TTL is null (TTL_UNCACHEABLE)" );
+ $this->assertNull( $asOf, "Current as-of-time is infinite (TTL_UNCACHEABLE)" );
+
+ $cache->set( $key, $value, $ttl );
+
+ $this->assertEquals( $value, $cache->get( $key, $curTTL, [], $asOf ) );
if ( is_infinite( $ttl ) || $ttl == 0 ) {
$this->assertTrue( is_infinite( $curTTL ), "Current TTL is infinite" );
} else {
$this->assertEquals( 6, $hit, "New values cached" );
foreach ( $keys as $i => $key ) {
- // Should evict from process cache
+ // Should not evict from process cache
$this->cache->delete( $key );
$mockWallClock += 0.001; // cached values will be newer than tombstone
// Get into cache (specific process cache group)
/**
* @dataProvider getWithSetCallback_provider
* @covers WANObjectCache::getWithSetCallback()
- * @covers WANObjectCache::doGetWithSetCallback()
+ * @covers WANObjectCache::fetchOrRegenerate()
* @param array $extOpts
* @param bool $versioned
*/
$curTTL = null;
$v = $cache->get( $key, $curTTL, [ $cKey1, $cKey2 ] );
- if ( $versioned ) {
- $this->assertEquals( $value, $v[$cache::VFLD_DATA], "Value returned" );
- } else {
- $this->assertEquals( $value, $v, "Value returned" );
- }
+ $this->assertEquals( $value, $v, "Value returned" );
$this->assertLessThanOrEqual( 0, $curTTL, "Value has current TTL < 0 due to check keys" );
$wasSet = 0;
/**
* @dataProvider getWithSetCallback_provider
* @covers WANObjectCache::getWithSetCallback()
- * @covers WANObjectCache::doGetWithSetCallback()
+ * @covers WANObjectCache::fetchOrRegenerate()
* @param array $extOpts
* @param bool $versioned
*/
$this->assertEquals( 2, $wasSet, "Value re-calculated" );
}
- /**
- * @covers WANObjectCache::getWithSetCallback()
- * @covers WANObjectCache::doGetWithSetCallback()
- */
- public function testGetWithSetCallback_invalidCallback() {
- $this->setExpectedException( InvalidArgumentException::class );
- $this->cache->getWithSetCallback( 'key', 30, 'invalid callback' );
- }
-
/**
* @dataProvider getMultiWithSetCallback_provider
* @covers WANObjectCache::getMultiWithSetCallback
$value = "@efef$";
$keyedIds = new ArrayIterator( [ $keyB => 'efef' ] );
$v = $cache->getMultiWithSetCallback(
- $keyedIds, 30, $genFunc, [ 'lowTTL' => 0, 'lockTSE' => 5, ] + $extOpts );
+ $keyedIds, 30, $genFunc, [ 'lowTTL' => 0, 'lockTSE' => 5 ] + $extOpts );
$this->assertEquals( $value, $v[$keyB], "Value returned" );
$this->assertEquals( 1, $wasSet, "Value regenerated" );
- $this->assertEquals( 0, $cache->getWarmupKeyMisses(), "Keys warmed yet in process cache" );
+ $this->assertEquals( 0, $cache->getWarmupKeyMisses(), "Keys warmed in warmup cache" );
+
$v = $cache->getMultiWithSetCallback(
- $keyedIds, 30, $genFunc, [ 'lowTTL' => 0, 'lockTSE' => 5, ] + $extOpts );
+ $keyedIds, 30, $genFunc, [ 'lowTTL' => 0, 'lockTSE' => 5 ] + $extOpts );
$this->assertEquals( $value, $v[$keyB], "Value returned" );
$this->assertEquals( 1, $wasSet, "Value not regenerated" );
- $this->assertEquals( 0, $cache->getWarmupKeyMisses(), "Keys warmed in process cache" );
+ $this->assertEquals( 0, $cache->getWarmupKeyMisses(), "Keys warmed in warmup cache" );
$mockWallClock += 1;
$curTTL = null;
$v = $cache->get( $keyC, $curTTL, [ $cKey1, $cKey2 ] );
- if ( $versioned ) {
- $this->assertEquals( $value, $v[$cache::VFLD_DATA], "Value returned" );
- } else {
- $this->assertEquals( $value, $v, "Value returned" );
- }
+ $this->assertEquals( $value, $v, "Value returned" );
$this->assertLessThanOrEqual( 0, $curTTL, "Value has current TTL < 0 due to check keys" );
$wasSet = 0;
$keyedIds, 30, $genFunc, [ 'lowTTL' => 0 ] + $extOpts );
$this->assertEquals( $value, $v[$keyB], "Value returned" );
$this->assertEquals( 1, $wasSet, "Value regenerated" );
- $this->assertEquals( 0, $cache->getWarmupKeyMisses(), "Keys warmed yet in process cache" );
+ $this->assertEquals( 0, $cache->getWarmupKeyMisses(), "Keys warmed in warmup cache" );
+
$v = $cache->getMultiWithUnionSetCallback(
$keyedIds, 30, $genFunc, [ 'lowTTL' => 0 ] + $extOpts );
$this->assertEquals( $value, $v[$keyB], "Value returned" );
$this->assertEquals( 1, $wasSet, "Value not regenerated" );
- $this->assertEquals( 0, $cache->getWarmupKeyMisses(), "Keys warmed in process cache" );
+ $this->assertEquals( 0, $cache->getWarmupKeyMisses(), "Keys warmed in warmup cache" );
$mockWallClock += 1;
$curTTL = null;
$v = $cache->get( $keyC, $curTTL, [ $cKey1, $cKey2 ] );
- if ( $versioned ) {
- $this->assertEquals( $value, $v[$cache::VFLD_DATA], "Value returned" );
- } else {
- $this->assertEquals( $value, $v, "Value returned" );
- }
+ $this->assertEquals( $value, $v, "Value returned" );
$this->assertLessThanOrEqual( 0, $curTTL, "Value has current TTL < 0 due to check keys" );
$wasSet = 0;
/**
* @covers WANObjectCache::getWithSetCallback()
- * @covers WANObjectCache::doGetWithSetCallback()
+ * @covers WANObjectCache::fetchOrRegenerate()
*/
public function testLockTSE() {
$cache = $this->cache;
/**
* @covers WANObjectCache::getWithSetCallback()
- * @covers WANObjectCache::doGetWithSetCallback()
+ * @covers WANObjectCache::fetchOrRegenerate()
* @covers WANObjectCache::set()
*/
public function testLockTSESlow() {
/**
* @covers WANObjectCache::getWithSetCallback()
- * @covers WANObjectCache::doGetWithSetCallback()
+ * @covers WANObjectCache::fetchOrRegenerate()
*/
public function testBusyValue() {
$cache = $this->cache;
/**
* @dataProvider getWithSetCallback_versions_provider
* @covers WANObjectCache::getWithSetCallback()
- * @covers WANObjectCache::doGetWithSetCallback()
+ * @covers WANObjectCache::fetchOrRegenerate()
* @param array $extOpts
* @param bool $versioned
*/
$this->internalCache->set(
WANObjectCache::VALUE_KEY_PREFIX . $vKey1,
[
- WANObjectCache::FLD_VERSION => WANObjectCache::VERSION,
+ WANObjectCache::FLD_FORMAT_VERSION => WANObjectCache::VERSION,
WANObjectCache::FLD_VALUE => $value,
WANObjectCache::FLD_TTL => 3600,
WANObjectCache::FLD_TIME => $goodTime
$this->internalCache->set(
WANObjectCache::VALUE_KEY_PREFIX . $vKey2,
[
- WANObjectCache::FLD_VERSION => WANObjectCache::VERSION,
+ WANObjectCache::FLD_FORMAT_VERSION => WANObjectCache::VERSION,
WANObjectCache::FLD_VALUE => $value,
WANObjectCache::FLD_TTL => 3600,
WANObjectCache::FLD_TIME => $badTime
->setMethods( [ 'get', 'changeTTL' ] )->getMock();
$backend->expects( $this->once() )->method( 'get' )
->willReturn( [
- WANObjectCache::FLD_VERSION => WANObjectCache::VERSION,
+ WANObjectCache::FLD_FORMAT_VERSION => WANObjectCache::VERSION,
WANObjectCache::FLD_VALUE => 'value',
WANObjectCache::FLD_TTL => 3600,
WANObjectCache::FLD_TIME => 300,
--- /dev/null
+<?php
+
+/**
+ * Holds tests for FakeResultWrapper MediaWiki class.
+ *
+ * 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
+ */
+
+use Wikimedia\Rdbms\FakeResultWrapper;
+
+/**
+ * @group Database
+ * @covers \Wikimedia\Rdbms\FakeResultWrapper
+ */
+class FakeResultWrapperTest extends PHPUnit\Framework\TestCase {
+ public function testIteration() {
+ $res = new FakeResultWrapper( [
+ [ 'colA' => 1, 'colB' => 'a' ],
+ [ 'colA' => 2, 'colB' => 'b' ],
+ (object)[ 'colA' => 3, 'colB' => 'c' ],
+ [ 'colA' => 4, 'colB' => 'd' ],
+ [ 'colA' => 5, 'colB' => 'e' ],
+ (object)[ 'colA' => 6, 'colB' => 'f' ],
+ (object)[ 'colA' => 7, 'colB' => 'g' ],
+ [ 'colA' => 8, 'colB' => 'h' ]
+ ] );
+
+ $expectedRows = [
+ 0 => (object)[ 'colA' => 1, 'colB' => 'a' ],
+ 1 => (object)[ 'colA' => 2, 'colB' => 'b' ],
+ 2 => (object)[ 'colA' => 3, 'colB' => 'c' ],
+ 3 => (object)[ 'colA' => 4, 'colB' => 'd' ],
+ 4 => (object)[ 'colA' => 5, 'colB' => 'e' ],
+ 5 => (object)[ 'colA' => 6, 'colB' => 'f' ],
+ 6 => (object)[ 'colA' => 7, 'colB' => 'g' ],
+ 7 => (object)[ 'colA' => 8, 'colB' => 'h' ]
+ ];
+
+ $this->assertEquals( 8, $res->numRows() );
+
+ $res->seek( 7 );
+ $this->assertEquals( [ 'colA' => 8, 'colB' => 'h' ], $res->fetchRow() );
+ $res->seek( 7 );
+ $this->assertEquals( (object)[ 'colA' => 8, 'colB' => 'h' ], $res->fetchObject() );
+
+ $this->assertEquals( $expectedRows, iterator_to_array( $res, true ) );
+
+ $rows = [];
+ foreach ( $res as $i => $row ) {
+ $rows[$i] = $row;
+ }
+ $this->assertEquals( $expectedRows, $rows );
+ }
+}
--- /dev/null
+<?php
+
+/**
+ * Holds tests for ResultWrapper MediaWiki class.
+ *
+ * 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
+ */
+
+use Wikimedia\Rdbms\IDatabase;
+use Wikimedia\Rdbms\ResultWrapper;
+
+/**
+ * @group Database
+ * @covers \Wikimedia\Rdbms\ResultWrapper
+ */
+class ResultWrapperTest extends PHPUnit\Framework\TestCase {
+ /**
+ * @return IDatabase
+ * @param array[] $rows
+ */
+ private function getDatabaseMock( array $rows ) {
+ $db = $this->getMockBuilder( IDatabase::class )
+ ->disableOriginalConstructor()
+ ->getMock();
+ $db->method( 'select' )->willReturnCallback(
+ function () use ( $db, $rows ) {
+ return new ResultWrapper( $db, $rows );
+ }
+ );
+ $db->method( 'dataSeek' )->willReturnCallback(
+ function ( ResultWrapper $res, $pos ) use ( $db ) {
+ // Position already set in ResultWrapper
+ }
+ );
+ $db->method( 'fetchRow' )->willReturnCallback(
+ function ( ResultWrapper $res ) use ( $db ) {
+ $row = $res::unwrap( $res )[$res->key()] ?? false;
+
+ return $row;
+ }
+ );
+ $db->method( 'fetchObject' )->willReturnCallback(
+ function ( ResultWrapper $res ) use ( $db ) {
+ $row = $res::unwrap( $res )[$res->key()] ?? false;
+
+ return $row ? (object)$row : false;
+ }
+ );
+ $db->method( 'numRows' )->willReturnCallback(
+ function ( ResultWrapper $res ) use ( $db ) {
+ return count( $res::unwrap( $res ) );
+ }
+ );
+
+ return $db;
+ }
+
+ public function testIteration() {
+ $db = $this->getDatabaseMock( [
+ [ 'colA' => 1, 'colB' => 'a' ],
+ [ 'colA' => 2, 'colB' => 'b' ],
+ [ 'colA' => 3, 'colB' => 'c' ],
+ [ 'colA' => 4, 'colB' => 'd' ],
+ [ 'colA' => 5, 'colB' => 'e' ],
+ [ 'colA' => 6, 'colB' => 'f' ],
+ [ 'colA' => 7, 'colB' => 'g' ],
+ [ 'colA' => 8, 'colB' => 'h' ]
+ ] );
+
+ $expectedRows = [
+ 0 => (object)[ 'colA' => 1, 'colB' => 'a' ],
+ 1 => (object)[ 'colA' => 2, 'colB' => 'b' ],
+ 2 => (object)[ 'colA' => 3, 'colB' => 'c' ],
+ 3 => (object)[ 'colA' => 4, 'colB' => 'd' ],
+ 4 => (object)[ 'colA' => 5, 'colB' => 'e' ],
+ 5 => (object)[ 'colA' => 6, 'colB' => 'f' ],
+ 6 => (object)[ 'colA' => 7, 'colB' => 'g' ],
+ 7 => (object)[ 'colA' => 8, 'colB' => 'h' ]
+ ];
+
+ $res = $db->select( 'faketable', [ 'colA', 'colB' ], '1 = 1', __METHOD__ );
+ $this->assertEquals( 8, $res->numRows() );
+
+ $res->seek( 7 );
+ $this->assertEquals( [ 'colA' => 8, 'colB' => 'h' ], $res->fetchRow() );
+ $res->seek( 7 );
+ $this->assertEquals( (object)[ 'colA' => 8, 'colB' => 'h' ], $res->fetchObject() );
+
+ $this->assertEquals( $expectedRows, iterator_to_array( $res, true ) );
+
+ $rows = [];
+ foreach ( $res as $i => $row ) {
+ $rows[$i] = $row;
+ }
+ $this->assertEquals( $expectedRows, $rows );
+ }
+}
}
public function testGetLinkClasses() {
- $wanCache = ObjectCache::getMainWANInstance();
- $titleFormatter = MediaWikiServices::getInstance()->getTitleFormatter();
- $nsInfo = MediaWikiServices::getInstance()->getNamespaceInfo();
+ $services = MediaWikiServices::getInstance();
+ $wanCache = $services->getMainWANObjectCache();
+ $titleFormatter = $services->getTitleFormatter();
+ $nsInfo = $services->getNamespaceInfo();
$linkCache = new LinkCache( $titleFormatter, $wanCache, $nsInfo );
$foobarTitle = new TitleValue( NS_MAIN, 'FooBar' );
$redirectTitle = new TitleValue( NS_MAIN, 'Redirect' );
use MediaWikiCoversValidator;
use PHPUnit4And6Compat;
+ const NAME = 'test.blobstore';
+
protected function setUp() {
parent::setUp();
// MediaWiki's test wrapper sets $wgMainWANCache to CACHE_NONE.
}
public function testBlobCreation() {
- $module = $this->makeModule( [ 'mainpage' ] );
$rl = new EmptyResourceLoader();
- $rl->register( $module->getName(), $module );
+ $rl->register( self::NAME, [
+ 'factory' => function () {
+ return $this->makeModule( [ 'mainpage' ] );
+ }
+ ] );
$blobStore = $this->makeBlobStore( null, $rl );
- $blob = $blobStore->getBlob( $module, 'en' );
+ $blob = $blobStore->getBlob( $rl->getModule( self::NAME ), 'en' );
$this->assertEquals( '{"mainpage":"Main Page"}', $blob, 'Generated blob' );
}
public function testBlobCreation_empty() {
$module = $this->makeModule( [] );
$rl = new EmptyResourceLoader();
- $rl->register( $module->getName(), $module );
$blobStore = $this->makeBlobStore( null, $rl );
$blob = $blobStore->getBlob( $module, 'en' );
public function testBlobCreation_unknownMessage() {
$module = $this->makeModule( [ 'i-dont-exist', 'mainpage', 'i-dont-exist2' ] );
$rl = new EmptyResourceLoader();
- $rl->register( $module->getName(), $module );
$blobStore = $this->makeBlobStore( null, $rl );
// Generating a blob should continue without errors,
}
public function testMessageCachingAndPurging() {
- $module = $this->makeModule( [ 'example' ] );
$rl = new EmptyResourceLoader();
- $rl->register( $module->getName(), $module );
+ // Register it so that MessageBlobStore::updateMessage can
+ // discover it from the registry as a module that uses this message.
+ $rl->register( self::NAME, [
+ 'factory' => function () {
+ return $this->makeModule( [ 'example' ] );
+ }
+ ] );
+ $module = $rl->getModule( self::NAME );
$blobStore = $this->makeBlobStore( [ 'fetchMessage' ], $rl );
// Advance this new WANObjectCache instance to a normal state,
public function testPurgeEverything() {
$module = $this->makeModule( [ 'example' ] );
$rl = new EmptyResourceLoader();
- $rl->register( $module->getName(), $module );
$blobStore = $this->makeBlobStore( [ 'fetchMessage' ], $rl );
// Advance this new WANObjectCache instance to a normal state.
$blobStore->getBlob( $module, 'en' );
// Arrange version 1 of a module
$module = $this->makeModule( [ 'foo' ] );
$rl = new EmptyResourceLoader();
- $rl->register( $module->getName(), $module );
$blobStore = $this->makeBlobStore( [ 'fetchMessage' ], $rl );
$blobStore->expects( $this->once() )
->method( 'fetchMessage' )
// We do not receive purges for this because no messages were changed.
$module = $this->makeModule( [ 'foo', 'bar' ] );
$rl = new EmptyResourceLoader();
- $rl->register( $module->getName(), $module );
$blobStore = $this->makeBlobStore( [ 'fetchMessage' ], $rl );
$blobStore->expects( $this->exactly( 2 ) )
->method( 'fetchMessage' )
private function makeModule( array $messages ) {
$module = new ResourceLoaderTestModule( [ 'messages' => $messages ] );
- $module->setName( 'test.blobstore' );
+ $module->setName( self::NAME );
return $module;
}
}
}
private static function makeModule( array $options = [] ) {
- return new ResourceLoaderTestModule( $options );
+ return $options + [ 'class' => ResourceLoaderTestModule::class ];
}
private static function makeSampleModules() {
$context = $this->getResourceLoaderContext();
$module = new ResourceLoaderTestModule( [
+ 'mayValidateScript' => true,
'script' => "var a = 'this is';\n {\ninvalid"
] );
$this->assertEquals(
[ [
'msg' => 'Basic registry',
'modules' => [
- 'test.blank' => new ResourceLoaderTestModule(),
+ 'test.blank' => [ 'class' => ResourceLoaderTestModule::class ],
],
'out' => '
mw.loader.addSource( {
[ [
'msg' => 'Optimise the dependency tree (basic case)',
'modules' => [
- 'a' => new ResourceLoaderTestModule( [ 'dependencies' => [ 'b', 'c', 'd' ] ] ),
- 'b' => new ResourceLoaderTestModule( [ 'dependencies' => [ 'c' ] ] ),
- 'c' => new ResourceLoaderTestModule( [ 'dependencies' => [] ] ),
- 'd' => new ResourceLoaderTestModule( [ 'dependencies' => [] ] ),
+ 'a' => [
+ 'class' => ResourceLoaderTestModule::class,
+ 'dependencies' => [ 'b', 'c', 'd' ],
+ ],
+ 'b' => [
+ 'class' => ResourceLoaderTestModule::class,
+ 'dependencies' => [ 'c' ],
+ ],
+ 'c' => [
+ 'class' => ResourceLoaderTestModule::class,
+ 'dependencies' => [],
+ ],
+ 'd' => [
+ 'class' => ResourceLoaderTestModule::class,
+ 'dependencies' => [],
+ ],
],
'out' => '
mw.loader.addSource( {
[ [
'msg' => 'Optimise the dependency tree (tolerate unknown deps)',
'modules' => [
- 'a' => new ResourceLoaderTestModule( [ 'dependencies' => [ 'b', 'c', 'x' ] ] ),
- 'b' => new ResourceLoaderTestModule( [ 'dependencies' => [ 'c', 'x' ] ] ),
- 'c' => new ResourceLoaderTestModule( [ 'dependencies' => [] ] ),
+ 'a' => [
+ 'class' => ResourceLoaderTestModule::class,
+ 'dependencies' => [ 'b', 'c', 'x' ]
+ ],
+ 'b' => [
+ 'class' => ResourceLoaderTestModule::class,
+ 'dependencies' => [ 'c', 'x' ]
+ ],
+ 'c' => [
+ 'class' => ResourceLoaderTestModule::class,
+ 'dependencies' => []
+ ],
],
'out' => '
mw.loader.addSource( {
// Regression test for T223402.
'msg' => 'Optimise the dependency tree (indirect circular dependency)',
'modules' => [
- 'top' => new ResourceLoaderTestModule( [ 'dependencies' => [ 'middle1', 'util' ] ] ),
- 'middle1' => new ResourceLoaderTestModule( [ 'dependencies' => [ 'middle2', 'util' ] ] ),
- 'middle2' => new ResourceLoaderTestModule( [ 'dependencies' => [ 'bottom' ] ] ),
- 'bottom' => new ResourceLoaderTestModule( [ 'dependencies' => [ 'top' ] ] ),
- 'util' => new ResourceLoaderTestModule( [ 'dependencies' => [] ] ),
+ 'top' => [
+ 'class' => ResourceLoaderTestModule::class,
+ 'dependencies' => [ 'middle1', 'util' ],
+ ],
+ 'middle1' => [
+ 'class' => ResourceLoaderTestModule::class,
+ 'dependencies' => [ 'middle2', 'util' ],
+ ],
+ 'middle2' => [
+ 'class' => ResourceLoaderTestModule::class,
+ 'dependencies' => [ 'bottom' ],
+ ],
+ 'bottom' => [
+ 'class' => ResourceLoaderTestModule::class,
+ 'dependencies' => [ 'top' ],
+ ],
+ 'util' => [
+ 'class' => ResourceLoaderTestModule::class,
+ 'dependencies' => [],
+ ],
],
'out' => '
mw.loader.addSource( {
// Regression test for T223402.
'msg' => 'Optimise the dependency tree (direct circular dependency)',
'modules' => [
- 'top' => new ResourceLoaderTestModule( [ 'dependencies' => [ 'util', 'top' ] ] ),
- 'util' => new ResourceLoaderTestModule( [ 'dependencies' => [] ] ),
+ 'top' => [
+ 'class' => ResourceLoaderTestModule::class,
+ 'dependencies' => [ 'util', 'top' ],
+ ],
+ 'util' => [
+ 'class' => ResourceLoaderTestModule::class,
+ 'dependencies' => [],
+ ],
],
'out' => '
mw.loader.addSource( {
[ [
'msg' => 'Version falls back gracefully if getVersionHash throws',
'modules' => [
- 'test.fail' => (
- ( $mock = $this->getMockBuilder( ResourceLoaderTestModule::class )
- ->setMethods( [ 'getVersionHash' ] )->getMock() )
- && $mock->method( 'getVersionHash' )->will(
- $this->throwException( new Exception )
- )
- ) ? $mock : $mock
+ 'test.fail' => [
+ 'factory' => function () {
+ $mock = $this->getMockBuilder( ResourceLoaderTestModule::class )
+ ->setMethods( [ 'getVersionHash' ] )->getMock();
+ $mock->method( 'getVersionHash' )->will(
+ $this->throwException( new Exception )
+ );
+ return $mock;
+ }
+ ]
],
'out' => '
mw.loader.addSource( {
[ [
'msg' => 'Use version from getVersionHash',
'modules' => [
- 'test.version' => (
- ( $mock = $this->getMockBuilder( ResourceLoaderTestModule::class )
- ->setMethods( [ 'getVersionHash' ] )->getMock() )
- && $mock->method( 'getVersionHash' )->willReturn( '1234567' )
- ) ? $mock : $mock
+ 'test.version' => [
+ 'factory' => function () {
+ $mock = $this->getMockBuilder( ResourceLoaderTestModule::class )
+ ->setMethods( [ 'getVersionHash' ] )->getMock();
+ $mock->method( 'getVersionHash' )->willReturn( '1234567' );
+ return $mock;
+ }
+ ]
],
'out' => '
mw.loader.addSource( {
[ [
'msg' => 'Re-hash version from getVersionHash if too long',
'modules' => [
- 'test.version' => (
- ( $mock = $this->getMockBuilder( ResourceLoaderTestModule::class )
- ->setMethods( [ 'getVersionHash' ] )->getMock() )
- && $mock->method( 'getVersionHash' )->willReturn( '12345678' )
- ) ? $mock : $mock
+ 'test.version' => [
+ 'factory' => function () {
+ $mock = $this->getMockBuilder( ResourceLoaderTestModule::class )
+ ->setMethods( [ 'getVersionHash' ] )->getMock();
+ $mock->method( 'getVersionHash' )->willReturn( '12345678' );
+ return $mock;
+ }
+ ],
],
'out' => '
mw.loader.addSource( {
[ [
'msg' => 'Group signature',
'modules' => [
- 'test.blank' => new ResourceLoaderTestModule(),
- 'test.group.foo' => new ResourceLoaderTestModule( [ 'group' => 'x-foo' ] ),
- 'test.group.bar' => new ResourceLoaderTestModule( [ 'group' => 'x-bar' ] ),
+ 'test.blank' => [ 'class' => ResourceLoaderTestModule::class ],
+ 'test.group.foo' => [
+ 'class' => ResourceLoaderTestModule::class,
+ 'group' => 'x-foo',
+ ],
+ 'test.group.bar' => [
+ 'class' => ResourceLoaderTestModule::class,
+ 'group' => 'x-bar',
+ ],
],
'out' => '
mw.loader.addSource( {
[ [
'msg' => 'Different target (non-test should not be registered)',
'modules' => [
- 'test.blank' => new ResourceLoaderTestModule(),
- 'test.target.foo' => new ResourceLoaderTestModule( [ 'targets' => [ 'x-foo' ] ] ),
+ 'test.blank' => [ 'class' => ResourceLoaderTestModule::class ],
+ 'test.target.foo' => [
+ 'class' => ResourceLoaderTestModule::class,
+ 'targets' => [ 'x-foo' ],
+ ],
],
'out' => '
mw.loader.addSource( {
'msg' => 'Safemode disabled (default; register all modules)',
'modules' => [
// Default origin: ORIGIN_CORE_SITEWIDE
- 'test.blank' => new ResourceLoaderTestModule(),
- 'test.core-generated' => new ResourceLoaderTestModule( [
+ 'test.blank' => [ 'class' => ResourceLoaderTestModule::class ],
+ 'test.core-generated' => [
+ 'class' => ResourceLoaderTestModule::class,
'origin' => ResourceLoaderModule::ORIGIN_CORE_INDIVIDUAL
- ] ),
- 'test.sitewide' => new ResourceLoaderTestModule( [
+ ],
+ 'test.sitewide' => [
+ 'class' => ResourceLoaderTestModule::class,
'origin' => ResourceLoaderModule::ORIGIN_USER_SITEWIDE
- ] ),
- 'test.user' => new ResourceLoaderTestModule( [
+ ],
+ 'test.user' => [
+ 'class' => ResourceLoaderTestModule::class,
'origin' => ResourceLoaderModule::ORIGIN_USER_INDIVIDUAL
- ] ),
+ ],
],
'out' => '
mw.loader.addSource( {
'extraQuery' => [ 'safemode' => '1' ],
'modules' => [
// Default origin: ORIGIN_CORE_SITEWIDE
- 'test.blank' => new ResourceLoaderTestModule(),
- 'test.core-generated' => new ResourceLoaderTestModule( [
+ 'test.blank' => [ 'class' => ResourceLoaderTestModule::class ],
+ 'test.core-generated' => [
+ 'class' => ResourceLoaderTestModule::class,
'origin' => ResourceLoaderModule::ORIGIN_CORE_INDIVIDUAL
- ] ),
- 'test.sitewide' => new ResourceLoaderTestModule( [
+ ],
+ 'test.sitewide' => [
+ 'class' => ResourceLoaderTestModule::class,
'origin' => ResourceLoaderModule::ORIGIN_USER_SITEWIDE
- ] ),
- 'test.user' => new ResourceLoaderTestModule( [
+ ],
+ 'test.user' => [
+ 'class' => ResourceLoaderTestModule::class,
'origin' => ResourceLoaderModule::ORIGIN_USER_INDIVIDUAL
- ] ),
+ ],
],
'out' => '
mw.loader.addSource( {
],
],
'modules' => [
- 'test.blank' => new ResourceLoaderTestModule( [ 'source' => 'example' ] ),
+ 'test.blank' => [
+ 'class' => ResourceLoaderTestModule::class,
+ 'source' => 'example'
+ ],
],
'out' => '
mw.loader.addSource( {
[ [
'msg' => 'Conditional dependency function',
'modules' => [
- 'test.x.core' => new ResourceLoaderTestModule(),
- 'test.x.polyfill' => new ResourceLoaderTestModule( [
+ 'test.x.core' => [ 'class' => ResourceLoaderTestModule::class ],
+ 'test.x.polyfill' => [
+ 'class' => ResourceLoaderTestModule::class,
'skipFunction' => 'return true;'
- ] ),
- 'test.y.polyfill' => new ResourceLoaderTestModule( [
+ ],
+ 'test.y.polyfill' => [
+ 'class' => ResourceLoaderTestModule::class,
'skipFunction' =>
'return !!(' .
' window.JSON &&' .
' JSON.parse &&' .
' JSON.stringify' .
');'
- ] ),
- 'test.z.foo' => new ResourceLoaderTestModule( [
+ ],
+ 'test.z.foo' => [
+ 'class' => ResourceLoaderTestModule::class,
'dependencies' => [
'test.x.core',
'test.x.polyfill',
'test.y.polyfill',
],
- ] ),
+ ],
],
'out' => '
mw.loader.addSource( {
],
],
'modules' => [
- 'test.blank' => new ResourceLoaderTestModule(),
- 'test.x.core' => new ResourceLoaderTestModule(),
- 'test.x.util' => new ResourceLoaderTestModule( [
+ 'test.blank' => [ 'class' => ResourceLoaderTestModule::class ],
+ 'test.x.core' => [ 'class' => ResourceLoaderTestModule::class ],
+ 'test.x.util' => [
+ 'class' => ResourceLoaderTestModule::class,
'dependencies' => [
'test.x.core',
],
- ] ),
- 'test.x.foo' => new ResourceLoaderTestModule( [
+ ],
+ 'test.x.foo' => [
+ 'class' => ResourceLoaderTestModule::class,
'dependencies' => [
'test.x.core',
],
- ] ),
- 'test.x.bar' => new ResourceLoaderTestModule( [
+ ],
+ 'test.x.bar' => [
+ 'class' => ResourceLoaderTestModule::class,
'dependencies' => [
'test.x.core',
'test.x.util',
],
- ] ),
- 'test.x.quux' => new ResourceLoaderTestModule( [
+ ],
+ 'test.x.quux' => [
+ 'class' => ResourceLoaderTestModule::class,
'dependencies' => [
'test.x.foo',
'test.x.bar',
'test.x.util',
'test.x.unknown',
],
- ] ),
- 'test.group.foo.1' => new ResourceLoaderTestModule( [
+ ],
+ 'test.group.foo.1' => [
+ 'class' => ResourceLoaderTestModule::class,
'group' => 'x-foo',
- ] ),
- 'test.group.foo.2' => new ResourceLoaderTestModule( [
+ ],
+ 'test.group.foo.2' => [
+ 'class' => ResourceLoaderTestModule::class,
'group' => 'x-foo',
- ] ),
- 'test.group.bar.1' => new ResourceLoaderTestModule( [
+ ],
+ 'test.group.bar.1' => [
+ 'class' => ResourceLoaderTestModule::class,
'group' => 'x-bar',
- ] ),
- 'test.group.bar.2' => new ResourceLoaderTestModule( [
+ ],
+ 'test.group.bar.2' => [
+ 'class' => ResourceLoaderTestModule::class,
'group' => 'x-bar',
'source' => 'example',
- ] ),
- 'test.target.foo' => new ResourceLoaderTestModule( [
+ ],
+ 'test.target.foo' => [
+ 'class' => ResourceLoaderTestModule::class,
'targets' => [ 'x-foo' ],
- ] ),
- 'test.target.bar' => new ResourceLoaderTestModule( [
+ ],
+ 'test.target.bar' => [
+ 'class' => ResourceLoaderTestModule::class,
'source' => 'example',
'targets' => [ 'x-foo' ],
- ] ),
+ ],
],
'out' => '
mw.loader.addSource( {
public static function provideRegistrations() {
return [
[ [
- 'test.blank' => new ResourceLoaderTestModule(),
- 'test.min' => new ResourceLoaderTestModule( [
+ 'test.blank' => [ 'class' => ResourceLoaderTestModule::class ],
+ 'test.min' => [
+ 'class' => ResourceLoaderTestModule::class,
'skipFunction' =>
'return !!(' .
' window.JSON &&' .
'dependencies' => [
'test.blank',
],
- ] ),
+ ],
] ]
];
}
$context1 = $this->getResourceLoaderContext();
$rl1 = $context1->getResourceLoader();
$rl1->register( [
- 'test.a' => new ResourceLoaderTestModule(),
- 'test.b' => new ResourceLoaderTestModule(),
+ 'test.a' => [ 'class' => ResourceLoaderTestModule::class ],
+ 'test.b' => [ 'class' => ResourceLoaderTestModule::class ],
] );
$module = new ResourceLoaderStartupModule();
$version1 = $module->getVersionHash( $context1 );
$context2 = $this->getResourceLoaderContext();
$rl2 = $context2->getResourceLoader();
$rl2->register( [
- 'test.b' => new ResourceLoaderTestModule(),
- 'test.c' => new ResourceLoaderTestModule(),
+ 'test.b' => [ 'class' => ResourceLoaderTestModule::class ],
+ 'test.c' => [ 'class' => ResourceLoaderTestModule::class ],
] );
$module = new ResourceLoaderStartupModule();
$version2 = $module->getVersionHash( $context2 );
$context3 = $this->getResourceLoaderContext();
$rl3 = $context3->getResourceLoader();
$rl3->register( [
- 'test.a' => new ResourceLoaderTestModule(),
- 'test.b' => new ResourceLoaderTestModule( [ 'script' => 'different' ] ),
+ 'test.a' => [ 'class' => ResourceLoaderTestModule::class ],
+ 'test.b' => [
+ 'class' => ResourceLoaderTestModule::class,
+ 'script' => 'different',
+ ],
] );
$module = new ResourceLoaderStartupModule();
$version3 = $module->getVersionHash( $context3 );
$context = $this->getResourceLoaderContext();
$rl = $context->getResourceLoader();
$rl->register( [
- 'test.a' => new ResourceLoaderTestModule( [ 'dependencies' => [ 'x', 'y' ] ] ),
+ 'test.a' => [
+ 'class' => ResourceLoaderTestModule::class,
+ 'dependencies' => [ 'x', 'y' ],
+ ],
] );
$module = new ResourceLoaderStartupModule();
$version1 = $module->getVersionHash( $context );
$context = $this->getResourceLoaderContext();
$rl = $context->getResourceLoader();
$rl->register( [
- 'test.a' => new ResourceLoaderTestModule( [ 'dependencies' => [ 'x', 'z' ] ] ),
+ 'test.a' => [
+ 'class' => ResourceLoaderTestModule::class,
+ 'dependencies' => [ 'x', 'z' ],
+ ],
] );
$module = new ResourceLoaderStartupModule();
$version2 = $module->getVersionHash( $context );
$this->assertTrue( ResourceLoader::isValidModuleName( $name ) );
}
- /**
- * @covers ResourceLoader::register
- * @covers ResourceLoader::getModule
- */
- public function testRegisterValidObject() {
- $module = new ResourceLoaderTestModule();
- $resourceLoader = new EmptyResourceLoader();
- $resourceLoader->register( 'test', $module );
- $this->assertEquals( $module, $resourceLoader->getModule( 'test' ) );
- }
-
/**
* @covers ResourceLoader::register
* @covers ResourceLoader::getModule
*/
public function testRegisterValidArray() {
- $module = new ResourceLoaderTestModule();
$resourceLoader = new EmptyResourceLoader();
// Covers case of register() setting $rl->moduleInfos,
// but $rl->modules lazy-populated by getModule()
- $resourceLoader->register( 'test', [ 'object' => $module ] );
- $this->assertEquals( $module, $resourceLoader->getModule( 'test' ) );
+ $resourceLoader->register( 'test', [ 'class' => ResourceLoaderTestModule::class ] );
+ $this->assertInstanceOf(
+ ResourceLoaderTestModule::class,
+ $resourceLoader->getModule( 'test' )
+ );
}
/**
* @group medium
*/
public function testRegisterEmptyString() {
- $module = new ResourceLoaderTestModule();
$resourceLoader = new EmptyResourceLoader();
- $resourceLoader->register( '', $module );
- $this->assertEquals( $module, $resourceLoader->getModule( '' ) );
+ $resourceLoader->register( '', [ 'class' => ResourceLoaderTestModule::class ] );
+ $this->assertInstanceOf(
+ ResourceLoaderTestModule::class,
+ $resourceLoader->getModule( '' )
+ );
}
/**
public function testRegisterInvalidName() {
$resourceLoader = new EmptyResourceLoader();
$this->setExpectedException( MWException::class, "name 'test!invalid' is invalid" );
- $resourceLoader->register( 'test!invalid', new ResourceLoaderTestModule() );
+ $resourceLoader->register( 'test!invalid', [] );
}
/**
->method( 'warning' );
$resourceLoader = new EmptyResourceLoader( null, $logger );
- $module1 = new ResourceLoaderTestModule();
- $module2 = new ResourceLoaderTestModule();
- $resourceLoader->register( 'test', $module1 );
- $resourceLoader->register( 'test', $module2 );
- $this->assertSame( $module2, $resourceLoader->getModule( 'test' ) );
+ $resourceLoader->register( 'test', [ 'class' => ResourceLoaderSkinModule::class ] );
+ $resourceLoader->register( 'test', [ 'class' => ResourceLoaderStartUpModule::class ] );
+ $this->assertInstanceOf(
+ ResourceLoaderStartUpModule::class,
+ $resourceLoader->getModule( 'test' ),
+ 'last one wins'
+ );
}
/**
public function testGetModuleNames() {
// Use an empty one so that core and extension modules don't get in.
$resourceLoader = new EmptyResourceLoader();
- $resourceLoader->register( 'test.foo', new ResourceLoaderTestModule() );
- $resourceLoader->register( 'test.bar', new ResourceLoaderTestModule() );
+ $resourceLoader->register( 'test.foo', [] );
+ $resourceLoader->register( 'test.bar', [] );
$this->assertEquals(
[ 'startup', 'test.foo', 'test.bar' ],
$resourceLoader->getModuleNames()
}
public function provideTestIsFileModule() {
- $fileModuleObj = $this->getMockBuilder( ResourceLoaderFileModule::class )
- ->disableOriginalConstructor()
- ->getMock();
+ $fileModuleObj = $this->createMock( ResourceLoaderFileModule::class );
return [
- 'object' => [ false,
- new ResourceLoaderTestModule()
+ 'factory ignored' => [ false,
+ [
+ 'factory' => function () {
+ return new ResourceLoaderTestModule();
+ }
+ ]
],
- 'FileModule object' => [ false,
- $fileModuleObj
+ 'factory ignored (actual FileModule)' => [ false,
+ [
+ 'factory' => function () use ( $fileModuleObj ) {
+ return $fileModuleObj;
+ }
+ ]
],
'simple empty' => [ true,
[]
*/
public function testIsModuleRegistered() {
$rl = new EmptyResourceLoader();
- $rl->register( 'test', new ResourceLoaderTestModule() );
+ $rl->register( 'test', [] );
$this->assertTrue( $rl->isModuleRegistered( 'test' ) );
$this->assertFalse( $rl->isModuleRegistered( 'test.unknown' ) );
}
// Disable log from outputErrorAndLog
->setMethods( [ 'outputErrorAndLog' ] )->getMock();
$rl->register( [
- 'foo' => self::getSimpleModuleMock(),
- 'ferry' => self::getFailFerryMock(),
- 'bar' => self::getSimpleModuleMock(),
+ 'foo' => [ 'class' => ResourceLoaderTestModule::class ],
+ 'ferry' => [
+ 'factory' => function () {
+ return self::getFailFerryMock();
+ }
+ ],
+ 'bar' => [ 'class' => ResourceLoaderTestModule::class ],
] );
$context = $this->getResourceLoaderContext( [], $rl );
$modules = array_map( function ( $script ) {
return self::getSimpleModuleMock( $script );
}, $scripts );
- $rl->register( $modules );
$context = $this->getResourceLoaderContext(
[
'bar' => self::getSimpleModuleMock( 'bar();' ),
];
$rl = new EmptyResourceLoader();
- $rl->register( $modules );
$context = $this->getResourceLoaderContext(
[
'modules' => 'foo|ferry|bar',
'bar' => self::getSimpleStyleModuleMock( '.bar{}' ),
];
$rl = new EmptyResourceLoader();
- $rl->register( $modules );
$context = $this->getResourceLoaderContext(
[
'modules' => 'foo|ferry|bar',
// provide the full Config object here.
$rl = new EmptyResourceLoader( MediaWikiServices::getInstance()->getMainConfig() );
$rl->register( [
- 'foo' => self::getSimpleModuleMock( 'foo();' ),
- 'ferry' => self::getFailFerryMock(),
- 'bar' => self::getSimpleModuleMock( 'bar();' ),
+ 'foo' => [ 'factory' => function () {
+ return self::getSimpleModuleMock( 'foo();' );
+ } ],
+ 'ferry' => [ 'factory' => function () {
+ return self::getFailFerryMock();
+ } ],
+ 'bar' => [ 'factory' => function () {
+ return self::getSimpleModuleMock( 'bar();' );
+ } ],
] );
$context = $this->getResourceLoaderContext(
[
] );
$rl = new EmptyResourceLoader();
- $rl->register( [
- 'foo' => $module,
- ] );
$context = $this->getResourceLoaderContext(
[ 'modules' => 'foo', 'only' => 'scripts' ],
$rl
);
- $modules = [ 'foo' => $rl->getModule( 'foo' ) ];
+ $modules = [ 'foo' => $module ];
$response = $rl->makeModuleResponse( $context, $modules );
$extraHeaders = TestingAccessWrapper::newFromObject( $rl )->extraHeaders;
] );
$rl = new EmptyResourceLoader();
- $rl->register( [ 'foo' => $foo, 'bar' => $bar ] );
$context = $this->getResourceLoaderContext(
[ 'modules' => 'foo|bar', 'only' => 'scripts' ],
$rl
);
- $modules = [ 'foo' => $rl->getModule( 'foo' ), 'bar' => $rl->getModule( 'bar' ) ];
+ $modules = [ 'foo' => $foo, 'bar' => $bar ];
$response = $rl->makeModuleResponse( $context, $modules );
$extraHeaders = TestingAccessWrapper::newFromObject( $rl )->extraHeaders;
$this->assertEquals(
'makeModuleResponse',
] )
->getMock();
- $rl->register( 'test', $module );
+ $rl->register( 'test', [
+ 'factory' => function () use ( $module ) {
+ return $module;
+ }
+ ] );
$context = $this->getResourceLoaderContext(
[ 'modules' => 'test', 'only' => null ],
$rl
'sendResponseHeaders',
] )
->getMock();
- $rl->register( 'test', $module );
+ $rl->register( 'test', [
+ 'factory' => function () use ( $module ) {
+ return $module;
+ }
+ ] );
$context = $this->getResourceLoaderContext( [ 'modules' => 'test' ], $rl );
// Disable logging from outputErrorAndLog
$this->setLogger( 'exception', new Psr\Log\NullLogger() );
$module::$returnFetchTitleInfo = $titleInfo;
$rl = new EmptyResourceLoader();
- $rl->register( 'testmodule', $module );
$context = new ResourceLoaderContext( $rl, new FauxRequest() );
TestResourceLoaderWikiModule::invalidateModuleCache(
* @covers ResourceLoaderWikiModule::preloadTitleInfo
*/
public function testGetPreloadedBadTitle() {
- // Mock values
- $pages = [
- // Covers else branch for invalid page name
- '[x]' => [ 'type' => 'styles' ],
- ];
- $titleInfo = [];
-
- // Set up objects
- $module = $this->getMockBuilder( TestResourceLoaderWikiModule::class )
- ->setMethods( [ 'getPages' ] )->getMock();
- $module->method( 'getPages' )->willReturn( $pages );
- $module::$returnFetchTitleInfo = $titleInfo;
+ // Set up
+ TestResourceLoaderWikiModule::$returnFetchTitleInfo = [];
$rl = new EmptyResourceLoader();
- $rl->register( 'testmodule', $module );
+ $rl->getConfig()->set( 'UseSiteJs', true );
+ $rl->getConfig()->set( 'UseSiteCss', true );
+ $rl->register( 'testmodule', [
+ 'class' => TestResourceLoaderWikiModule::class,
+ // Covers preloadTitleInfo branch for invalid page name
+ 'styles' => [ '[x]' ],
+ ] );
$context = new ResourceLoaderContext( $rl, new FauxRequest() );
// Act
);
// Assert
- $module = TestingAccessWrapper::newFromObject( $module );
- $this->assertEquals( $titleInfo, $module->getTitleInfo( $context ), 'Title info' );
+ $module = TestingAccessWrapper::newFromObject( $rl->getModule( 'testmodule' ) );
+ $this->assertSame( [], $module->getTitleInfo( $context ), 'Title info' );
}
/**
$module->method( 'getPages' )->willReturn( $pages );
$rl = new EmptyResourceLoader();
- $rl->register( 'testmodule', $module );
$context = new DerivativeResourceLoaderContext(
new ResourceLoaderContext( $rl, new FauxRequest() )
);
$this->db->delete( 'actor', [ 'actor_user' => $id ], __METHOD__ );
User::purge( $domain, $id );
// Because WANObjectCache->delete() stupidly doesn't delete from the process cache.
- ObjectCache::getMainWANInstance()->clearProcessCache();
+
+ MediaWikiServices::getInstance()->getMainWANObjectCache()->clearProcessCache();
$user = User::newFromId( $id );
$this->assertFalse( $user->getActorId() > 0, 'No Actor ID by default if none in database' );
+++ /dev/null
-<?php
-
-/**
- * @covers LanguageCode
- * @group Language
- *
- * @author Thiemo Kreuz
- */
-class LanguageCodeTest extends PHPUnit\Framework\TestCase {
-
- use MediaWikiCoversValidator;
-
- public function testConstructor() {
- $instance = new LanguageCode();
-
- $this->assertInstanceOf( LanguageCode::class, $instance );
- }
-
- public function testGetDeprecatedCodeMapping() {
- $map = LanguageCode::getDeprecatedCodeMapping();
-
- $this->assertInternalType( 'array', $map );
- $this->assertContainsOnly( 'string', array_keys( $map ) );
- $this->assertArrayNotHasKey( '', $map );
- $this->assertContainsOnly( 'string', $map );
- $this->assertNotContains( '', $map );
-
- // Codes special to MediaWiki should never appear in a map of "deprecated" codes
- $this->assertArrayNotHasKey( 'qqq', $map, 'documentation' );
- $this->assertNotContains( 'qqq', $map, 'documentation' );
- $this->assertArrayNotHasKey( 'qqx', $map, 'debug code' );
- $this->assertNotContains( 'qqx', $map, 'debug code' );
-
- // Valid language codes that are currently not "deprecated"
- $this->assertArrayNotHasKey( 'bh', $map, 'family of Bihari languages' );
- $this->assertArrayNotHasKey( 'no', $map, 'family of Norwegian languages' );
- $this->assertArrayNotHasKey( 'simple', $map );
- }
-
- public function testReplaceDeprecatedCodes() {
- $this->assertEquals( 'gsw', LanguageCode::replaceDeprecatedCodes( 'als' ) );
- $this->assertEquals( 'gsw', LanguageCode::replaceDeprecatedCodes( 'gsw' ) );
- $this->assertEquals( null, LanguageCode::replaceDeprecatedCodes( null ) );
- }
-
- /**
- * test @see LanguageCode::bcp47().
- * Please note the BCP 47 explicitly state that language codes are case
- * insensitive, there are some exceptions to the rule :)
- * This test is used to verify our formatting against all lower and
- * all upper cases language code.
- *
- * @see https://tools.ietf.org/html/bcp47
- * @dataProvider provideLanguageCodes()
- */
- public function testBcp47( $code, $expected ) {
- $this->assertEquals( $expected, LanguageCode::bcp47( $code ),
- "Applying BCP 47 standard to '$code'"
- );
-
- $code = strtolower( $code );
- $this->assertEquals( $expected, LanguageCode::bcp47( $code ),
- "Applying BCP 47 standard to lower case '$code'"
- );
-
- $code = strtoupper( $code );
- $this->assertEquals( $expected, LanguageCode::bcp47( $code ),
- "Applying BCP 47 standard to upper case '$code'"
- );
- }
-
- /**
- * Array format is ($code, $expected)
- */
- public static function provideLanguageCodes() {
- return [
- // Extracted from BCP 47 (list not exhaustive)
- # 2.1.1
- [ 'en-ca-x-ca', 'en-CA-x-ca' ],
- [ 'sgn-be-fr', 'sgn-BE-FR' ],
- [ 'az-latn-x-latn', 'az-Latn-x-latn' ],
- # 2.2
- [ 'sr-Latn-RS', 'sr-Latn-RS' ],
- [ 'az-arab-ir', 'az-Arab-IR' ],
-
- # 2.2.5
- [ 'sl-nedis', 'sl-nedis' ],
- [ 'de-ch-1996', 'de-CH-1996' ],
-
- # 2.2.6
- [
- 'en-latn-gb-boont-r-extended-sequence-x-private',
- 'en-Latn-GB-boont-r-extended-sequence-x-private'
- ],
-
- // Examples from BCP 47 Appendix A
- # Simple language subtag:
- [ 'DE', 'de' ],
- [ 'fR', 'fr' ],
- [ 'ja', 'ja' ],
-
- # Language subtag plus script subtag:
- [ 'zh-hans', 'zh-Hans' ],
- [ 'sr-cyrl', 'sr-Cyrl' ],
- [ 'sr-latn', 'sr-Latn' ],
-
- # Extended language subtags and their primary language subtag
- # counterparts:
- [ 'zh-cmn-hans-cn', 'zh-cmn-Hans-CN' ],
- [ 'cmn-hans-cn', 'cmn-Hans-CN' ],
- [ 'zh-yue-hk', 'zh-yue-HK' ],
- [ 'yue-hk', 'yue-HK' ],
-
- # Language-Script-Region:
- [ 'zh-hans-cn', 'zh-Hans-CN' ],
- [ 'sr-latn-RS', 'sr-Latn-RS' ],
-
- # Language-Variant:
- [ 'sl-rozaj', 'sl-rozaj' ],
- [ 'sl-rozaj-biske', 'sl-rozaj-biske' ],
- [ 'sl-nedis', 'sl-nedis' ],
-
- # Language-Region-Variant:
- [ 'de-ch-1901', 'de-CH-1901' ],
- [ 'sl-it-nedis', 'sl-IT-nedis' ],
-
- # Language-Script-Region-Variant:
- [ 'hy-latn-it-arevela', 'hy-Latn-IT-arevela' ],
-
- # Language-Region:
- [ 'de-de', 'de-DE' ],
- [ 'en-us', 'en-US' ],
- [ 'es-419', 'es-419' ],
-
- # Private use subtags:
- [ 'de-ch-x-phonebk', 'de-CH-x-phonebk' ],
- [ 'az-arab-x-aze-derbend', 'az-Arab-x-aze-derbend' ],
- /**
- * Previous test does not reflect the BCP 47 which states:
- * az-Arab-x-AZE-derbend
- * AZE being private, it should be lower case, hence the test above
- * should probably be:
- * [ 'az-arab-x-aze-derbend', 'az-Arab-x-AZE-derbend' ],
- */
-
- # Private use registry values:
- [ 'x-whatever', 'x-whatever' ],
- [ 'qaa-qaaa-qm-x-southern', 'qaa-Qaaa-QM-x-southern' ],
- [ 'de-qaaa', 'de-Qaaa' ],
- [ 'sr-latn-qm', 'sr-Latn-QM' ],
- [ 'sr-qaaa-rs', 'sr-Qaaa-RS' ],
-
- # Tags that use extensions
- [ 'en-us-u-islamcal', 'en-US-u-islamcal' ],
- [ 'zh-cn-a-myext-x-private', 'zh-CN-a-myext-x-private' ],
- [ 'en-a-myext-b-another', 'en-a-myext-b-another' ],
-
- # Invalid:
- // de-419-DE
- // a-DE
- // ar-a-aaa-b-bbb-a-ccc
-
- # Non-standard and deprecated language codes used by MediaWiki
- [ 'als', 'gsw' ],
- [ 'bat-smg', 'sgs' ],
- [ 'be-x-old', 'be-tarask' ],
- [ 'fiu-vro', 'vro' ],
- [ 'roa-rup', 'rup' ],
- [ 'zh-classical', 'lzh' ],
- [ 'zh-min-nan', 'nan' ],
- [ 'zh-yue', 'yue' ],
- [ 'cbk-zam', 'cbk' ],
- [ 'de-formal', 'de-x-formal' ],
- [ 'eml', 'egl' ],
- [ 'en-rtl', 'en-x-rtl' ],
- [ 'es-formal', 'es-x-formal' ],
- [ 'hu-formal', 'hu-x-formal' ],
- [ 'kk-Arab', 'kk-Arab' ],
- [ 'kk-Cyrl', 'kk-Cyrl' ],
- [ 'kk-Latn', 'kk-Latn' ],
- [ 'map-bms', 'jv-x-bms' ],
- [ 'mo', 'ro-Cyrl-MD' ],
- [ 'nrm', 'nrf' ],
- [ 'nl-informal', 'nl-x-informal' ],
- [ 'roa-tara', 'nap-x-tara' ],
- [ 'simple', 'en-simple' ],
- [ 'sr-ec', 'sr-Cyrl' ],
- [ 'sr-el', 'sr-Latn' ],
- [ 'zh-cn', 'zh-Hans-CN' ],
- [ 'zh-sg', 'zh-Hans-SG' ],
- [ 'zh-my', 'zh-Hans-MY' ],
- [ 'zh-tw', 'zh-Hant-TW' ],
- [ 'zh-hk', 'zh-Hant-HK' ],
- [ 'zh-mo', 'zh-Hant-MO' ],
- [ 'zh-hans', 'zh-Hans' ],
- [ 'zh-hant', 'zh-Hant' ],
- ];
- }
-
-}
--- /dev/null
+<?php
+
+/**
+ * @covers LanguageCode
+ * @group Language
+ *
+ * @author Thiemo Kreuz
+ */
+class LanguageCodeTest extends MediaWikiUnitTestCase {
+
+ public function testConstructor() {
+ $instance = new LanguageCode();
+
+ $this->assertInstanceOf( LanguageCode::class, $instance );
+ }
+
+ public function testGetDeprecatedCodeMapping() {
+ $map = LanguageCode::getDeprecatedCodeMapping();
+
+ $this->assertInternalType( 'array', $map );
+ $this->assertContainsOnly( 'string', array_keys( $map ) );
+ $this->assertArrayNotHasKey( '', $map );
+ $this->assertContainsOnly( 'string', $map );
+ $this->assertNotContains( '', $map );
+
+ // Codes special to MediaWiki should never appear in a map of "deprecated" codes
+ $this->assertArrayNotHasKey( 'qqq', $map, 'documentation' );
+ $this->assertNotContains( 'qqq', $map, 'documentation' );
+ $this->assertArrayNotHasKey( 'qqx', $map, 'debug code' );
+ $this->assertNotContains( 'qqx', $map, 'debug code' );
+
+ // Valid language codes that are currently not "deprecated"
+ $this->assertArrayNotHasKey( 'bh', $map, 'family of Bihari languages' );
+ $this->assertArrayNotHasKey( 'no', $map, 'family of Norwegian languages' );
+ $this->assertArrayNotHasKey( 'simple', $map );
+ }
+
+ public function testReplaceDeprecatedCodes() {
+ $this->assertEquals( 'gsw', LanguageCode::replaceDeprecatedCodes( 'als' ) );
+ $this->assertEquals( 'gsw', LanguageCode::replaceDeprecatedCodes( 'gsw' ) );
+ $this->assertEquals( null, LanguageCode::replaceDeprecatedCodes( null ) );
+ }
+
+ /**
+ * test @see LanguageCode::bcp47().
+ * Please note the BCP 47 explicitly state that language codes are case
+ * insensitive, there are some exceptions to the rule :)
+ * This test is used to verify our formatting against all lower and
+ * all upper cases language code.
+ *
+ * @see https://tools.ietf.org/html/bcp47
+ * @dataProvider provideLanguageCodes()
+ */
+ public function testBcp47( $code, $expected ) {
+ $this->assertEquals( $expected, LanguageCode::bcp47( $code ),
+ "Applying BCP 47 standard to '$code'"
+ );
+
+ $code = strtolower( $code );
+ $this->assertEquals( $expected, LanguageCode::bcp47( $code ),
+ "Applying BCP 47 standard to lower case '$code'"
+ );
+
+ $code = strtoupper( $code );
+ $this->assertEquals( $expected, LanguageCode::bcp47( $code ),
+ "Applying BCP 47 standard to upper case '$code'"
+ );
+ }
+
+ /**
+ * Array format is ($code, $expected)
+ */
+ public static function provideLanguageCodes() {
+ return [
+ // Extracted from BCP 47 (list not exhaustive)
+ # 2.1.1
+ [ 'en-ca-x-ca', 'en-CA-x-ca' ],
+ [ 'sgn-be-fr', 'sgn-BE-FR' ],
+ [ 'az-latn-x-latn', 'az-Latn-x-latn' ],
+ # 2.2
+ [ 'sr-Latn-RS', 'sr-Latn-RS' ],
+ [ 'az-arab-ir', 'az-Arab-IR' ],
+
+ # 2.2.5
+ [ 'sl-nedis', 'sl-nedis' ],
+ [ 'de-ch-1996', 'de-CH-1996' ],
+
+ # 2.2.6
+ [
+ 'en-latn-gb-boont-r-extended-sequence-x-private',
+ 'en-Latn-GB-boont-r-extended-sequence-x-private'
+ ],
+
+ // Examples from BCP 47 Appendix A
+ # Simple language subtag:
+ [ 'DE', 'de' ],
+ [ 'fR', 'fr' ],
+ [ 'ja', 'ja' ],
+
+ # Language subtag plus script subtag:
+ [ 'zh-hans', 'zh-Hans' ],
+ [ 'sr-cyrl', 'sr-Cyrl' ],
+ [ 'sr-latn', 'sr-Latn' ],
+
+ # Extended language subtags and their primary language subtag
+ # counterparts:
+ [ 'zh-cmn-hans-cn', 'zh-cmn-Hans-CN' ],
+ [ 'cmn-hans-cn', 'cmn-Hans-CN' ],
+ [ 'zh-yue-hk', 'zh-yue-HK' ],
+ [ 'yue-hk', 'yue-HK' ],
+
+ # Language-Script-Region:
+ [ 'zh-hans-cn', 'zh-Hans-CN' ],
+ [ 'sr-latn-RS', 'sr-Latn-RS' ],
+
+ # Language-Variant:
+ [ 'sl-rozaj', 'sl-rozaj' ],
+ [ 'sl-rozaj-biske', 'sl-rozaj-biske' ],
+ [ 'sl-nedis', 'sl-nedis' ],
+
+ # Language-Region-Variant:
+ [ 'de-ch-1901', 'de-CH-1901' ],
+ [ 'sl-it-nedis', 'sl-IT-nedis' ],
+
+ # Language-Script-Region-Variant:
+ [ 'hy-latn-it-arevela', 'hy-Latn-IT-arevela' ],
+
+ # Language-Region:
+ [ 'de-de', 'de-DE' ],
+ [ 'en-us', 'en-US' ],
+ [ 'es-419', 'es-419' ],
+
+ # Private use subtags:
+ [ 'de-ch-x-phonebk', 'de-CH-x-phonebk' ],
+ [ 'az-arab-x-aze-derbend', 'az-Arab-x-aze-derbend' ],
+ /**
+ * Previous test does not reflect the BCP 47 which states:
+ * az-Arab-x-AZE-derbend
+ * AZE being private, it should be lower case, hence the test above
+ * should probably be:
+ * [ 'az-arab-x-aze-derbend', 'az-Arab-x-AZE-derbend' ],
+ */
+
+ # Private use registry values:
+ [ 'x-whatever', 'x-whatever' ],
+ [ 'qaa-qaaa-qm-x-southern', 'qaa-Qaaa-QM-x-southern' ],
+ [ 'de-qaaa', 'de-Qaaa' ],
+ [ 'sr-latn-qm', 'sr-Latn-QM' ],
+ [ 'sr-qaaa-rs', 'sr-Qaaa-RS' ],
+
+ # Tags that use extensions
+ [ 'en-us-u-islamcal', 'en-US-u-islamcal' ],
+ [ 'zh-cn-a-myext-x-private', 'zh-CN-a-myext-x-private' ],
+ [ 'en-a-myext-b-another', 'en-a-myext-b-another' ],
+
+ # Invalid:
+ // de-419-DE
+ // a-DE
+ // ar-a-aaa-b-bbb-a-ccc
+
+ # Non-standard and deprecated language codes used by MediaWiki
+ [ 'als', 'gsw' ],
+ [ 'bat-smg', 'sgs' ],
+ [ 'be-x-old', 'be-tarask' ],
+ [ 'fiu-vro', 'vro' ],
+ [ 'roa-rup', 'rup' ],
+ [ 'zh-classical', 'lzh' ],
+ [ 'zh-min-nan', 'nan' ],
+ [ 'zh-yue', 'yue' ],
+ [ 'cbk-zam', 'cbk' ],
+ [ 'de-formal', 'de-x-formal' ],
+ [ 'eml', 'egl' ],
+ [ 'en-rtl', 'en-x-rtl' ],
+ [ 'es-formal', 'es-x-formal' ],
+ [ 'hu-formal', 'hu-x-formal' ],
+ [ 'kk-Arab', 'kk-Arab' ],
+ [ 'kk-Cyrl', 'kk-Cyrl' ],
+ [ 'kk-Latn', 'kk-Latn' ],
+ [ 'map-bms', 'jv-x-bms' ],
+ [ 'mo', 'ro-Cyrl-MD' ],
+ [ 'nrm', 'nrf' ],
+ [ 'nl-informal', 'nl-x-informal' ],
+ [ 'roa-tara', 'nap-x-tara' ],
+ [ 'simple', 'en-simple' ],
+ [ 'sr-ec', 'sr-Cyrl' ],
+ [ 'sr-el', 'sr-Latn' ],
+ [ 'zh-cn', 'zh-Hans-CN' ],
+ [ 'zh-sg', 'zh-Hans-SG' ],
+ [ 'zh-my', 'zh-Hans-MY' ],
+ [ 'zh-tw', 'zh-Hant-TW' ],
+ [ 'zh-hk', 'zh-Hant-HK' ],
+ [ 'zh-mo', 'zh-Hant-MO' ],
+ [ 'zh-hans', 'zh-Hans' ],
+ [ 'zh-hant', 'zh-Hant' ],
+ ];
+ }
+
+}
--- /dev/null
+<?php
+
+/**
+ * Verifies that special page aliases are valid, with no slashes.
+ *
+ * @group Language
+ * @group SpecialPageAliases
+ * @group SystemTest
+ * @group medium
+ * @todo This should be a structure test
+ *
+ * @author Katie Filbert < aude.wiki@gmail.com >
+ */
+class SpecialPageAliasTest extends \MediaWikiUnitTestCase {
+
+ /**
+ * @coversNothing
+ * @dataProvider validSpecialPageAliasesProvider
+ */
+ public function testValidSpecialPageAliases( $code, $specialPageAliases ) {
+ foreach ( $specialPageAliases as $specialPage => $aliases ) {
+ foreach ( $aliases as $alias ) {
+ $msg = "$specialPage alias '$alias' in $code is valid with no slashes";
+ $this->assertRegExp( '/^[^\/]*$/', $msg );
+ }
+ }
+ }
+
+ public function validSpecialPageAliasesProvider() {
+ $codes = array_keys( Language::fetchLanguageNames( null, 'mwfile' ) );
+
+ $data = [];
+
+ foreach ( $codes as $code ) {
+ $specialPageAliases = $this->getSpecialPageAliases( $code );
+
+ if ( $specialPageAliases !== [] ) {
+ $data[] = [ $code, $specialPageAliases ];
+ }
+ }
+
+ return $data;
+ }
+
+ /**
+ * @param string $code
+ *
+ * @return array
+ */
+ protected function getSpecialPageAliases( $code ) {
+ $file = Language::getMessagesFileName( $code );
+
+ if ( is_readable( $file ) ) {
+ include $file;
+
+ if ( isset( $specialPageAliases ) && $specialPageAliases !== null ) {
+ return $specialPageAliases;
+ }
+ }
+
+ return [];
+ }
+
+}
+++ /dev/null
-<?php
-
-/**
- * Verifies that special page aliases are valid, with no slashes.
- *
- * @group Language
- * @group SpecialPageAliases
- * @group SystemTest
- * @group medium
- * @todo This should be a structure test
- *
- * @author Katie Filbert < aude.wiki@gmail.com >
- */
-class SpecialPageAliasTest extends \MediaWikiUnitTestCase {
-
- /**
- * @coversNothing
- * @dataProvider validSpecialPageAliasesProvider
- */
- public function testValidSpecialPageAliases( $code, $specialPageAliases ) {
- foreach ( $specialPageAliases as $specialPage => $aliases ) {
- foreach ( $aliases as $alias ) {
- $msg = "$specialPage alias '$alias' in $code is valid with no slashes";
- $this->assertRegExp( '/^[^\/]*$/', $msg );
- }
- }
- }
-
- public function validSpecialPageAliasesProvider() {
- $codes = array_keys( Language::fetchLanguageNames( null, 'mwfile' ) );
-
- $data = [];
-
- foreach ( $codes as $code ) {
- $specialPageAliases = $this->getSpecialPageAliases( $code );
-
- if ( $specialPageAliases !== [] ) {
- $data[] = [ $code, $specialPageAliases ];
- }
- }
-
- return $data;
- }
-
- /**
- * @param string $code
- *
- * @return array
- */
- protected function getSpecialPageAliases( $code ) {
- $file = Language::getMessagesFileName( $code );
-
- if ( is_readable( $file ) ) {
- include $file;
-
- if ( isset( $specialPageAliases ) && $specialPageAliases !== null ) {
- return $specialPageAliases;
- }
- }
-
- return [];
- }
-
-}
dépôts / lhc / web / wiklou.git / commitdiff