From patchwork Mon Feb 1 14:28:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 8180101 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 20779BEEE5 for ; Mon, 1 Feb 2016 14:31:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1AC49203A9 for ; Mon, 1 Feb 2016 14:31:15 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 789E920435 for ; Mon, 1 Feb 2016 14:31:10 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aQFT7-00066g-8e; Mon, 01 Feb 2016 14:28:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aQFT5-00065t-8P for xen-devel@lists.xen.org; Mon, 01 Feb 2016 14:28:39 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id E9/97-28228-69B6FA65; Mon, 01 Feb 2016 14:28:38 +0000 X-Env-Sender: prvs=832d3ee5e=Ian.Campbell@citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1454336916!20656541!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6625 invoked from network); 1 Feb 2016 14:28:37 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-6.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 1 Feb 2016 14:28:37 -0000 X-IronPort-AV: E=Sophos;i="5.22,380,1449532800"; d="scan'208";a="335277424" From: Ian Campbell To: , Date: Mon, 1 Feb 2016 14:28:30 +0000 Message-ID: <1454336912-28503-3-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1454336890.28781.99.camel@citrix.com> References: <1454336890.28781.99.camel@citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Campbell Subject: [Xen-devel] [PATCH OSSTEST v1 3/5] mg-show-flight-runvars: calculate @colsw from @rows not via SQL X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This will work even once @rows is not all collected by the same SQL statement. Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- mg-show-flight-runvars | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/mg-show-flight-runvars b/mg-show-flight-runvars index 0995430..0cf4e13 100755 --- a/mg-show-flight-runvars +++ b/mg-show-flight-runvars @@ -46,7 +46,6 @@ die unless @ARGV==1 && $ARGV[0] =~ m/^\w+$/; our @cols = qw(job name val); our @rows; -our @colws; sub collect ($) { my ($flight) = @_; @@ -54,9 +53,6 @@ sub collect ($) { $flight =~ m/^\d+/ or $flight = "'$flight'"; my $qfrom = "FROM runvars WHERE flight=$flight AND $synthcond"; - @colws = $dbh_tests->selectrow_array - ("SELECT ".(join ',', map { "max(length($_))" } @cols)." $qfrom"); - my $q = $dbh_tests->prepare ("SELECT synth, ".(join ',', @cols)." $qfrom ORDER BY synth, name, job"); $q->execute(); @@ -68,10 +64,15 @@ sub collect ($) { } } -$colws[1] += length $synthsufx; - collect($ARGV[0]); +our @colws; +sub max ($$) { $_[$_[0] < $_[1]] } +foreach my $row (@rows) { + @colws = map { max($colws[$_]//0,length($row->[$_])) } qw(0 1 2) +} +$colws[1] += length $synthsufx; + foreach my $row (@rows) { printf "%-*s %-*s %-*s\n", map { $colws[$_], $row->[$_] } qw(0 1 2) or die $!;