Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/75134
Change subject: Fix exception in ApiPageSet
......................................................................
Fix exception in ApiPageSet
ApiPageSet is calling $this->profileOut(), then calling a function that
calls $this->profileDBIn(). If we're wanting to profile DB stuff,
there's little point in not counting the other stuff currently being
"out"ed.
Bug: 51821
Change-Id: Ib4dbfb567faadcd5e3d7d058ca6bdf8b4c83f634
---
M includes/api/ApiPageSet.php
1 file changed, 0 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/34/75134/1
diff --git a/includes/api/ApiPageSet.php b/includes/api/ApiPageSet.php
index 9fdad2b..43bb701 100644
--- a/includes/api/ApiPageSet.php
+++ b/includes/api/ApiPageSet.php
@@ -146,9 +146,7 @@
$tmpPageSet->executeInternal( $isDryRun );
// populate this pageset with the generator output
- $this->profileOut();
$generator->profileIn();
-
if ( !$isDryRun ) {
$generator->executeGenerator( $this );
wfRunHooks( 'APIQueryGeneratorAfterExecute',
array( &$generator, &$this ) );
@@ -161,7 +159,6 @@
}
}
$generator->profileOut();
- $this->profileIn();
if ( !$isQuery ) {
// If this pageset is not part of the query, we
called profileIn() above
--
To view, visit https://gerrit.wikimedia.org/r/75134
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4dbfb567faadcd5e3d7d058ca6bdf8b4c83f634
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
