Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/311380
Change subject: Move more LockManager classes to /libs
......................................................................
Move more LockManager classes to /libs
Also removed unused getLocalLB() method in MySqlLockManager.
Change-Id: I4bfa79f430827b8717a57bb61cb7c36bc7fcb489
---
M autoload.php
M includes/filebackend/lockmanager/MySqlLockManager.php
R includes/libs/lockmanager/DBLockManager.php
R includes/libs/lockmanager/PostgreSqlLockManager.php
R includes/libs/lockmanager/ScopedLock.php
5 files changed, 3 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/80/311380/1
diff --git a/autoload.php b/autoload.php
index ff7d488..ed4e8c9 100644
--- a/autoload.php
+++ b/autoload.php
@@ -306,7 +306,7 @@
'DBError' => __DIR__ . '/includes/libs/rdbms/exception/DBError.php',
'DBExpectedError' => __DIR__ .
'/includes/libs/rdbms/exception/DBError.php',
'DBFileJournal' => __DIR__ .
'/includes/filebackend/filejournal/DBFileJournal.php',
- 'DBLockManager' => __DIR__ .
'/includes/filebackend/lockmanager/DBLockManager.php',
+ 'DBLockManager' => __DIR__ .
'/includes/libs/lockmanager/DBLockManager.php',
'DBMasterPos' => __DIR__ .
'/includes/libs/rdbms/database/position/DBMasterPos.php',
'DBQueryError' => __DIR__ .
'/includes/libs/rdbms/exception/DBError.php',
'DBReadOnlyError' => __DIR__ .
'/includes/libs/rdbms/exception/DBError.php',
@@ -1069,7 +1069,7 @@
'PopulateRecentChangesSource' => __DIR__ .
'/maintenance/populateRecentChangesSource.php',
'PopulateRevisionLength' => __DIR__ .
'/maintenance/populateRevisionLength.php',
'PopulateRevisionSha1' => __DIR__ .
'/maintenance/populateRevisionSha1.php',
- 'PostgreSqlLockManager' => __DIR__ .
'/includes/filebackend/lockmanager/PostgreSqlLockManager.php',
+ 'PostgreSqlLockManager' => __DIR__ .
'/includes/libs/lockmanager/PostgreSqlLockManager.php',
'PostgresBlob' => __DIR__ .
'/includes/libs/rdbms/encasing/PostgresBlob.php',
'PostgresField' => __DIR__ . '/includes/db/DatabasePostgres.php',
'PostgresInstaller' => __DIR__ .
'/includes/installer/PostgresInstaller.php',
@@ -1228,7 +1228,7 @@
'Sanitizer' => __DIR__ . '/includes/Sanitizer.php',
'SavepointPostgres' => __DIR__ . '/includes/db/DatabasePostgres.php',
'ScopedCallback' => __DIR__ . '/includes/libs/ScopedCallback.php',
- 'ScopedLock' => __DIR__ .
'/includes/filebackend/lockmanager/ScopedLock.php',
+ 'ScopedLock' => __DIR__ . '/includes/libs/lockmanager/ScopedLock.php',
'SearchApi' => __DIR__ . '/includes/api/SearchApi.php',
'SearchDatabase' => __DIR__ . '/includes/search/SearchDatabase.php',
'SearchDump' => __DIR__ . '/maintenance/dumpIterator.php',
diff --git a/includes/filebackend/lockmanager/MySqlLockManager.php
b/includes/filebackend/lockmanager/MySqlLockManager.php
index 124d410..441ffea 100644
--- a/includes/filebackend/lockmanager/MySqlLockManager.php
+++ b/includes/filebackend/lockmanager/MySqlLockManager.php
@@ -15,11 +15,6 @@
self::LOCK_EX => self::LOCK_EX
];
- protected function getLocalLB() {
- // Use a separate connection so releaseAllLocks() doesn't
rollback the main trx
- return wfGetLBFactory()->newMainLB( $this->domain );
- }
-
protected function initConnection( $lockDb, IDatabase $db ) {
# Let this transaction see lock rows from other transactions
$db->query( "SET SESSION TRANSACTION ISOLATION LEVEL READ
UNCOMMITTED;" );
diff --git a/includes/filebackend/lockmanager/DBLockManager.php
b/includes/libs/lockmanager/DBLockManager.php
similarity index 100%
rename from includes/filebackend/lockmanager/DBLockManager.php
rename to includes/libs/lockmanager/DBLockManager.php
diff --git a/includes/filebackend/lockmanager/PostgreSqlLockManager.php
b/includes/libs/lockmanager/PostgreSqlLockManager.php
similarity index 100%
rename from includes/filebackend/lockmanager/PostgreSqlLockManager.php
rename to includes/libs/lockmanager/PostgreSqlLockManager.php
diff --git a/includes/filebackend/lockmanager/ScopedLock.php
b/includes/libs/lockmanager/ScopedLock.php
similarity index 100%
rename from includes/filebackend/lockmanager/ScopedLock.php
rename to includes/libs/lockmanager/ScopedLock.php
--
To view, visit https://gerrit.wikimedia.org/r/311380
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4bfa79f430827b8717a57bb61cb7c36bc7fcb489
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
