Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/239897
Change subject: MultiWriteBagOStuff: require nonempty 'caches' param
......................................................................
MultiWriteBagOStuff: require nonempty 'caches' param
MultiWriteBagOStuff::__construct() barfs if the 'caches' parameter is unset,
but it permits it to be an empty array. This means that subsequent operations
that need to reference the first (primary) cache backend need to check that
it is there at all.
Since there is not much sense in having a MultiWriteBagOStuff object with zero
cache backends, make the constructor require a nonempty array for 'caches', and
remove the subsequent checks that are made redundant by this new restriction.
Change-Id: I30f3e0dcbfe67570a368e64b8233cc0ba7f90b2f
---
M includes/objectcache/MultiWriteBagOStuff.php
1 file changed, 7 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/97/239897/1
diff --git a/includes/objectcache/MultiWriteBagOStuff.php
b/includes/objectcache/MultiWriteBagOStuff.php
index b390659..329cd70 100644
--- a/includes/objectcache/MultiWriteBagOStuff.php
+++ b/includes/objectcache/MultiWriteBagOStuff.php
@@ -61,8 +61,8 @@
public function __construct( $params ) {
parent::__construct( $params );
- if ( !isset( $params['caches'] ) ) {
- throw new InvalidArgumentException( __METHOD__ . ':
"caches" parameter required' );
+ if ( empty( $params['caches'] ) || !is_array( $params['caches']
) ) {
+ throw new InvalidArgumentException( __METHOD__ . ':
"caches" parameter must be an array of caches' );
}
$this->caches = array();
@@ -149,11 +149,7 @@
*/
public function lock( $key, $timeout = 6, $expiry = 6, $rclass = '' ) {
// Lock only the first cache, to avoid deadlocks
- if ( isset( $this->caches[0] ) ) {
- return $this->caches[0]->lock( $key, $timeout, $expiry,
$rclass );
- } else {
- return true;
- }
+ return $this->caches[0]->lock( $key, $timeout, $expiry, $rclass
);
}
/**
@@ -161,11 +157,7 @@
* @return bool
*/
public function unlock( $key ) {
- if ( isset( $this->caches[0] ) ) {
- return $this->caches[0]->unlock( $key );
- } else {
- return true;
- }
+ return $this->caches[0]->unlock( $key );
}
/**
@@ -180,13 +172,11 @@
}
public function getLastError() {
- return isset( $this->caches[0] ) ?
$this->caches[0]->getLastError() : self::ERR_NONE;
+ return $this->caches[0]->getLastError();
}
public function clearLastError() {
- if ( isset( $this->caches[0] ) ) {
- $this->caches[0]->clearLastError();
- }
+ $this->caches[0]->clearLastError();
}
/**
@@ -208,7 +198,7 @@
// Secondary write in async mode: do not block
this HTTP request
$logger = $this->logger;
DeferredUpdates::addCallableUpdate(
- function() use ( $cache, $method,
$args, $logger ) {
+ function () use ( $cache, $method,
$args, $logger ) {
if ( !call_user_func_array(
array( $cache, $method ), $args ) ) {
$logger->warning(
"Async $method op failed" );
}
--
To view, visit https://gerrit.wikimedia.org/r/239897
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I30f3e0dcbfe67570a368e64b8233cc0ba7f90b2f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
