* (bug 14258, 14368) Fix for subpage renames in replication environments

[lhc/web/wiklou.git] / includes / ExternalStoreDB.php

diff --git a/includes/ExternalStoreDB.php b/includes/ExternalStoreDB.php
index acafebe..549412d 100644 (file)
--- a/includes/ExternalStoreDB.php
+++ b/includes/ExternalStoreDB.php
@@ -1,15 +1,4 @@
 <?php
-/**
- *
- * @package MediaWiki
- *
- * DB accessable external objects
- *
- */
-require_once( 'LoadBalancer.php' );
-
-
-/** @package MediaWiki */
 
 /**
  * External database storage will use one (or more) separate connection pools
@@ -31,30 +20,30 @@ $wgExternalLoadBalancers = array();
 global $wgExternalBlobCache;
 $wgExternalBlobCache = array();
 
+/**
+ * DB accessable external objects
+ * @ingroup ExternalStorage
+ */
 class ExternalStoreDB {
-       /**
-        * Fetch data from given URL
-        * @param string $url An url
-        */
 
+       /** @todo Document.*/
        function &getLoadBalancer( $cluster ) {
-               global $wgExternalServers, $wgExternalLoadBalancers;
-               if ( !array_key_exists( $cluster, $wgExternalLoadBalancers ) ) {
-                       $wgExternalLoadBalancers[$cluster] = LoadBalancer::newFromParams( $wgExternalServers[$cluster] );
-               }
-               return $wgExternalLoadBalancers[$cluster];
+               return wfGetLBFactory()->getExternalLB( $cluster );
        }
 
+       /** @todo Document.*/
        function &getSlave( $cluster ) {
                $lb =& $this->getLoadBalancer( $cluster );
                return $lb->getConnection( DB_SLAVE );
        }
 
+       /** @todo Document.*/
        function &getMaster( $cluster ) {
                $lb =& $this->getLoadBalancer( $cluster );
                return $lb->getConnection( DB_MASTER );
        }
 
+       /** @todo Document.*/
        function getTable( &$db ) {
                $table = $db->getLBInfo( 'blobs table' );
                if ( is_null( $table ) ) {
@@ -63,11 +52,11 @@ class ExternalStoreDB {
                return $table;
        }
 
+       /**
+        * Fetch data from given URL
+        * @param string $url An url of the form DB://cluster/id or DB://cluster/id/itemid for concatened storage.
+        */
        function fetchFromURL($url) {
-               global $wgExternalServers;
-               #
-               # URLs have the form DB://cluster/id or DB://cluster/id/itemid for concatenated storage
-               #
                $path = explode( '/', $url );
                $cluster  = $path[2];
                $id       = $path[3];
@@ -79,7 +68,7 @@ class ExternalStoreDB {
 
                $ret =& $this->fetchBlob( $cluster, $id, $itemID );
 
-               if ( $itemID !== false ) {
+               if ( $itemID !== false && $ret !== false ) {
                        return $ret->getItem( $itemID );
                }
                return $ret;
@@ -89,8 +78,11 @@ class ExternalStoreDB {
         * Fetch a blob item out of the database; a cache of the last-loaded
         * blob will be kept so that multiple loads out of a multi-item blob
         * can avoid redundant database access and decompression.
+        * @param $cluster
+        * @param $id
+        * @param $itemID
         * @return mixed
-        * @access private
+        * @private
         */
        function &fetchBlob( $cluster, $id, $itemID ) {
                global $wgExternalBlobCache;
@@ -104,7 +96,16 @@ class ExternalStoreDB {
 
                $dbr =& $this->getSlave( $cluster );
                $ret = $dbr->selectField( $this->getTable( $dbr ), 'blob_text', array( 'blob_id' => $id ) );
-               if( $itemID !== false ) {
+               if ( $ret === false ) {
+                       wfDebugLog( 'ExternalStoreDB', "ExternalStoreDB::fetchBlob master fallback on $cacheID\n" );
+                       // Try the master
+                       $dbw =& $this->getMaster( $cluster );
+                       $ret = $dbw->selectField( $this->getTable( $dbw ), 'blob_text', array( 'blob_id' => $id ) );
+                       if( $ret === false) {
+                               wfDebugLog( 'ExternalStoreDB', "ExternalStoreDB::fetchBlob master failed to find $cacheID\n" );
+                       }
+               }
+               if( $itemID !== false && $ret !== false ) {
                        // Unserialise object; caller extracts item
                        $ret = unserialize( $ret );
                }
@@ -116,19 +117,21 @@ class ExternalStoreDB {
        /**
         * Insert a data item into a given cluster
         *
-        * @param string $cluster The cluster name
-        * @param string $data The data item
+        * @param $cluster String: the cluster name
+        * @param $data String: the data item
         * @return string URL
         */
        function store( $cluster, $data ) {
-               global $wgExternalServers;
                $fname = 'ExternalStoreDB::store';
 
                $dbw =& $this->getMaster( $cluster );
 
                $id = $dbw->nextSequenceValue( 'blob_blob_id_seq' );
                $dbw->insert( $this->getTable( $dbw ), array( 'blob_id' => $id, 'blob_text' => $data ), $fname );
-               return "DB://$cluster/" . $dbw->insertId();
+               $id = $dbw->insertId();
+               if ( $dbw->getFlag( DBO_TRX ) ) {
+                       $dbw->immediateCommit();
+               }
+               return "DB://$cluster/$id";
        }
 }
-?>