From 864eab03e7620905dc37fd119d04290aca5d0b7c Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Tue, 7 Feb 2017 22:48:30 -0800 Subject: [PATCH] Move DBMasterPos to Rdbms namespace Updated all callers Change-Id: Iacd5d6f7f18d8b23df24637cda61592112490eb0 --- autoload.php | 4 ++-- includes/libs/rdbms/ChronologyProtector.php | 1 - includes/libs/rdbms/database/DBConnRef.php | 1 + includes/libs/rdbms/database/Database.php | 1 + includes/libs/rdbms/database/DatabaseMysqlBase.php | 2 ++ includes/libs/rdbms/database/IDatabase.php | 1 + includes/libs/rdbms/database/position/DBMasterPos.php | 3 +++ includes/libs/rdbms/database/position/MySQLMasterPos.php | 5 +++++ includes/libs/rdbms/loadbalancer/ILoadBalancer.php | 1 - includes/libs/rdbms/loadbalancer/LoadBalancer.php | 1 + tests/phpunit/includes/db/DatabaseMysqlBaseTest.php | 1 + tests/phpunit/includes/db/LBFactoryTest.php | 1 + 12 files changed, 18 insertions(+), 4 deletions(-) diff --git a/autoload.php b/autoload.php index 1cb8a148ba..a9af3ac400 100644 --- a/autoload.php +++ b/autoload.php @@ -313,7 +313,6 @@ $wgAutoloadLocalClasses = [ 'DBExpectedError' => __DIR__ . '/includes/libs/rdbms/exception/DBExpectedError.php', 'DBFileJournal' => __DIR__ . '/includes/filebackend/filejournal/DBFileJournal.php', 'DBLockManager' => __DIR__ . '/includes/libs/lockmanager/DBLockManager.php', - 'DBMasterPos' => __DIR__ . '/includes/libs/rdbms/database/position/DBMasterPos.php', 'DBQueryError' => __DIR__ . '/includes/libs/rdbms/exception/DBQueryError.php', 'DBReadOnlyError' => __DIR__ . '/includes/libs/rdbms/exception/DBReadOnlyError.php', 'DBReplicationWaitError' => __DIR__ . '/includes/libs/rdbms/exception/DBReplicationWaitError.php', @@ -982,7 +981,6 @@ $wgAutoloadLocalClasses = [ 'MutableContext' => __DIR__ . '/includes/context/MutableContext.php', 'MwSql' => __DIR__ . '/maintenance/sql.php', 'MySQLField' => __DIR__ . '/includes/libs/rdbms/field/MySQLField.php', - 'MySQLMasterPos' => __DIR__ . '/includes/libs/rdbms/database/position/MySQLMasterPos.php', 'MySqlLockManager' => __DIR__ . '/includes/filebackend/lockmanager/MySqlLockManager.php', 'MysqlInstaller' => __DIR__ . '/includes/installer/MysqlInstaller.php', 'MysqlUpdater' => __DIR__ . '/includes/installer/MysqlUpdater.php', @@ -1584,6 +1582,7 @@ $wgAutoloadLocalClasses = [ 'WikiTextStructure' => __DIR__ . '/includes/content/WikiTextStructure.php', 'Wikimedia\\Rdbms\\ChronologyProtector' => __DIR__ . '/includes/libs/rdbms/ChronologyProtector.php', 'Wikimedia\\Rdbms\\ConnectionManager' => __DIR__ . '/includes/libs/rdbms/connectionmanager/ConnectionManager.php', + 'Wikimedia\\Rdbms\\DBMasterPos' => __DIR__ . '/includes/libs/rdbms/database/position/DBMasterPos.php', 'Wikimedia\\Rdbms\\DatabaseDomain' => __DIR__ . '/includes/libs/rdbms/database/DatabaseDomain.php', 'Wikimedia\\Rdbms\\ILBFactory' => __DIR__ . '/includes/libs/rdbms/lbfactory/ILBFactory.php', 'Wikimedia\\Rdbms\\ILoadBalancer' => __DIR__ . '/includes/libs/rdbms/loadbalancer/ILoadBalancer.php', @@ -1596,6 +1595,7 @@ $wgAutoloadLocalClasses = [ 'Wikimedia\\Rdbms\\LoadMonitor' => __DIR__ . '/includes/libs/rdbms/loadmonitor/LoadMonitor.php', 'Wikimedia\\Rdbms\\LoadMonitorMySQL' => __DIR__ . '/includes/libs/rdbms/loadmonitor/LoadMonitorMySQL.php', 'Wikimedia\\Rdbms\\LoadMonitorNull' => __DIR__ . '/includes/libs/rdbms/loadmonitor/LoadMonitorNull.php', + 'Wikimedia\\Rdbms\\MySQLMasterPos' => __DIR__ . '/includes/libs/rdbms/database/position/MySQLMasterPos.php', 'Wikimedia\\Rdbms\\SessionConsistentConnectionManager' => __DIR__ . '/includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManager.php', 'Wikimedia\\Rdbms\\TransactionProfiler' => __DIR__ . '/includes/libs/rdbms/TransactionProfiler.php', 'WikitextContent' => __DIR__ . '/includes/content/WikitextContent.php', diff --git a/includes/libs/rdbms/ChronologyProtector.php b/includes/libs/rdbms/ChronologyProtector.php index 0daa4ed3b2..99e509c1ae 100644 --- a/includes/libs/rdbms/ChronologyProtector.php +++ b/includes/libs/rdbms/ChronologyProtector.php @@ -28,7 +28,6 @@ use Psr\Log\LoggerInterface; use Psr\Log\NullLogger; use Wikimedia\WaitConditionLoop; use BagOStuff; -use DBMasterPos; /** * Class for ensuring a consistent ordering of events as seen by the user, despite replication. diff --git a/includes/libs/rdbms/database/DBConnRef.php b/includes/libs/rdbms/database/DBConnRef.php index a8f664dac6..fc3ebe024a 100644 --- a/includes/libs/rdbms/database/DBConnRef.php +++ b/includes/libs/rdbms/database/DBConnRef.php @@ -2,6 +2,7 @@ use Wikimedia\Rdbms\DatabaseDomain; use Wikimedia\Rdbms\ILoadBalancer; +use Wikimedia\Rdbms\DBMasterPos; /** * Helper class to handle automatically marking connections as reusable (via RAII pattern) diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php index 72e39b7c2f..0afce491af 100644 --- a/includes/libs/rdbms/database/Database.php +++ b/includes/libs/rdbms/database/Database.php @@ -29,6 +29,7 @@ use Wikimedia\ScopedCallback; use Wikimedia\Rdbms\TransactionProfiler; use Wikimedia\Rdbms\LikeMatch; use Wikimedia\Rdbms\DatabaseDomain; +use Wikimedia\Rdbms\DBMasterPos; /** * Relational database abstraction object diff --git a/includes/libs/rdbms/database/DatabaseMysqlBase.php b/includes/libs/rdbms/database/DatabaseMysqlBase.php index ceed7da6fb..361fc50154 100644 --- a/includes/libs/rdbms/database/DatabaseMysqlBase.php +++ b/includes/libs/rdbms/database/DatabaseMysqlBase.php @@ -20,6 +20,8 @@ * @file * @ingroup Database */ +use Wikimedia\Rdbms\DBMasterPos; +use Wikimedia\Rdbms\MySQLMasterPos; /** * Database abstraction object for MySQL. diff --git a/includes/libs/rdbms/database/IDatabase.php b/includes/libs/rdbms/database/IDatabase.php index f1613ebc5a..9fbea51e1a 100644 --- a/includes/libs/rdbms/database/IDatabase.php +++ b/includes/libs/rdbms/database/IDatabase.php @@ -25,6 +25,7 @@ */ use Wikimedia\ScopedCallback; use Wikimedia\Rdbms\LikeMatch; +use Wikimedia\Rdbms\DBMasterPos; /** * Basic database interface for live and lazy-loaded relation database handles diff --git a/includes/libs/rdbms/database/position/DBMasterPos.php b/includes/libs/rdbms/database/position/DBMasterPos.php index eda0ff3256..2f79ea9a20 100644 --- a/includes/libs/rdbms/database/position/DBMasterPos.php +++ b/includes/libs/rdbms/database/position/DBMasterPos.php @@ -1,4 +1,7 @@