Aaron Schulz has submitted this change and it was merged.
Change subject: Removed some FORCE INDEX statements
......................................................................
Removed some FORCE INDEX statements
* This includes the page_time ones (an index that conflicts with
the logging table index in sqlite).
Change-Id: I40ef5cbe058883daf5e16f84b306603145c07587
---
M api/FlaggedRevsApi.hooks.php
M backend/FlaggedRevs.hooks.php
M backend/FlaggedRevsStats.php
M frontend/specialpages/reports/ReviewedVersions_body.php
4 files changed, 4 insertions(+), 9 deletions(-)
Approvals:
Aaron Schulz: Verified; Looks good to me, approved
diff --git a/api/FlaggedRevsApi.hooks.php b/api/FlaggedRevsApi.hooks.php
index 5581455..1647302 100644
--- a/api/FlaggedRevsApi.hooks.php
+++ b/api/FlaggedRevsApi.hooks.php
@@ -63,7 +63,6 @@
'fr_rev_id' => array_keys( $revids ) ),
LIST_AND );
}
$module->addWhere( $db->makeList( $where, LIST_OR ) );
- //$module->addOption( 'USE INDEX', array( 'flaggedrevs' =>
'page_rev' ) );
$res = $module->select( __METHOD__ );
diff --git a/backend/FlaggedRevs.hooks.php b/backend/FlaggedRevs.hooks.php
index 115d750..9731b4d 100644
--- a/backend/FlaggedRevs.hooks.php
+++ b/backend/FlaggedRevs.hooks.php
@@ -764,8 +764,7 @@
$encCutoff = $dbr->addQuotes( $dbr->timestamp(
$cutoff_unixtime ) );
$conds[] = "log_timestamp >= $encCutoff";
}
- return (bool)$dbr->selectField( 'logging', '1', $conds,
- __METHOD__, array( 'USE INDEX' => 'page_time' ) );
+ return (bool)$dbr->selectField( 'logging', '1', $conds,
__METHOD__ );
}
protected static function recentEditCount( $uid, $seconds, $limit ) {
diff --git a/backend/FlaggedRevsStats.php b/backend/FlaggedRevsStats.php
index 19c9836..abc935c 100644
--- a/backend/FlaggedRevsStats.php
+++ b/backend/FlaggedRevsStats.php
@@ -367,8 +367,7 @@
array(
'fr_page_id = rev_page',
'fr_rev_timestamp >=
rev_timestamp' ),
- __METHOD__,
- array( 'USE INDEX' => 'page_time' )
+ __METHOD__
) . ') AS nft' // time when revision was first
reviewed
),
array(
@@ -383,8 +382,7 @@
'fr_rev_timestamp <
rev_timestamp', // before this revision
'fr_rev_id < rev_id', // not
imported later
'fr_timestamp < rev_timestamp'
), // page reviewed before revision
- __METHOD__,
- array( 'USE INDEX' => 'page_time' )
+ __METHOD__
) . ')'
),
__METHOD__
diff --git a/frontend/specialpages/reports/ReviewedVersions_body.php
b/frontend/specialpages/reports/ReviewedVersions_body.php
index 54bb573..2ec244d 100644
--- a/frontend/specialpages/reports/ReviewedVersions_body.php
+++ b/frontend/specialpages/reports/ReviewedVersions_body.php
@@ -97,8 +97,7 @@
return array(
'tables' => array( 'flaggedrevs', 'revision', 'user' ),
'fields' =>
'fr_rev_id,fr_timestamp,rev_timestamp,fr_quality,fr_user,user_name',
- 'conds' => $conds,
- //'options' => array( 'USE INDEX' => array(
'flaggedrevs' => 'page_rev' ) )
+ 'conds' => $conds
);
}
--
To view, visit https://gerrit.wikimedia.org/r/96928
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I40ef5cbe058883daf5e16f84b306603145c07587
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Springle <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
