X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FExternalStoreDB.php;h=f2e80c98fe2f440191ea1d707dd52da0f3945fde;hb=3fe917dc68c25dc4b5decdedba7177ed83d63c17;hp=c0fef52b9eb194340ea6e3e402c82fb1adb939f1;hpb=491173a7e7ca67470058f5e53ad4c5e5fe24dc05;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/ExternalStoreDB.php b/includes/ExternalStoreDB.php
index c0fef52b9e..f2e80c98fe 100644
--- 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,31 +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] );
-		}
-		$wgExternalLoadBalancers[$cluster]->allowLagged(true);
-		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 ) ) {
@@ -64,11 +52,11 @@ class ExternalStoreDB {
 		return $table;
 	}
 
-	function fetchFromURL($url) {
-		global $wgExternalServers;
-		#
-		# URLs have the form DB://cluster/id or DB://cluster/id/itemid for concatenated storage
-		#
+	/**
+	 * 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 ) {
 		$path = explode( '/', $url );
 		$cluster  = $path[2];
 		$id	  = $path[3];
@@ -90,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;
@@ -106,9 +97,13 @@ class ExternalStoreDB {
 		$dbr =& $this->getSlave( $cluster );
 		$ret = $dbr->selectField( $this->getTable( $dbr ), 'blob_text', array( 'blob_id' => $id ) );
 		if ( $ret === false ) {
+			wfDebugLog( 'ExternalStoreDB', "ExternalStoreDB::fetchBlob master fallback on $cacheID\n" );
 			// Try the master
 			$dbw =& $this->getMaster( $cluster );
-			$ret = $dbr->selectField( $this->getTable( $dbr ), 'blob_text', array( 'blob_id' => $id ) );
+			$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
@@ -122,18 +117,19 @@ 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 );
-
+		$dbw = $this->getMaster( $cluster );
+		if( !$dbw ) {
+			return false;
+		}
 		$id = $dbw->nextSequenceValue( 'blob_blob_id_seq' );
-		$dbw->insert( $this->getTable( $dbw ), array( 'blob_id' => $id, 'blob_text' => $data ), $fname );
+		$dbw->insert( $this->getTable( $dbw ), 
+			array( 'blob_id' => $id, 'blob_text' => $data ), 
+			__METHOD__ );
 		$id = $dbw->insertId();
 		if ( $dbw->getFlag( DBO_TRX ) ) {
 			$dbw->immediateCommit();
@@ -141,4 +137,3 @@ class ExternalStoreDB {
 		return "DB://$cluster/$id";
 	}
 }
-?>