X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=includes%2Flibs%2Frdbms%2Fdatabase%2FDatabase.php;h=c04e16773886b5efb27b7f942287f6316893ce95;hb=4bd3e80e7ac013fc225f295a08c7709954889f6e;hp=c9040928b0a88a4670b6b37ab8e15d6f7cf205f6;hpb=91be4ee4645e28866910f654c6eda730a692fc90;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php
index c9040928b0..c04e167738 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -1130,6 +1130,20 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 		}
 	}
 
+	/**
+	 * Checks whether the cause of the error is detected to be a timeout.
+	 *
+	 * It returns false by default, and not all engines support detecting this yet.
+	 * If this returns false, it will be treated as a generic query error.
+	 *
+	 * @param string $error Error text
+	 * @param int $errno Error number
+	 * @return bool
+	 */
+	protected function wasQueryTimeout( $error, $errno ) {
+		return false;
+	}
+
 	public function reportQueryError( $error, $errno, $sql, $fname, $tempIgnore = false ) {
 		if ( $this->ignoreErrors() || $tempIgnore ) {
 			$this->queryLogger->debug( "SQL ERROR (ignored): $error\n" );
@@ -1146,7 +1160,12 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 				] )
 			);
 			$this->queryLogger->debug( "SQL ERROR: " . $error . "\n" );
-			throw new DBQueryError( $this, $error, $errno, $sql, $fname );
+			$wasQueryTimeout = $this->wasQueryTimeout( $error, $errno );
+			if ( $wasQueryTimeout ) {
+				throw new DBQueryTimeoutError( $this, $error, $errno, $sql, $fname );
+			} else {
+				throw new DBQueryError( $this, $error, $errno, $sql, $fname );
+			}
 		}
 	}
 
@@ -1996,11 +2015,21 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 				// No alias? Set it equal to the table name
 				$alias = $table;
 			}
+
+			if ( is_array( $table ) ) {
+				// A parenthesized group
+				$joinedTable = '('
+					. $this->tableNamesWithIndexClauseOrJOIN( $table, $use_index, $ignore_index, $join_conds )
+					. ')';
+			} else {
+				$joinedTable = $this->tableNameWithAlias( $table, $alias );
+			}
+
 			// Is there a JOIN clause for this table?
 			if ( isset( $join_conds[$alias] ) ) {
 				list( $joinType, $conds ) = $join_conds[$alias];
 				$tableClause = $joinType;
-				$tableClause .= ' ' . $this->tableNameWithAlias( $table, $alias );
+				$tableClause .= ' ' . $joinedTable;
 				if ( isset( $use_index[$alias] ) ) { // has USE INDEX?
 					$use = $this->useIndexClause( implode( ',', (array)$use_index[$alias] ) );
 					if ( $use != '' ) {
@@ -2022,7 +2051,7 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 				$retJOIN[] = $tableClause;
 			} elseif ( isset( $use_index[$alias] ) ) {
 				// Is there an INDEX clause for this table?
-				$tableClause = $this->tableNameWithAlias( $table, $alias );
+				$tableClause = $joinedTable;
 				$tableClause .= ' ' . $this->useIndexClause(
 						implode( ',', (array)$use_index[$alias] )
 					);
@@ -2030,14 +2059,14 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 				$ret[] = $tableClause;
 			} elseif ( isset( $ignore_index[$alias] ) ) {
 				// Is there an INDEX clause for this table?
-				$tableClause = $this->tableNameWithAlias( $table, $alias );
+				$tableClause = $joinedTable;
 				$tableClause .= ' ' . $this->ignoreIndexClause(
 						implode( ',', (array)$ignore_index[$alias] )
 					);
 
 				$ret[] = $tableClause;
 			} else {
-				$tableClause = $this->tableNameWithAlias( $table, $alias );
+				$tableClause = $joinedTable;
 
 				$ret[] = $tableClause;
 			}
@@ -2389,6 +2418,37 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 			);
 		}
 
+		return $this->nonNativeInsertSelect(
+			$destTable,
+			$srcTable,
+			$varMap,
+			$conds,
+			$fname,
+			$insertOptions,
+			$selectOptions,
+			$selectJoinConds
+		);
+	}
+
+	/**
+	 * Implementation of insertSelect() based on select() and insert()
+	 *
+	 * @see IDatabase::insertSelect()
+	 * @since 1.30
+	 * @param string $destTable
+	 * @param string|array $srcTable
+	 * @param array $varMap
+	 * @param array $conds
+	 * @param string $fname
+	 * @param array $insertOptions
+	 * @param array $selectOptions
+	 * @param array $selectJoinConds
+	 * @return bool
+	 */
+	protected function nonNativeInsertSelect( $destTable, $srcTable, $varMap, $conds,
+		$fname = __METHOD__,
+		$insertOptions = [], $selectOptions = [], $selectJoinConds = []
+	) {
 		// For web requests, do a locking SELECT and then INSERT. This puts the SELECT burden
 		// on only the master (without needing row-based-replication). It also makes it easy to
 		// know how big the INSERT is going to be.
@@ -3028,8 +3088,16 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 
 		$this->mTrxIdleCallbacks = []; // clear
 		$this->mTrxPreCommitCallbacks = []; // clear
-		$this->runOnTransactionIdleCallbacks( self::TRIGGER_ROLLBACK );
-		$this->runTransactionListenerCallbacks( self::TRIGGER_ROLLBACK );
+		try {
+			$this->runOnTransactionIdleCallbacks( self::TRIGGER_ROLLBACK );
+		} catch ( Exception $e ) {
+			// already logged; finish and let LoadBalancer move on during mass-rollback
+		}
+		try {
+			$this->runTransactionListenerCallbacks( self::TRIGGER_ROLLBACK );
+		} catch ( Exception $e ) {
+			// already logged; let LoadBalancer move on during mass-rollback
+		}
 	}
 
 	/**