API: (bug 16549) Kill a filesort in list=allpages&apfilterlanglinks=withlanglinks...

diff --git a/includes/api/ApiPageSet.php b/includes/api/ApiPageSet.php
index 67b261e..e846f30 100644 (file)
--- a/includes/api/ApiPageSet.php
+++ b/includes/api/ApiPageSet.php
@@ -92,10 +92,11 @@ class ApiPageSet extends ApiQueryBase {
         */
        public function getPageTableFields() {
                // Ensure we get minimum required fields
+               // DON'T change this order
                $pageFlds = array (
-                       'page_id' => null,
                        'page_namespace' => null,
-                       'page_title' => null
+                       'page_title' => null,
+                       'page_id' => null,
                );
 
                // only store non-default fields

diff --git a/includes/api/ApiQueryAllpages.php b/includes/api/ApiQueryAllpages.php
index 3211a20..f26335f 100644 (file)
--- a/includes/api/ApiQueryAllpages.php
+++ b/includes/api/ApiQueryAllpages.php
@@ -67,6 +67,16 @@ class ApiQueryAllpages extends ApiQueryGeneratorBase {
                if (isset ($params['prefix']))
                        $this->addWhere("page_title LIKE '" . $db->escapeLike($this->titlePartToKey($params['prefix'])) . "%'");
 
+               if (is_null($resultPageSet)) {
+                       $selectFields = array (
+                               'page_namespace',
+                               'page_title',
+                               'page_id'
+                       );
+               } else {
+                       $selectFields = $resultPageSet->getPageTableFields();
+               }
+               $this->addFields($selectFields);
                $forceNameTitleIndex = true;
                if (isset ($params['minsize'])) {
                        $this->addWhere('page_len>=' . intval($params['minsize']));
@@ -106,21 +116,15 @@ class ApiQueryAllpages extends ApiQueryGeneratorBase {
                } else if($params['filterlanglinks'] == 'withlanglinks') {
                        $this->addTables('langlinks');
                        $this->addWhere('page_id=ll_from');
-                       $this->addOption('DISTINCT');
+                       $this->addOption('STRAIGHT_JOIN');
+                       // We have to GROUP BY
+                       $this->addOption('GROUP BY', implode(', ', $selectFields));
                        $forceNameTitleIndex = false;
                }
                if ($forceNameTitleIndex)
                        $this->addOption('USE INDEX', 'name_title');
 
-               if (is_null($resultPageSet)) {
-                       $this->addFields(array (
-                               'page_id',
-                               'page_namespace',
-                               'page_title'
-                       ));
-               } else {
-                       $this->addFields($resultPageSet->getPageTableFields());
-               }
+               
 
                $limit = $params['limit'];
                $this->addOption('LIMIT', $limit+1);