Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/308929
Change subject: Pass the job transaction name to MergeUser
......................................................................
Pass the job transaction name to MergeUser
This maintains join transaction ownership for the later.
Change-Id: I7c5e0f26a4019f39eff3f46ce0129f0e449ab012
---
M MergeUser.php
M SpecialUserMerge.php
2 files changed, 8 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UserMerge
refs/changes/29/308929/1
diff --git a/MergeUser.php b/MergeUser.php
index cc2ea99..79409ed 100755
--- a/MergeUser.php
+++ b/MergeUser.php
@@ -40,10 +40,11 @@
/**
* @param User $performer
+ * @param string $fnameTrxOwner
*/
- public function merge( User $performer ) {
+ public function merge( User $performer, $fnameTrxOwner = __METHOD__ ) {
$this->mergeEditcount();
- $this->mergeDatabaseTables();
+ $this->mergeDatabaseTables( $fnameTrxOwner );
$this->logger->addMergeEntry( $performer, $this->oldUser,
$this->newUser );
}
@@ -197,8 +198,10 @@
*
* Merges database references from one user ID or username to another
user ID or username
* to preserve referential integrity.
+ *
+ * @param string $fnameTrxOwner
*/
- private function mergeDatabaseTables() {
+ private function mergeDatabaseTables( $fnameTrxOwner ) {
// Fields to update with the format:
// array(
// tableName, idField, textField,
@@ -230,7 +233,7 @@
if ( $this->flags & self::USE_MULTI_COMMIT ) {
// Flush prior writes; this actives the non-transaction
path in the loop below.
- $lbFactory->commitMasterChanges( __METHOD__ );
+ $lbFactory->commitMasterChanges( $fnameTrxOwner );
}
foreach ( $updateFields as $fieldInfo ) {
diff --git a/SpecialUserMerge.php b/SpecialUserMerge.php
index 69b7bfd..9180b73 100644
--- a/SpecialUserMerge.php
+++ b/SpecialUserMerge.php
@@ -133,7 +133,7 @@
// Validation passed, let's merge the user now.
$um = new MergeUser( $oldUser, $newUser, new UserMergeLogger()
);
- $um->merge( $this->getUser() );
+ $um->merge( $this->getUser(), __METHOD__ );
$out = $this->getOutput();
--
To view, visit https://gerrit.wikimedia.org/r/308929
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c5e0f26a4019f39eff3f46ce0129f0e449ab012
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UserMerge
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
