Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/224656
Change subject: Added DBAccessObjectUtils class to avoid duplication
......................................................................
Added DBAccessObjectUtils class to avoid duplication
* WikiPage is the first caller to use this instead of DIY
* This can be used elsewhere to keep callers uniform
Change-Id: Ia6371eaa185d70d1431271b2c6c955523cd424e8
---
M autoload.php
A includes/dao/DBAccessObjectUtils.php
M includes/page/WikiPage.php
3 files changed, 67 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/56/224656/1
diff --git a/autoload.php b/autoload.php
index 6444e3e..2a096f4 100644
--- a/autoload.php
+++ b/autoload.php
@@ -279,6 +279,7 @@
'CurlHttpRequest' => __DIR__ . '/includes/HttpFunctions.php',
'DBAccessBase' => __DIR__ . '/includes/dao/DBAccessBase.php',
'DBAccessError' => __DIR__ . '/includes/db/LBFactory.php',
+ 'DBAccessObjectUtils' => __DIR__ .
'/includes/dao/DBAccessObjectUtils.php',
'DBConnRef' => __DIR__ . '/includes/db/DBConnRef.php',
'DBConnectionError' => __DIR__ . '/includes/db/DatabaseError.php',
'DBError' => __DIR__ . '/includes/db/DatabaseError.php',
diff --git a/includes/dao/DBAccessObjectUtils.php
b/includes/dao/DBAccessObjectUtils.php
new file mode 100644
index 0000000..58f991f
--- /dev/null
+++ b/includes/dao/DBAccessObjectUtils.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * This file contains database access object related constants.
+ *
+ * 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
+ * @ingroup Database
+ */
+
+/**
+ * Helper class for DAO classes
+ *
+ * @since 1.26
+ */
+class DBAccessObjectUtils {
+ /**
+ * @param integer $bitfield
+ * @param integer $flags IDBAccessObject::READ_* constant
+ * @return bool Bitfield has flag $flag set
+ */
+ public static function hasFlags( $bitfield, $flags ) {
+ return ( $bitfield & $flags ) == $flags;
+ }
+
+ /**
+ * Get an appropriate DB index and options for a query
+ *
+ * @param integer $bitfield
+ * @return array (DB_MASTER/DB_SLAVE, SELECT options array)
+ */
+ public static function getDBOptions( $bitfield ) {
+ $index = self::hasFlags( $bitfield,
IDBAccessObject::READ_LATEST )
+ ? DB_MASTER
+ : DB_SLAVE;
+
+ $options = array();
+ if ( self::hasFlags( $bitfield, IDBAccessObject::READ_EXCLUSIVE
) ) {
+ $options[] = 'FOR UPDATE';
+ } elseif ( self::hasFlags( $bitfield,
IDBAccessObject::READ_LOCKING ) ) {
+ $options[] = 'LOCK IN SHARE MODE';
+ }
+
+ return array( $index, $options );
+ }
+}
\ No newline at end of file
diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index f7f2528..fe0ca0d 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -361,18 +361,18 @@
return;
}
- if ( $from === self::READ_LOCKING ) {
- $data = $this->pageDataFromTitle( wfGetDB( DB_MASTER ),
$this->mTitle, array( 'FOR UPDATE' ) );
- } elseif ( $from === self::READ_LATEST ) {
- $data = $this->pageDataFromTitle( wfGetDB( DB_MASTER ),
$this->mTitle );
- } elseif ( $from === self::READ_NORMAL ) {
- $data = $this->pageDataFromTitle( wfGetDB( DB_SLAVE ),
$this->mTitle );
+ if ( is_int( $from ) ) {
+ list( $index, $opts ) =
DBAccessObjectUtils::getDBOptions( $from );
+ $data = $this->pageDataFromTitle( wfGetDB( $index ),
$this->mTitle, $opts );
+
if ( !$data
+ && $index == DB_SLAVE
&& wfGetLB()->getServerCount() > 1
&& wfGetLB()->hasOrMadeRecentMasterChanges()
) {
$from = self::READ_LATEST;
- $data = $this->pageDataFromTitle( wfGetDB(
DB_MASTER ), $this->mTitle );
+ list( $index, $opts ) =
DBAccessObjectUtils::getDBOptions( $from );
+ $data = $this->pageDataFromTitle( wfGetDB(
$index ), $this->mTitle, $opts );
}
} else {
// No idea from where the caller got this data, assume
slave database.
--
To view, visit https://gerrit.wikimedia.org/r/224656
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6371eaa185d70d1431271b2c6c955523cd424e8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
