dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
API: Add IGNORE INDEX to avoid bad plan in ApiQueryRevisions
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiQueryRevisions.php
diff --git
a/includes/api/ApiQueryRevisions.php
b/includes/api/ApiQueryRevisions.php
index
7e46c1a
..
ee6a264
100644
(file)
--- a/
includes/api/ApiQueryRevisions.php
+++ b/
includes/api/ApiQueryRevisions.php
@@
-114,7
+114,7
@@
class ApiQueryRevisions extends ApiQueryRevisionsBase {
if ( $revCount > 0 && $enumRevMode ) {
$this->dieWithError(
if ( $revCount > 0 && $enumRevMode ) {
$this->dieWithError(
- [ 'apierror-revisions-no
list
', $this->getModulePrefix() ], 'invalidparammix'
+ [ 'apierror-revisions-no
revids
', $this->getModulePrefix() ], 'invalidparammix'
);
}
);
}
@@
-153,9
+153,6
@@
class ApiQueryRevisions extends ApiQueryRevisionsBase {
if ( $this->token !== null || $pageCount > 0 ) {
$opts[] = 'page';
}
if ( $this->token !== null || $pageCount > 0 ) {
$opts[] = 'page';
}
- if ( $this->fetchContent ) {
- $opts[] = 'text';
- }
if ( $this->fld_user ) {
$opts[] = 'user';
}
if ( $this->fld_user ) {
$opts[] = 'user';
}
@@
-392,6
+389,10
@@
class ApiQueryRevisions extends ApiQueryRevisionsBase {
$this->addOption( 'LIMIT', $this->limit + 1 );
$this->addOption( 'LIMIT', $this->limit + 1 );
+ // T224017: `rev_timestamp` is never the correct index to use for this module, but
+ // MariaDB (10.1.37-39) sometimes insists on trying to use it anyway. Tell it not to.
+ $this->addOption( 'IGNORE INDEX', [ 'revision' => 'rev_timestamp' ] );
+
$count = 0;
$generated = [];
$hookData = [];
$count = 0;
$generated = [];
$hookData = [];