jenkins-bot has submitted this change and it was merged.
Change subject: Use Maintenance DB transaction methods
......................................................................
Use Maintenance DB transaction methods
Change-Id: If412e1dc9978f7dcc76c5dff587f6228a2970320
---
M maintenance/FlowAddMissingModerationLogs.php
M maintenance/FlowFixLinks.php
M maintenance/FlowFixUserIp.php
M maintenance/FlowUpdateRevContentModelFromOccupyPages.php
M maintenance/FlowUpdateRevisionContentLength.php
5 files changed, 10 insertions(+), 8 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/FlowAddMissingModerationLogs.php
b/maintenance/FlowAddMissingModerationLogs.php
index 8ba1575..750e9b0 100644
--- a/maintenance/FlowAddMissingModerationLogs.php
+++ b/maintenance/FlowAddMissingModerationLogs.php
@@ -34,6 +34,7 @@
$container = Container::getContainer();
$dbFactory = $container['db.factory'];
+ /** @var IDatabase $dbw */
$dbw = $dbFactory->getDb( DB_MASTER );
$storage = $container['storage'];
@@ -72,7 +73,7 @@
$total = $fail = 0;
foreach ( $rowIterator as $batch ) {
- $dbw->begin( __METHOD__ );
+ $this->beginTransaction( $dbw, __METHOD__ );
foreach ( $batch as $row ) {
$total++;
$objectManager = $storage->getStorage(
$row->rev_type );
@@ -90,7 +91,7 @@
) );
}
- $dbw->commit( __METHOD__ );
+ $this->commitTransaction( $dbw, __METHOD__ );
$storage->clear();
$dbFactory->waitForSlaves();
}
diff --git a/maintenance/FlowFixLinks.php b/maintenance/FlowFixLinks.php
index e452ffa..2ef51db 100644
--- a/maintenance/FlowFixLinks.php
+++ b/maintenance/FlowFixLinks.php
@@ -71,7 +71,7 @@
$count = 0;
foreach ( $iterator as $rows ) {
- $dbw->begin( __METHOD__ );
+ $this->beginTransaction( $dbw, __METHOD__ );
foreach ( $rows as $row ) {
$workflow = Workflow::fromStorageRow( (array)
$row );
@@ -90,7 +90,7 @@
$linksTableUpdater->doUpdate( $workflow );
}
- $dbw->commit( __METHOD__ );
+ $this->commitTransaction( $dbw, __METHOD__ );
$count += count( $rows );
$this->output( "Rebuilt links for " . $count . "
workflows...\n" );
diff --git a/maintenance/FlowFixUserIp.php b/maintenance/FlowFixUserIp.php
index 47ba910..1445e38 100644
--- a/maintenance/FlowFixUserIp.php
+++ b/maintenance/FlowFixUserIp.php
@@ -35,6 +35,7 @@
protected function doDBUpdates() {
$this->storage = $storage = Container::get( 'storage' );
$dbf = Container::get( 'db.factory' );
+ /** @var IDatabase $dbw */
$dbw = $dbf->getDB( DB_MASTER );
$runUpdate = function( $callback ) use ( $dbf, $dbw, $storage )
{
diff --git a/maintenance/FlowUpdateRevContentModelFromOccupyPages.php
b/maintenance/FlowUpdateRevContentModelFromOccupyPages.php
index c6743bf..be7568b 100644
--- a/maintenance/FlowUpdateRevContentModelFromOccupyPages.php
+++ b/maintenance/FlowUpdateRevContentModelFromOccupyPages.php
@@ -36,7 +36,7 @@
$skippedCount = 0;
while ( $overallInd < $pageCount ) {
- $dbw->begin( __METHOD__ );
+ $this->beginTransaction( $dbw, __METHOD__ );
$batchInd = 0;
while( $overallInd < $pageCount && $batchInd <
$this->mBatchSize ) {
$pageName = $wgFlowOccupyPages[$overallInd];
@@ -63,7 +63,7 @@
$batchInd++;
}
- $dbw->commit( __METHOD__ );
+ $this->commitTransaction( $dbw, __METHOD__ );
$this->output( "Completed batch.\n\n" );
}
diff --git a/maintenance/FlowUpdateRevisionContentLength.php
b/maintenance/FlowUpdateRevisionContentLength.php
index a0e3828..e2d70cf 100644
--- a/maintenance/FlowUpdateRevisionContentLength.php
+++ b/maintenance/FlowUpdateRevisionContentLength.php
@@ -89,7 +89,7 @@
$total = $fail = 0;
foreach ( $it as $batch ) {
- $dbw->begin( __METHOD__ );
+ $this->beginTransaction( $dbw, __METHOD__ );
foreach ( $batch as $row ) {
$total++;
if ( !isset(
self::$revisionTypes[$row->rev_type] ) ) {
@@ -129,7 +129,7 @@
}
$this->output( '.' );
}
- $dbw->commit( __METHOD__ );
+ $this->commitTransaction( $dbw, __METHOD__ );
$this->storage->clear();
$this->dbFactory->waitForSlaves();
}
--
To view, visit https://gerrit.wikimedia.org/r/263859
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If412e1dc9978f7dcc76c5dff587f6228a2970320
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
