X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fexternalstore%2FExternalStore.php;h=b5139d644a64d3e24756e43be0d24db0127a9dae;hb=bfe131448e17c235110a3d60b80b838a2d270bdc;hp=5dd49d75559491fc485a6d7e6204c921be5758e0;hpb=e439cfb1b1dd71417162e23174554e1148707bd6;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/externalstore/ExternalStore.php b/includes/externalstore/ExternalStore.php
index 5dd49d7555..b5139d644a 100644
--- a/includes/externalstore/ExternalStore.php
+++ b/includes/externalstore/ExternalStore.php
@@ -28,12 +28,12 @@
  * Constructor class for key/value blob data kept in external repositories.
  *
  * Objects in external stores are defined by a special URL. The URL is of
- * the form "<store protocal>://<location>/<object name>". The protocal is used
+ * the form "<store protocol>://<location>/<object name>". The protocol is used
  * to determine what ExternalStoreMedium class is used. The location identifies
  * particular storage instances or database clusters for store class to use.
  *
  * When an object is inserted into a store, the calling code uses a partial URL of
- * the form "<store protocal>://<location>" and receives the full object URL on success.
+ * the form "<store protocol>://<location>" and receives the full object URL on success.
  * This is useful since object names can be sequential IDs, UUIDs, or hashes.
  * Callers are not responsible for unique name generation.
  *
@@ -47,8 +47,8 @@ class ExternalStore {
 	/**
 	 * Get an external store object of the given type, with the given parameters
 	 *
-	 * @param $proto string Type of external storage, should be a value in $wgExternalStores
-	 * @param $params array Associative array of ExternalStoreMedium parameters
+	 * @param string $proto Type of external storage, should be a value in $wgExternalStores
+	 * @param array $params Associative array of ExternalStoreMedium parameters
 	 * @return ExternalStoreMedium|bool The store class or false on error
 	 */
 	public static function getStoreObject( $proto, array $params = array() ) {
@@ -60,14 +60,14 @@ class ExternalStore {
 
 		$class = 'ExternalStore' . ucfirst( $proto );
 		// Any custom modules should be added to $wgAutoLoadClasses for on-demand loading
-		return MWInit::classExists( $class ) ? new $class( $params ) : false;
+		return class_exists( $class ) ? new $class( $params ) : false;
 	}
 
 	/**
 	 * Fetch data from given URL
 	 *
-	 * @param $url string The URL of the text to get
-	 * @param $params array Associative array of ExternalStoreMedium parameters
+	 * @param string $url The URL of the text to get
+	 * @param array $params Associative array of ExternalStoreMedium parameters
 	 * @return string|bool The text stored or false on error
 	 * @throws MWException
 	 */
@@ -90,14 +90,47 @@ class ExternalStore {
 		return $store->fetchFromURL( $url );
 	}
 
+	/**
+	 * Fetch data from multiple URLs with a minimum of round trips
+	 *
+	 * @param array $urls The URLs of the text to get
+	 * @return array Map from url to its data.  Data is either string when found
+	 *     or false on failure.
+	 */
+	public static function batchFetchFromURLs( array $urls ) {
+		$batches = array();
+		foreach ( $urls as $url ) {
+			$scheme = parse_url( $url, PHP_URL_SCHEME );
+			if ( $scheme ) {
+				$batches[$scheme][] = $url;
+			}
+		}
+		$retval = array();
+		foreach ( $batches as $proto => $batchedUrls ) {
+			$store = self::getStoreObject( $proto );
+			if ( $store === false ) {
+				continue;
+			}
+			$retval += $store->batchFetchFromURLs( $batchedUrls );
+		}
+		// invalid, not found, db dead, etc.
+		$missing = array_diff( $urls, array_keys( $retval ) );
+		if ( $missing ) {
+			foreach ( $missing as $url ) {
+				$retval[$url] = false;
+			}
+		}
+		return $retval;
+	}
+
 	/**
 	 * Store a data item to an external store, identified by a partial URL
 	 * The protocol part is used to identify the class, the rest is passed to the
 	 * class itself as a parameter.
 	 *
-	 * @param $url String A partial external store URL ("<store type>://<location>")
+	 * @param string $url A partial external store URL ("<store type>://<location>")
 	 * @param $data string
-	 * @param $params array Associative array of ExternalStoreMedium parameters
+	 * @param array $params Associative array of ExternalStoreMedium parameters
 	 * @return string|bool The URL of the stored data item, or false on error
 	 * @throws MWException
 	 */
@@ -126,7 +159,7 @@ class ExternalStore {
 	 * itself. It also fails-over to the next possible clusters.
 	 *
 	 * @param $data string
-	 * @param $params array Associative array of ExternalStoreMedium parameters
+	 * @param array $params Associative array of ExternalStoreMedium parameters
 	 * @return string|bool The URL of the stored data item, or false on error
 	 * @throws MWException
 	 */