From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 7 Aug 2019 20:44:06 +0000 (-0700)
Subject: rdbms: remove HIGH_PRIORITY/LOW_PRIORITY SQL references from IDatabase
X-Git-Tag: 1.34.0-rc.0~752
X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=3cdf794c95e48d6d53abcad8f9bd4f396a220932;p=lhc%2Fweb%2Fwiklou.git

rdbms: remove HIGH_PRIORITY/LOW_PRIORITY SQL references from IDatabase

These should not be used even with MySQL as they do not help concurrency

Change-Id: I5385fcbe65e676b184268286bedd5c2299b447d4
---

diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php
index ffd40268d8..8b4ff679f3 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -1715,10 +1715,6 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 			$startOpts .= ' /*! STRAIGHT_JOIN */';
 		}
 
-		if ( isset( $noKeyOptions['HIGH_PRIORITY'] ) ) {
-			$startOpts .= ' HIGH_PRIORITY';
-		}
-
 		if ( isset( $noKeyOptions['SQL_BIG_RESULT'] ) ) {
 			$startOpts .= ' SQL_BIG_RESULT';
 		}
diff --git a/includes/libs/rdbms/database/DatabaseMssql.php b/includes/libs/rdbms/database/DatabaseMssql.php
index db029a389e..9d4a364a88 100644
--- a/includes/libs/rdbms/database/DatabaseMssql.php
+++ b/includes/libs/rdbms/database/DatabaseMssql.php
@@ -785,7 +785,6 @@ class DatabaseMssql extends Database {
 	 *
 	 * @param array $options An array of UPDATE options, can be:
 	 *                   - IGNORE: Ignore unique key conflicts
-	 *                   - LOW_PRIORITY: MySQL-specific, see MySQL manual.
 	 * @return bool
 	 * @throws DBUnexpectedError
 	 * @throws Exception
diff --git a/includes/libs/rdbms/database/DatabaseMysqlBase.php b/includes/libs/rdbms/database/DatabaseMysqlBase.php
index b1a88ed7b9..a9223ac3b9 100644
--- a/includes/libs/rdbms/database/DatabaseMysqlBase.php
+++ b/includes/libs/rdbms/database/DatabaseMysqlBase.php
@@ -1085,13 +1085,6 @@ abstract class DatabaseMysqlBase extends Database {
 		return "IGNORE INDEX (" . $this->indexName( $index ) . ")";
 	}
 
-	/**
-	 * @return string
-	 */
-	function lowPriorityOption() {
-		return 'LOW_PRIORITY';
-	}
-
 	/**
 	 * @return string
 	 */
diff --git a/includes/libs/rdbms/database/IDatabase.php b/includes/libs/rdbms/database/IDatabase.php
index f66e327735..1c42d2d350 100644
--- a/includes/libs/rdbms/database/IDatabase.php
+++ b/includes/libs/rdbms/database/IDatabase.php
@@ -709,7 +709,6 @@ interface IDatabase {
 	 *
 	 *    - LOCK IN SHARE MODE
 	 *    - STRAIGHT_JOIN
-	 *    - HIGH_PRIORITY
 	 *    - SQL_BIG_RESULT
 	 *    - SQL_BUFFER_RESULT
 	 *    - SQL_SMALL_RESULT
@@ -717,7 +716,6 @@ interface IDatabase {
 	 *    - SQL_CACHE
 	 *    - SQL_NO_CACHE
 	 *
-	 *
 	 * @param string|array $join_conds Join conditions
 	 *
 	 * Optional associative array of table-specific join conditions. In the
@@ -929,7 +927,6 @@ interface IDatabase {
 	 *   for logging and profiling.
 	 * @param array $options An array of UPDATE options, can be:
 	 *   - IGNORE: Ignore unique key conflicts
-	 *   - LOW_PRIORITY: MySQL-specific, see MySQL manual.
 	 * @return bool Return true if no exception was thrown (deprecated since 1.33)
 	 * @throws DBError
 	 */