diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2014-12-27 15:41:37 +0100 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2014-12-31 11:43:28 +0100 |
commit | c1f9b1f7b1b77776192048005dcc66dcf3df2bfb (patch) | |
tree | 2b38796e738dd74cb42ecd9bfd151803108386bc /includes/dao | |
parent | b88ab0086858470dd1f644e64cb4e4f62bb2be9b (diff) |
Update to MediaWiki 1.24.1
Diffstat (limited to 'includes/dao')
-rw-r--r-- | includes/dao/DBAccessBase.php | 8 | ||||
-rw-r--r-- | includes/dao/IDBAccessObject.php | 13 |
2 files changed, 12 insertions, 9 deletions
diff --git a/includes/dao/DBAccessBase.php b/includes/dao/DBAccessBase.php index 6c009dee..3909faa7 100644 --- a/includes/dao/DBAccessBase.php +++ b/includes/dao/DBAccessBase.php @@ -2,7 +2,7 @@ /** * Base class for objects that allow access to other wiki's databases using - * the foreign database access mechanism implemented by LBFactory_multi. + * the foreign database access mechanism implemented by LBFactoryMulti. * * 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 @@ -28,9 +28,8 @@ * @author Daniel Kinzler */ abstract class DBAccessBase implements IDBAccessObject { - /** - * @var String|bool $wiki The target wiki's name. This must be an ID + * @var string|bool $wiki The target wiki's name. This must be an ID * that LBFactory can understand. */ protected $wiki = false; @@ -58,6 +57,7 @@ abstract class DBAccessBase implements IDBAccessObject { */ protected function getConnection( $id, $groups = array() ) { $loadBalancer = wfGetLB( $this->wiki ); + return $loadBalancer->getConnection( $id, $groups, $this->wiki ); } @@ -68,7 +68,7 @@ abstract class DBAccessBase implements IDBAccessObject { * * @since 1.21 * - * @param DatabaseBase $db the database connection to release. + * @param DatabaseBase $db The database connection to release. */ protected function releaseConnection( DatabaseBase $db ) { if ( $this->wiki !== false ) { diff --git a/includes/dao/IDBAccessObject.php b/includes/dao/IDBAccessObject.php index 4eb6ff3e..3690735e 100644 --- a/includes/dao/IDBAccessObject.php +++ b/includes/dao/IDBAccessObject.php @@ -28,10 +28,12 @@ * functions. In general, objects should assume READ_NORMAL if no flags are explicitly given, * though certain objects may assume READ_LATEST for common use case or legacy reasons. * - * There are three types of reads: - * - READ_NORMAL : Potentially cached read of data (e.g. from a slave or stale replica) - * - READ_LATEST : Up-to-date read as of transaction start (e.g. from master or a quorum read) - * - READ_LOCKING : Up-to-date read as of now, that locks the records for the transaction + * There are four types of reads: + * - READ_NORMAL : Potentially cached read of data (e.g. from a slave or stale replica) + * - READ_LATEST : Up-to-date read as of transaction start (e.g. from master or a quorum read) + * - READ_LOCKING : Up-to-date read as of now, that locks (shared) the records + * - READ_EXCLUSIVE : Up-to-date read as of now, that locks (exclusive) the records + * All record locks persist for the duration of the transaction. * * Callers should use READ_NORMAL (or pass in no flags) unless the read determines a write. * In theory, such cases may require READ_LOCKING, though to avoid contention, READ_LATEST is @@ -47,7 +49,8 @@ interface IDBAccessObject { // Constants for object loading bitfield flags (higher => higher QoS) const READ_LATEST = 1; // read from the master - const READ_LOCKING = 3; // READ_LATEST and "FOR UPDATE" + const READ_LOCKING = 3; // READ_LATEST (1) and "LOCK IN SHARE MODE" (2) + const READ_EXCLUSIVE = 7; // READ_LOCKING (3) and "FOR UPDATE" (4) // Convenience constant for callers to explicitly request slave data const READ_NORMAL = 0; // read from the slave |