jenkins-bot has submitted this change and it was merged.
Change subject: Made SqlBagOStuff fully avoid transactions when possible
......................................................................
Made SqlBagOStuff fully avoid transactions when possible
Change-Id: I775d872b522f68462496bbfa685665cc8faf9bf1
---
M includes/objectcache/SqlBagOStuff.php
1 file changed, 18 insertions(+), 18 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/objectcache/SqlBagOStuff.php
b/includes/objectcache/SqlBagOStuff.php
index acf2703..919b8b3 100644
--- a/includes/objectcache/SqlBagOStuff.php
+++ b/includes/objectcache/SqlBagOStuff.php
@@ -248,13 +248,13 @@
$db = $this->getDB( $row->serverIndex );
if ( $this->isExpired( $db,
$row->exptime ) ) { // MISS
$this->debug( "get: key has
expired, deleting" );
- $db->begin( __METHOD__ );
+ $db->commit( __METHOD__,
'flush' );
# Put the expiry time in the
WHERE condition to avoid deleting a
# newly-inserted value
$db->delete( $row->tableName,
array( 'keyname' =>
$key, 'exptime' => $row->exptime ),
__METHOD__ );
- $db->commit( __METHOD__ );
+ $db->commit( __METHOD__,
'flush' );
$values[$key] = false;
} else { // HIT
$values[$key] =
$this->unserialize( $db->decodeBlob( $row->value ) );
@@ -296,7 +296,7 @@
$encExpiry = $db->timestamp( $exptime );
}
- $db->begin( __METHOD__ );
+ $db->commit( __METHOD__, 'flush' );
// (bug 24425) use a replace if the db supports it
instead of
// delete/insert to avoid clashes with conflicting
keynames
$db->replace(
@@ -307,7 +307,7 @@
'value' => $db->encodeBlob(
$this->serialize( $value ) ),
'exptime' => $encExpiry
), __METHOD__ );
- $db->commit( __METHOD__ );
+ $db->commit( __METHOD__, 'flush' );
} catch ( DBError $e ) {
$this->handleWriteError( $e, $serverIndex );
return false;
@@ -341,7 +341,7 @@
}
$encExpiry = $db->timestamp( $exptime );
}
- $db->begin( __METHOD__ );
+ $db->commit( __METHOD__, 'flush' );
// (bug 24425) use a replace if the db supports it
instead of
// delete/insert to avoid clashes with conflicting
keynames
$db->update(
@@ -357,7 +357,7 @@
),
__METHOD__
);
- $db->commit( __METHOD__ );
+ $db->commit( __METHOD__, 'flush' );
} catch ( DBQueryError $e ) {
$this->handleWriteError( $e, $serverIndex );
@@ -376,12 +376,12 @@
list( $serverIndex, $tableName ) = $this->getTableByKey( $key );
try {
$db = $this->getDB( $serverIndex );
- $db->begin( __METHOD__ );
+ $db->commit( __METHOD__, 'flush' );
$db->delete(
$tableName,
array( 'keyname' => $key ),
__METHOD__ );
- $db->commit( __METHOD__ );
+ $db->commit( __METHOD__, 'flush' );
} catch ( DBError $e ) {
$this->handleWriteError( $e, $serverIndex );
return false;
@@ -400,7 +400,7 @@
try {
$db = $this->getDB( $serverIndex );
$step = intval( $step );
- $db->begin( __METHOD__ );
+ $db->commit( __METHOD__, 'flush' );
$row = $db->selectRow(
$tableName,
array( 'value', 'exptime' ),
@@ -409,14 +409,14 @@
array( 'FOR UPDATE' ) );
if ( $row === false ) {
// Missing
- $db->commit( __METHOD__ );
+ $db->commit( __METHOD__, 'flush' );
return null;
}
$db->delete( $tableName, array( 'keyname' => $key ),
__METHOD__ );
if ( $this->isExpired( $db, $row->exptime ) ) {
// Expired, do not reinsert
- $db->commit( __METHOD__ );
+ $db->commit( __METHOD__, 'flush' );
return null;
}
@@ -434,7 +434,7 @@
// Race condition. See bug 28611
$newValue = null;
}
- $db->commit( __METHOD__ );
+ $db->commit( __METHOD__, 'flush' );
} catch ( DBError $e ) {
$this->handleWriteError( $e, $serverIndex );
return null;
@@ -524,7 +524,7 @@
$maxExpTime =
$row->exptime;
}
- $db->begin( __METHOD__ );
+ $db->commit( __METHOD__,
'flush' );
$db->delete(
$this->getTableNameByShard( $i ),
array(
@@ -533,7 +533,7 @@
'keyname' =>
$keys
),
__METHOD__ );
- $db->commit( __METHOD__ );
+ $db->commit( __METHOD__,
'flush' );
if ( $progressCallback ) {
if ( intval(
$totalSeconds ) === 0 ) {
@@ -566,9 +566,9 @@
try {
$db = $this->getDB( $serverIndex );
for ( $i = 0; $i < $this->shards; $i++ ) {
- $db->begin( __METHOD__ );
+ $db->commit( __METHOD__, 'flush' );
$db->delete(
$this->getTableNameByShard( $i ), '*', __METHOD__ );
- $db->commit( __METHOD__ );
+ $db->commit( __METHOD__, 'flush' );
}
} catch ( DBError $e ) {
$this->handleWriteError( $e, $serverIndex );
@@ -684,12 +684,12 @@
}
for ( $i = 0; $i < $this->shards; $i++ ) {
- $db->begin( __METHOD__ );
+ $db->commit( __METHOD__, 'flush' );
$db->query(
'CREATE TABLE ' . $db->tableName(
$this->getTableNameByShard( $i ) ) .
' LIKE ' . $db->tableName(
'objectcache' ),
__METHOD__ );
- $db->commit( __METHOD__ );
+ $db->commit( __METHOD__, 'flush' );
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/96924
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I775d872b522f68462496bbfa685665cc8faf9bf1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Springle <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
