diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2013-12-08 09:55:49 +0100 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2013-12-08 09:55:49 +0100 |
commit | 4ac9fa081a7c045f6a9f1cfc529d82423f485b2e (patch) | |
tree | af68743f2f4a47d13f2b0eb05f5c4aaf86d8ea37 /includes/objectcache/SqlBagOStuff.php | |
parent | af4da56f1ad4d3ef7b06557bae365da2ea27a897 (diff) |
Update to MediaWiki 1.22.0
Diffstat (limited to 'includes/objectcache/SqlBagOStuff.php')
-rw-r--r-- | includes/objectcache/SqlBagOStuff.php | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/includes/objectcache/SqlBagOStuff.php b/includes/objectcache/SqlBagOStuff.php index 87f787d8..acf27036 100644 --- a/includes/objectcache/SqlBagOStuff.php +++ b/includes/objectcache/SqlBagOStuff.php @@ -222,8 +222,8 @@ class SqlBagOStuff extends BagOStuff { $dataRows = array(); foreach ( $keysByTable as $serverIndex => $serverKeys ) { - $db = $this->getDB( $serverIndex ); try { + $db = $this->getDB( $serverIndex ); foreach ( $serverKeys as $tableName => $tableKeys ) { $res = $db->select( $tableName, array( 'keyname', 'value', 'exptime' ), @@ -244,10 +244,10 @@ class SqlBagOStuff extends BagOStuff { if ( isset( $dataRows[$key] ) ) { // HIT? $row = $dataRows[$key]; $this->debug( "get: retrieved data; expiry time is " . $row->exptime ); - $db = $this->getDB( $row->serverIndex ); - if ( $this->isExpired( $db, $row->exptime ) ) { // MISS - $this->debug( "get: key has expired, deleting" ); - try { + try { + $db = $this->getDB( $row->serverIndex ); + if ( $this->isExpired( $db, $row->exptime ) ) { // MISS + $this->debug( "get: key has expired, deleting" ); $db->begin( __METHOD__ ); # Put the expiry time in the WHERE condition to avoid deleting a # newly-inserted value @@ -255,12 +255,12 @@ class SqlBagOStuff extends BagOStuff { array( 'keyname' => $key, 'exptime' => $row->exptime ), __METHOD__ ); $db->commit( __METHOD__ ); - } catch ( DBQueryError $e ) { - $this->handleWriteError( $e, $row->serverIndex ); + $values[$key] = false; + } else { // HIT + $values[$key] = $this->unserialize( $db->decodeBlob( $row->value ) ); } - $values[$key] = false; - } else { // HIT - $values[$key] = $this->unserialize( $db->decodeBlob( $row->value ) ); + } catch ( DBQueryError $e ) { + $this->handleWriteError( $e, $row->serverIndex ); } } else { // MISS $values[$key] = false; @@ -364,7 +364,7 @@ class SqlBagOStuff extends BagOStuff { return false; } - return (bool) $db->affectedRows(); + return (bool)$db->affectedRows(); } /** |