From patchwork Sun Oct 6 20:17:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Fleischer X-Patchwork-Id: 1254 Return-Path: Delivered-To: patchwork@archlinux.org Received: from apollo.archlinux.org (localhost [127.0.0.1]) by apollo.archlinux.org (Postfix) with ESMTP id 900401442589F for ; Sun, 6 Oct 2019 20:17:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on apollo X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1, MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_MED=-2.3,SPF_HELO_NONE=0.001, T_DMARC_POLICY_NONE=0.01 autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-BL-Results: [127.0.9.2] Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Sun, 6 Oct 2019 20:17:34 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 4CE1D15ABEEAA1; Sun, 6 Oct 2019 20:17:33 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [IPv6:2a01:4f8:160:3033::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits)) (No client certificate requested) by orion.archlinux.org (Postfix) with ESMTPS; Sun, 6 Oct 2019 20:17:33 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 3C5192CA94; Sun, 6 Oct 2019 20:17:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1570393053; bh=zvb/gW8jn0var/1Dcp+voCQ200btew4Gh/TjW6W9DxA=; h=From:To:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe; b=OC/A7vUcgG/KyWeaszPV+ujogtDAgNXmeJQiO56RaYSBeJCe7MUgOWF6c0ETK4j7b Lx4eU10z6y4QJ98+Dh0nwGDce9YORO31DV+6zt2GTmH3MflXFJNheXlW2q8HWidDLw vbvPZzc1+C3ssRlTKLHLG7g2mM3vLRRu075/NMvXtOx40Wc1I7pLLKYvNC5kvnWqv/ PYTPGr4IqHepjKG+Tq+Mkyb0uwQDLZKEXehIZRK+QYAEXEuGu1GngdljWgBCRJyYn7 U2uaoQdEuRrP23xyuq65jHF04zYILs63Vrmh1ULDXsK89ne4iuO5iCUyG/FiRAgHTB VshJJe5WxCtz6n6JXUG2Ddj1Z4Q899lk1gqIMZyHSDB8hWJJoNn5uKSzqPe9m9clvU 2tEhB8DN4NO9aa3E2SkeOw58Y0Ci0qwkkxa/c090lxX2A11qakGq/qOZHAuUvywu+r Vh5FASKtu/zMevYX6/5iQw0xXJILaGlZeow4ZAiLa3CTRnM6ovKUR6if0jAm78rr05 f94Ah1GVqJtYfdiviO/H5xthBvS/5hV+Le4fQdrux7fgEwkYiBBzb2mLSJ6VVquA0v eBsRcNiKV0DEpOHCIdzCmPRVWvOB9EB27fO/lCchkI/W7uqg5M/7d4TL2qcozWp48J RErskM/ZXpMJTVhDrV1sVtYs= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 380E62CA92 for ; Sun, 6 Oct 2019 20:17:29 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [IPv6:2a01:4f8:160:6087::1]) by luna.archlinux.org (Postfix) with ESMTPS for ; Sun, 6 Oct 2019 20:17:29 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 46EB315ABEEA9E for ; Sun, 6 Oct 2019 20:17:23 +0000 (UTC) Received: from localhost (unknown [72.138.14.22]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: lfleischer) by orion.archlinux.org (Postfix) with ESMTPSA id 8777515ABEEA9D for ; Sun, 6 Oct 2019 20:17:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1570393043; bh=zvb/gW8jn0var/1Dcp+voCQ200btew4Gh/TjW6W9DxA=; h=From:To:Subject:Date:In-Reply-To:References; b=Vx82BMsR29gT5g4SFPwLZUP6Vx1pExJ+3E3dYUrg/aVfYR8QPXB5MovtRL9Wny/6r 4Hps6jIau8MKEket0WzYwHzLa+omabul6yTmj07jW1Lx4rfmuToGedIR+EmLBiZW56 q99e9AnvyHBETKOAAKG/B1PxGIgncM+VdSnSRM3eA/16MMJIXpmCMg0YKfGyP2S/Rl vVf3M2oEOyFQTaSWOQzGQKhOPStJB75HurUY7d+9Spe8oRoU6v5RYhSrTaLbgrBImZ KaQXujZNUgLwFZoo3MmJT3DIzIvLw7V+q/VBwuZR4goBjLyOTD+19htH6QKpUzZ5oq jy9D5LFm6Rt8FWqMetxNHIAlAvMJqt0KOfxKJtxGZkpCQoYUriOfIbVQeGaC3L6ctP zGiCu9yfSgpBnk5k6Des0bv961JGWO28SF7ikAr8zZTVASeMVAE73fk1V1gvIAORi3 MExW9u6P+tAx7wPzI+d0WRZ5qM93PKLTpGuzkHLwZqOCoh6iSWV+MBIfyzOCU3iUKQ /dcrDfrO0KqzABFQkegG9nCcTeyvnG/S0ny85gDIFAFkY7gi/kBScZiWDi4qsH7yxN t0vE5bTIHcoMzGpwamq3kRkDS92Mjcb05DXmoEqxq3gbbsUkdRjrajymecg9p3v2pS SHDeWNW+nC2Bj+kEfXtgm7x4= From: Lukas Fleischer To: aur-dev@archlinux.org Subject: [PATCH v3] Cache package provider and dependency information Date: Sun, 6 Oct 2019 16:17:43 -0400 Message-Id: <20191006201743.20939-1-lfleischer@archlinux.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191006172156.6842-1-lfleischer@archlinux.org> References: <20191006172156.6842-1-lfleischer@archlinux.org> MIME-Version: 1.0 X-BeenThere: aur-dev@archlinux.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Arch User Repository \(AUR\) Development" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: aur-dev-bounces@archlinux.org Sender: "aur-dev" The package provider and dependency queries are quite CPU-intensive and usually yield rather small result sets. Cache these values if the global caching mechanism is enabled. Signed-off-by: Lukas Fleischer --- Fixed the key used for package dependencies. web/lib/cachefuncs.inc.php | 17 ++++++++++++++++ web/lib/pkgfuncs.inc.php | 40 +++++++++++--------------------------- 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/web/lib/cachefuncs.inc.php b/web/lib/cachefuncs.inc.php index 881ad8f..b2b96c2 100644 --- a/web/lib/cachefuncs.inc.php +++ b/web/lib/cachefuncs.inc.php @@ -79,4 +79,21 @@ function db_cache_value($dbq, $key, $ttl=600) { return $value; } +# Run a simple db query, retrieving and/or caching the result set if APC is +# available for use. Accepts an optional TTL value (defaults to 600 seconds). +function db_cache_result($dbq, $key, $fetch_style=PDO::FETCH_NUM, $ttl=600) { + $dbh = DB::connect(); + $status = false; + $value = get_cache_value($key, $status); + if (!$status) { + $result = $dbh->query($dbq); + if (!$result) { + return false; + } + $value = $result->fetchAll($fetch_style); + set_cache_value($key, $value, $ttl); + } + return $value; +} + ?> diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 00f0cc4..3e4b2a8 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -222,17 +222,7 @@ function pkg_providers($name) { $q.= "UNION "; $q.= "SELECT 0, Name FROM OfficialProviders "; $q.= "WHERE Provides = " . $dbh->quote($name); - $result = $dbh->query($q); - - if (!$result) { - return array(); - } - - $providers = array(); - while ($row = $result->fetch(PDO::FETCH_NUM)) { - $providers[] = $row; - } - return $providers; + return db_cache_result($q, 'providers:' . $name); } /** @@ -244,26 +234,18 @@ function pkg_providers($name) { * @return array All package dependencies for the package */ function pkg_dependencies($pkgid, $limit) { - $deps = array(); $pkgid = intval($pkgid); - if ($pkgid > 0) { - $dbh = DB::connect(); - $q = "SELECT pd.DepName, dt.Name, pd.DepDesc, "; - $q.= "pd.DepCondition, pd.DepArch, p.ID "; - $q.= "FROM PackageDepends pd "; - $q.= "LEFT JOIN Packages p ON pd.DepName = p.Name "; - $q.= "LEFT JOIN DependencyTypes dt ON dt.ID = pd.DepTypeID "; - $q.= "WHERE pd.PackageID = ". $pkgid . " "; - $q.= "ORDER BY pd.DepName LIMIT " . intval($limit); - $result = $dbh->query($q); - if (!$result) { - return array(); - } - while ($row = $result->fetch(PDO::FETCH_NUM)) { - $deps[] = $row; - } + if (!$pkgid) { + return array(); } - return $deps; + $q = "SELECT pd.DepName, dt.Name, pd.DepDesc, "; + $q.= "pd.DepCondition, pd.DepArch, p.ID "; + $q.= "FROM PackageDepends pd "; + $q.= "LEFT JOIN Packages p ON pd.DepName = p.Name "; + $q.= "LEFT JOIN DependencyTypes dt ON dt.ID = pd.DepTypeID "; + $q.= "WHERE pd.PackageID = ". $pkgid . " "; + $q.= "ORDER BY pd.DepName LIMIT " . intval($limit); + return db_cache_result($q, 'dependencies:' . $pkgid); } /**