From 9d419f69b17eaf68ced396fc0b6928b23623b85c Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 14 Sep 2016 00:19:30 -0700
Subject: [PATCH] Move IDatabase/ILoadBalancer to /libs/rdbms

Change-Id: I71f980b1024dc2fbca9cafbad2c9daebb6f28c9b
---
 autoload.php                                              | 4 ++--
 includes/{db => libs/rdbms/database}/IDatabase.php        | 8 ++++----
 .../{db => libs/rdbms}/loadbalancer/ILoadBalancer.php     | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)
 rename includes/{db => libs/rdbms/database}/IDatabase.php (99%)
 rename includes/{db => libs/rdbms}/loadbalancer/ILoadBalancer.php (99%)

diff --git a/autoload.php b/autoload.php
index d6908c17de..66736b3d42 100644
--- a/autoload.php
+++ b/autoload.php
@@ -575,12 +575,12 @@ $wgAutoloadLocalClasses = [
 	'ICacheHelper' => __DIR__ . '/includes/cache/CacheHelper.php',
 	'IContextSource' => __DIR__ . '/includes/context/IContextSource.php',
 	'IDBAccessObject' => __DIR__ . '/includes/dao/IDBAccessObject.php',
-	'IDatabase' => __DIR__ . '/includes/db/IDatabase.php',
+	'IDatabase' => __DIR__ . '/includes/libs/rdbms/database/IDatabase.php',
 	'IEContentAnalyzer' => __DIR__ . '/includes/libs/IEContentAnalyzer.php',
 	'IEUrlExtension' => __DIR__ . '/includes/libs/IEUrlExtension.php',
 	'IExpiringStore' => __DIR__ . '/includes/libs/objectcache/IExpiringStore.php',
 	'IJobSpecification' => __DIR__ . '/includes/jobqueue/JobSpecification.php',
-	'ILoadBalancer' => __DIR__ . '/includes/db/loadbalancer/ILoadBalancer.php',
+	'ILoadBalancer' => __DIR__ . '/includes/libs/rdbms/loadbalancer/ILoadBalancer.php',
 	'IP' => __DIR__ . '/includes/utils/IP.php',
 	'IPSet' => __DIR__ . '/includes/compat/IPSetCompat.php',
 	'IPTC' => __DIR__ . '/includes/media/IPTC.php',
diff --git a/includes/db/IDatabase.php b/includes/libs/rdbms/database/IDatabase.php
similarity index 99%
rename from includes/db/IDatabase.php
rename to includes/libs/rdbms/database/IDatabase.php
index e2d743617e..f1242e4a4f 100644
--- a/includes/db/IDatabase.php
+++ b/includes/libs/rdbms/database/IDatabase.php
@@ -445,7 +445,7 @@ interface IDatabase {
 	 * Closes a database connection.
 	 * if it is open : commits any open transactions
 	 *
-	 * @throws MWException
+	 * @throws DBError
 	 * @return bool Operation success. true if already closed.
 	 */
 	public function close();
@@ -474,7 +474,7 @@ interface IDatabase {
 	 *     comment (you can use __METHOD__ or add some extra info)
 	 * @param bool $tempIgnore Whether to avoid throwing an exception on errors...
 	 *     maybe best to catch the exception instead?
-	 * @throws MWException
+	 * @throws DBError
 	 * @return bool|ResultWrapper True for a successful write query, ResultWrapper object
 	 *     for a successful read query, or false on failure if $tempIgnore set
 	 */
@@ -890,7 +890,7 @@ interface IDatabase {
 	 *    - LIST_OR:    ORed WHERE clause (without the WHERE)
 	 *    - LIST_SET:   Comma separated with field names, like a SET clause
 	 *    - LIST_NAMES: Comma separated field names
-	 * @throws MWException|DBUnexpectedError
+	 * @throws DBError
 	 * @return string
 	 */
 	public function makeList( $a, $mode = LIST_COMMA );
@@ -1486,7 +1486,7 @@ interface IDatabase {
 	 *
 	 * @param string $prefix Only show tables with this prefix, e.g. mw_
 	 * @param string $fname Calling function name
-	 * @throws MWException
+	 * @throws DBError
 	 * @return array
 	 */
 	public function listTables( $prefix = null, $fname = __METHOD__ );
diff --git a/includes/db/loadbalancer/ILoadBalancer.php b/includes/libs/rdbms/loadbalancer/ILoadBalancer.php
similarity index 99%
rename from includes/db/loadbalancer/ILoadBalancer.php
rename to includes/libs/rdbms/loadbalancer/ILoadBalancer.php
index 94e0f2be53..69c62725f8 100644
--- a/includes/db/loadbalancer/ILoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/ILoadBalancer.php
@@ -37,7 +37,7 @@ interface ILoadBalancer {
 	 *  - waitTimeout : Maximum time to wait for replicas for consistency [optional]
 	 *  - srvCache : BagOStuff object [optional]
 	 *  - wanCache : WANObjectCache object [optional]
-	 * @throws MWException
+	 * @throws InvalidArgumentException
 	 */
 	public function __construct( array $params );
 
@@ -49,7 +49,7 @@ interface ILoadBalancer {
 	 * Side effect: opens connections to databases
 	 * @param string|bool $group Query group, or false for the generic reader
 	 * @param string|bool $wiki Wiki ID, or false for the current wiki
-	 * @throws MWException
+	 * @throws DBError
 	 * @return bool|int|string
 	 */
 	public function getReaderIndex( $group = false, $wiki = false );
@@ -98,7 +98,7 @@ interface ILoadBalancer {
 	 * @param array|string|bool $groups Query group(s), or false for the generic reader
 	 * @param string|bool $wiki Wiki ID, or false for the current wiki
 	 *
-	 * @throws MWException
+	 * @throws DBError
 	 * @return IDatabase
 	 */
 	public function getConnection( $i, $groups = [], $wiki = false );
@@ -109,7 +109,7 @@ interface ILoadBalancer {
 	 * the same number of times as getConnection() to work.
 	 *
 	 * @param IDatabase $conn
-	 * @throws MWException
+	 * @throws InvalidArgumentException
 	 */
 	public function reuseConnection( $conn );
 
-- 
2.20.1