external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 09:43:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Perform a second query to find total search count

Browse source 
This removes the need for SQL_CALC_FOUND_ROWS which can really slow down
queries in a lot of cases. The COUNT(*) query we end up performing can
reuse a lot of the original clauses from our primary query, but we can
really slim it up by omitting some joins and the sorting/limiting
clauses.

Signed-off-by: Dan McGee <dan@archlinux.org>
Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
This commit is contained in:
Dan McGee 2011-03-02 08:35:39 -06:00 • committed by Lukas Fleischer
parent 2cfcddf24e
commit c34bebf428
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
web/lib/pkgfuncs.inc
View file

@ -434,7 +434,7 @@ function pkg_search_page($SID="") {
// build the package search query // build the package search query
// //
$q_select = "SELECT SQL_CALC_FOUND_ROWS "; $q_select = "SELECT ";
if ($SID) { if ($SID) {
$q_select .= "CommentNotify.UserID AS Notify, $q_select .= "CommentNotify.UserID AS Notify,
PackageVotes.UsersID AS Voted, "; PackageVotes.UsersID AS Voted, ";
@ -445,15 +445,18 @@ function pkg_search_page($SID="") {
Packages.ID, Packages.OutOfDateTS "; Packages.ID, Packages.OutOfDateTS ";
$q_from = "FROM Packages $q_from = "FROM Packages
LEFT JOIN Users ON (Packages.MaintainerUID = Users.ID) "; LEFT JOIN Users ON (Packages.MaintainerUID = Users.ID)
LEFT JOIN PackageCategories
ON (Packages.CategoryID = PackageCategories.ID) ";
if ($SID) { if ($SID) {
$q_from .= "LEFT JOIN PackageVotes # this portion is not needed for the total row count query
$q_from_extra = "LEFT JOIN PackageVotes
ON (Packages.ID = PackageVotes.PackageID AND PackageVotes.UsersID = $myuid) ON (Packages.ID = PackageVotes.PackageID AND PackageVotes.UsersID = $myuid)
LEFT JOIN CommentNotify LEFT JOIN CommentNotify
ON (Packages.ID = CommentNotify.PkgID AND CommentNotify.UserID = $myuid) "; ON (Packages.ID = CommentNotify.PkgID AND CommentNotify.UserID = $myuid) ";
} else {
$q_from_extra = "";
} }
$q_from .= "LEFT JOIN PackageCategories
ON (Packages.CategoryID = PackageCategories.ID) ";
$q_where = "WHERE Packages.DummyPkg = 0 "; $q_where = "WHERE Packages.DummyPkg = 0 ";
// TODO: possibly do string matching on category // TODO: possibly do string matching on category
@ -530,10 +533,11 @@ function pkg_search_page($SID="") {
$q_limit = "LIMIT ".$_GET["O"].", ".$_GET["PP"]; $q_limit = "LIMIT ".$_GET["O"].", ".$_GET["PP"];
$q = $q_select . $q_from . $q_where . $q_sort . $q_limit; $q = $q_select . $q_from . $q_from_extra . $q_where . $q_sort . $q_limit;
$q_total = "SELECT COUNT(*) " . $q_from . $q_where;
$result = db_query($q, $dbh); $result = db_query($q, $dbh);
$total = mysql_result(db_query('SELECT FOUND_ROWS() AS Total', $dbh), 0); $total = mysql_result(db_query($q_total, $dbh), 0);
if ($result && $total > 0) { if ($result && $total > 0) {
if (isset($_GET["SO"]) && $_GET["SO"] == "d"){ if (isset($_GET["SO"]) && $_GET["SO"] == "d"){