Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Move DBConnRef/MaintainableDBConnRef to Rdbms namespace"

Browse source
This commit is contained in:
jenkins-bot 2017-03-29 18:29:11 +00:00 committed by Gerrit Code Review
commit 6eeefad9a3
10 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
autoload.php
View file

@ -1591,6 +1591,7 @@ $wgAutoloadLocalClasses = [
'Wikimedia\\Rdbms\\Blob' => __DIR__ . '/includes/libs/rdbms/encasing/Blob.php',
'Wikimedia\\Rdbms\\ChronologyProtector' => __DIR__ . '/includes/libs/rdbms/ChronologyProtector.php',
'Wikimedia\\Rdbms\\ConnectionManager' => __DIR__ . '/includes/libs/rdbms/connectionmanager/ConnectionManager.php',
'Wikimedia\\Rdbms\\DBConnRef' => __DIR__ . '/includes/libs/rdbms/database/DBConnRef.php',
'Wikimedia\\Rdbms\\DBMasterPos' => __DIR__ . '/includes/libs/rdbms/database/position/DBMasterPos.php',
'Wikimedia\\Rdbms\\DatabaseDomain' => __DIR__ . '/includes/libs/rdbms/database/DatabaseDomain.php',
'Wikimedia\\Rdbms\\FakeResultWrapper' => __DIR__ . '/includes/libs/rdbms/database/resultwrapper/FakeResultWrapper.php',
@ -1612,6 +1613,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\\MaintainableDBConnRef' => __DIR__ . '/includes/libs/rdbms/database/MaintainableDBConnRef.php',
'Wikimedia\\Rdbms\\MssqlBlob' => __DIR__ . '/includes/libs/rdbms/encasing/MssqlBlob.php',
'Wikimedia\\Rdbms\\MssqlField' => __DIR__ . '/includes/libs/rdbms/field/MssqlField.php',
'Wikimedia\\Rdbms\\MssqlResultWrapper' => __DIR__ . '/includes/libs/rdbms/database/resultwrapper/MssqlResultWrapper.php',

2
includes/externalstore/ExternalStoreDB.php
View file

@ -22,6 +22,8 @@
use Wikimedia\Rdbms\LoadBalancer;
use Wikimedia\Rdbms\IDatabase;
use Wikimedia\Rdbms\DBConnRef;
use Wikimedia\Rdbms\MaintainableDBConnRef;
/**
* DB accessable external objects.

3
includes/filerepo/FileBackendDBRepoWrapper.php
View file

@ -23,6 +23,9 @@
* @author Aaron Schulz
*/
use Wikimedia\Rdbms\DBConnRef;
use Wikimedia\Rdbms\MaintainableDBConnRef;
/**
* @brief Proxy backend that manages file layout rewriting for FileRepo.
*

1
includes/jobqueue/JobQueueDB.php
View file

@ -23,6 +23,7 @@
use Wikimedia\Rdbms\IDatabase;
use MediaWiki\MediaWikiServices;
use Wikimedia\ScopedCallback;
use Wikimedia\Rdbms\DBConnRef;
/**
* Class to handle job queues stored in the DB

1
includes/libs/rdbms/connectionmanager/ConnectionManager.php
View file

@ -3,7 +3,6 @@
namespace Wikimedia\Rdbms;
use Database;
use DBConnRef;
use InvalidArgumentException;
/**

1
includes/libs/rdbms/connectionmanager/SessionConsistentConnectionManager.php
View file

@ -3,7 +3,6 @@
namespace Wikimedia\Rdbms;
use Database;
use DBConnRef;
/**
* Database connection manager.

10
includes/libs/rdbms/database/DBConnRef.php
View file

@ -1,9 +1,9 @@
<?php
use Wikimedia\Rdbms\DatabaseDomain;
use Wikimedia\Rdbms\ILoadBalancer;
use Wikimedia\Rdbms\DBMasterPos;
use Wikimedia\Rdbms\IDatabase;
namespace Wikimedia\Rdbms;
use Database;
use InvalidArgumentException;
/**
* Helper class to handle automatically marking connections as reusable (via RAII pattern)
@ -604,3 +604,5 @@ class DBConnRef implements IDatabase {
}
}
}
class_alias( 'Wikimedia\Rdbms\DBConnRef', 'DBConnRef' );

4
includes/libs/rdbms/database/MaintainableDBConnRef.php
View file

@ -1,6 +1,6 @@
<?php
use Wikimedia\Rdbms\IMaintainableDatabase;
namespace Wikimedia\Rdbms;
/**
* Helper class to handle automatically marking connections as reusable (via RAII pattern)
@ -69,3 +69,5 @@ class MaintainableDBConnRef extends DBConnRef implements IMaintainableDatabase {
return $this->__call( __FUNCTION__, func_get_args() );
}
}
class_alias( 'Wikimedia\Rdbms\MaintainableDBConnRef', 'MaintainableDBConnRef' );

2
includes/libs/rdbms/loadbalancer/ILoadBalancer.php
View file

@ -24,8 +24,6 @@
namespace Wikimedia\Rdbms;
use Database;
use DBConnRef;
use MaintainableDBConnRef;
use DBError;
use DBAccessError;
use DBTransactionError;

2
includes/libs/rdbms/loadbalancer/LoadBalancer.php
View file

@ -26,8 +26,6 @@ use Psr\Log\LoggerInterface;
use Psr\Log\NullLogger;
use Wikimedia\ScopedCallback;
use Database;
use DBConnRef;
use MaintainableDBConnRef;
use BagOStuff;
use EmptyBagOStuff;
use WANObjectCache;