Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/250310
Change subject: Use startAtomic/endAtomic to avoid breaking transactions
......................................................................
Use startAtomic/endAtomic to avoid breaking transactions
Change-Id: I5636e46ffb8c8d11616672088051dffb81dd96eb
---
M includes/ArticleMetadata.php
M includes/PageTriage.php
M includes/PageTriageUtil.php
3 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageTriage
refs/changes/10/250310/1
diff --git a/includes/ArticleMetadata.php b/includes/ArticleMetadata.php
index abb388f..1efc6d6 100755
--- a/includes/ArticleMetadata.php
+++ b/includes/ArticleMetadata.php
@@ -475,7 +475,7 @@
$articleMetadata = new ArticleMetadata( array( $pageId
) );
$articleMetadata->flushMetadataFromCache();
//Make sure either all or none metadata for a single
page_id
- $dbw->begin();
+ $dbw->startAtomic( __METHOD__ );
foreach ( $data as $key => $val) {
if ( isset( $tags[$key] ) ) {
$row = array (
@@ -492,7 +492,7 @@
$row['ptrp_deleted'] = $data['deleted'] ? '1' :
'0';
}
$pt->update( $row );
- $dbw->commit();
+ $dbw->endAtomic( __METHOD__ );
}
}
diff --git a/includes/PageTriage.php b/includes/PageTriage.php
index 0d017c0..7c2f7bc 100755
--- a/includes/PageTriage.php
+++ b/includes/PageTriage.php
@@ -114,7 +114,7 @@
$this->mReviewedUpdated = $row['ptrp_reviewed_updated'];
$this->mLastReviewedBy = $row['ptrp_last_reviewed_by'];
- $dbw->begin();
+ $dbw->startAtomic( __METHOD__ );
//@Todo - case for marking a page as untriaged and make sure
this logic is correct
if ( !$fromRc && $this->mReviewed && !is_null( $user ) ) {
$rc = RecentChange::newFromConds( array( 'rc_cur_id' =>
$this->mPageId, 'rc_new' => '1' ) );
@@ -129,7 +129,7 @@
if ( $dbw->affectedRows() > 0 && $this->mLastReviewedBy ) {
$this->logUserTriageAction();
}
- $dbw->commit();
+ $dbw->endAtomic( __METHOD__ );
$articleMetadata = new ArticleMetadata( array( $this->mPageId )
);
$metadataArray = $articleMetadata->getMetadata();
@@ -233,7 +233,7 @@
$this->loadArticleMetadata();
- $dbw->begin();
+ $dbw->startAtomic( __METHOD__ );
$dbw->delete(
'pagetriage_page',
@@ -249,7 +249,7 @@
);
$this->mArticleMetadata->deleteMetadata();
- $dbw->commit();
+ $dbw->endAtomic( __METHOD__ );
}
/**
diff --git a/includes/PageTriageUtil.php b/includes/PageTriageUtil.php
index 17718dd..0e7af09 100755
--- a/includes/PageTriageUtil.php
+++ b/includes/PageTriageUtil.php
@@ -377,14 +377,14 @@
}
$dbw = wfGetDB( DB_MASTER );
- $dbw->begin();
+ $dbw->startAtomic( __METHOD__ );
$dbw->update(
'pagetriage_page_tags',
array( 'ptrpt_value' => $status ),
array( 'ptrpt_page_id' => $pageIds, 'ptrpt_tag_id' =>
$tags['user_block_status'] )
);
PageTriage::bulkSetTagsUpdated( $pageIds );
- $dbw->commit();
+ $dbw->endAtomic( __METHOD__ );
$metadata = new ArticleMetadata( $pageIds );
$metadata->flushMetadataFromCache();
--
To view, visit https://gerrit.wikimedia.org/r/250310
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5636e46ffb8c8d11616672088051dffb81dd96eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageTriage
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
