jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/377000 )
Change subject: Remove implicitGroupby() use in ImageListPager
......................................................................
Remove implicitGroupby() use in ImageListPager
Note this only effects wikis with miser mode disabled, so there
is less risk of a poor query plan.
Change-Id: I692b23f176489b9a0907bcc65b4ca93f10367c48
---
M includes/specials/pagers/ImageListPager.php
1 file changed, 2 insertions(+), 7 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/pagers/ImageListPager.php
b/includes/specials/pagers/ImageListPager.php
index 813d1d4..1c46f4c 100644
--- a/includes/specials/pagers/ImageListPager.php
+++ b/includes/specials/pagers/ImageListPager.php
@@ -286,13 +286,8 @@
}
unset( $field );
- $dbr = wfGetDB( DB_REPLICA );
- if ( $dbr->implicitGroupby() ) {
- $options = [ 'GROUP BY' => 'img_name' ];
- } else {
- $columnlist = preg_grep( '/^img/', array_keys(
$this->getFieldNames() ) );
- $options = [ 'GROUP BY' => array_merge( [
'img_user' ], $columnlist ) ];
- }
+ $columnlist = preg_grep( '/^img/', array_keys(
$this->getFieldNames() ) );
+ $options = [ 'GROUP BY' => array_merge( [ 'img_user' ],
$columnlist ) ];
$join_conds = [ 'oldimage' => [ 'LEFT JOIN', 'oi_name =
img_name' ] ];
}
--
To view, visit https://gerrit.wikimedia.org/r/377000
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I692b23f176489b9a0907bcc65b4ca93f10367c48
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
