Springle has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/96228


Change subject: remove specific FORCE INDEX clauses causing trouble, bug 45619
......................................................................

remove specific FORCE INDEX clauses causing trouble, bug 45619

Change-Id: I6b8f35bd8d709ccc8e4811836e7731bcedb5520c
---
M includes/ChangeTags.php
M includes/specials/SpecialContributions.php
2 files changed, 1 insertion(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/28/96228/1

diff --git a/includes/ChangeTags.php b/includes/ChangeTags.php
index 3c734c4..fd94bea 100644
--- a/includes/ChangeTags.php
+++ b/includes/ChangeTags.php
@@ -201,9 +201,6 @@
                        // Somebody wants to filter on a tag.
                        // Add an INNER JOIN on change_tag
 
-                       // FORCE INDEX -- change_tags will almost ALWAYS be the 
correct query plan.
-                       $options['USE INDEX'] = array( 'change_tag' => 
'change_tag_tag_id' );
-                       unset( $options['FORCE INDEX'] );
                        $tables[] = 'change_tag';
                        $join_conds['change_tag'] = array( 'INNER JOIN', 
"ct_$join_cond=$join_cond" );
                        $conds['ct_tag'] = $filter_tag;
diff --git a/includes/specials/SpecialContributions.php 
b/includes/specials/SpecialContributions.php
index 1fe9819..768db0e 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -766,10 +766,10 @@
                $condition = array();
                $join_conds = array();
                $tables = array( 'revision', 'page', 'user' );
+               $index = false;
                if ( $this->contribs == 'newbie' ) {
                        $max = $this->mDb->selectField( 'user', 'max(user_id)', 
false, __METHOD__ );
                        $condition[] = 'rev_user >' . (int)( $max - $max / 100 
);
-                       $index = 'user_timestamp';
                        # ignore local groups with the bot right
                        # @todo FIXME: Global groups may have 'bot' rights
                        $groupsWithBotPermission = 
User::getGroupsWithPermission( 'bot' );

-- 
To view, visit https://gerrit.wikimedia.org/r/96228
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b8f35bd8d709ccc8e4811836e7731bcedb5520c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Springle <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to