From patchwork Fri Aug 14 17:21:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 11714965 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6553F1392 for ; Fri, 14 Aug 2020 17:27:55 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 417C520866 for ; Fri, 14 Aug 2020 17:27:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="UMVWrE6W" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 417C520866 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=eu.citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k6dTI-0003we-2n; Fri, 14 Aug 2020 17:26:28 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k6dRD-00024Q-If for xen-devel@lists.xenproject.org; Fri, 14 Aug 2020 17:24:19 +0000 X-Inumbo-ID: f4f114e6-1d08-43f4-b415-2d9859f6ebdf Received: from esa2.hc3370-68.iphmx.com (unknown [216.71.145.153]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id f4f114e6-1d08-43f4-b415-2d9859f6ebdf; Fri, 14 Aug 2020 17:22:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1597425758; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=61fqw6PWoI8qd0n3NohAsqlw4/F+FMTnN5CsL+5lnzE=; b=UMVWrE6WP9gORRpA3oKGYAznPfC20E5VXlXRX+BhdTA0CfbfPF2VQ0Fl okEaQCTjVla+IHNBmp+qKHmvSsDVVw31uemTaS8aWmDkVUEviaTvbSOOS toN5Z1eo642wOytij1V3wxzfhgbD4h3IodKFR4yqNE5X8A9iiWg9s93XR U=; Authentication-Results: esa2.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: +rFNKiVJx0Vt65WitQUTUDeTRO/vq1k9/eu2nbxSeSjfE44/mzExFUmXeZ4AECk6N4rQkySLaC HsO3etkG5Lw9jnoQ+EtGutB6OB2/ZDOAdVVGFmhOGXooGMuWy1MNyTdKNxqv2wkcY4NNwsa/xF Xv3RKkUEKYj+6uC3Cpk3jOqHpxF1FlU/NH04pirUliFFXn9Hpkrk6L85LoR/Rfg17tDXiUwVKY OcG+vTBPCd36NhUsV/vzMvrujBP4Fx3mmK0q7wf6UXSxNjLwRdOd/Rm4e7i6V8fd27Mw9hS8Az 6ZE= X-SBRS: 2.7 X-MesageID: 24576911 X-Ironport-Server: esa2.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.76,313,1592884800"; d="scan'208";a="24576911" From: Ian Jackson To: CC: Ian Jackson Subject: [OSSTEST PATCH 10/60] history reporting (nfc): Bind by name in cacheable_query Date: Fri, 14 Aug 2020 18:21:15 +0100 Message-ID: <20200814172205.9624-11-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20200814172205.9624-1-ian.jackson@eu.citrix.com> References: <20200814172205.9624-1-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" cacheable_query used to simply pass $jr->{flight} and ->{job}. But we want this to be reuseable for other kinds of query, with different cache keys. So bind by name: we expect the caller to use :name placeholders in the query. We can then look through the prepared query parameters, and fish the corresponding values out of $jr. Signed-off-by: Ian Jackson --- sg-report-host-history | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sg-report-host-history b/sg-report-host-history index 90369ce4..8c5cd105 100755 --- a/sg-report-host-history +++ b/sg-report-host-history @@ -197,7 +197,11 @@ sub cacheable_fn ($$$) { sub cacheable_query ($$$) { my ($q, $jr, $cachekey) = @_; cacheable_fn($jr, $cachekey, sub { - $q->execute($jr->{flight}, $jr->{job}); + foreach my $k (keys %{ $q->{ParamTypes} }) { + $k =~ m/^:/ or die "$k ?"; + $q->bind_param($k, $jr->{$'} // die "$k ?"); + } + $q->execute(); return $q->fetchrow_hashref(); }); } @@ -259,7 +263,7 @@ sub reporthost ($) { our $endedq //= db_prepare(<