From nobody Sun May 5 13:21:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=reject dis=none) header.from=eu.citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1597073085; cv=none; d=zohomail.com; s=zohoarc; b=JbjI/D5b+F/nNDFuX+fkeQuu5d3J+d7RMJ8RqxXmWrs+xZ/FhA07joNydC4sTnbXQdPrb1LhUKw50tyAt7apLmI1ftyT6V7CoXvPuOWDZV2BthV9owek5DwZaFf6w09H+hdPHQ2Hmp8/vcnB6e9fK42pwRoGGmYznLuYBpfVb2I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597073085; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=1gPw1ljwVrxdnlUYeg/G/7bd8mik5pQw4BenkZpFThk=; b=CciEQqGGvPTEBCQvsBWDB9J6IrOB3ZZQkElw6rHW2i+sG3XWZp2KKf2sc3Tt+c+rxhpeQBg4Mghq7aTCLrE8DH8HfmVDJb8cFQnjngiHyVINmjM3QTbcwP5V0/rruFfRfDTJlWazA52r7SahT1lXmCtjSp2aDqXbI7Xn8DaZi9M= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=reject dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1597073085150707.7053187709616; Mon, 10 Aug 2020 08:24:45 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k59ev-00048j-5f; Mon, 10 Aug 2020 15:24:21 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1k59eu-00048e-Jy for xen-devel@lists.xenproject.org; Mon, 10 Aug 2020 15:24:20 +0000 Received: from chiark.greenend.org.uk (unknown [2001:ba8:1e3::]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 1d694ced-4a14-4482-95eb-827d14a2c1ad; Mon, 10 Aug 2020 15:24:19 +0000 (UTC) Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by chiark.greenend.org.uk (Debian Exim 4.84_2 #1) with esmtp (return-path ijackson@chiark.greenend.org.uk) id 1k59er-0007Qb-VJ; Mon, 10 Aug 2020 16:24:18 +0100 X-Inumbo-ID: 1d694ced-4a14-4482-95eb-827d14a2c1ad From: Ian Jackson To: xen-devel@lists.xenproject.org Subject: [OSSTEST PATCH] SQL: Change "... LIKE '...\_...' ..." to "... LIKE '...\\_...' ..." Date: Mon, 10 Aug 2020 16:24:04 +0100 Message-Id: <20200810152404.15325-1-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: , Cc: Ian Jackson Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Content-Type: text/plain; charset="utf-8" Perl's "" quotes, and corresponding < --- Osstest/Executive.pm | 2 +- cs-bisection-step | 8 ++++---- mg-force-push | 2 +- mg-report-host-usage-collect | 2 +- sg-report-flight | 4 ++-- sg-report-host-history | 8 ++++---- sg-report-job-history | 2 +- ts-logs-capture | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Osstest/Executive.pm b/Osstest/Executive.pm index 1e94b282..0808202b 100644 --- a/Osstest/Executive.pm +++ b/Osstest/Executive.pm @@ -444,7 +444,7 @@ END $querytext .=3D <{Rtuple}; diff --git a/mg-force-push b/mg-force-push index 3a701a11..9c3cc786 100755 --- a/mg-force-push +++ b/mg-force-push @@ -54,7 +54,7 @@ END FROM rv url JOIN rv built ON url.job =3D built.job - AND url.name LIKE 'tree\_%' + AND url.name LIKE 'tree\\_%' AND built.name =3D 'built_revision_' || substring(url.name, 6) WHERE url.val =3D ? END diff --git a/mg-report-host-usage-collect b/mg-report-host-usage-collect index 1944c8d7..34d24943 100755 --- a/mg-report-host-usage-collect +++ b/mg-report-host-usage-collect @@ -166,7 +166,7 @@ END SELECT val, synth FROM runvars WHERE flight=3D? AND job=3D? - AND (name LIKE '%\_host' OR name=3D'host') + AND (name LIKE '%\\_host' OR name=3D'host') END =20 my $finishq =3D db_prepare(<{job}' - AND name LIKE 'built\_revision\_%' + AND name LIKE 'built\\_revision\\_%' ORDER BY name END # We report in jobtext revisions in non-main-revision jobs, too. diff --git a/sg-report-host-history b/sg-report-host-history index dc694ebe..380f8fac 100755 --- a/sg-report-host-history +++ b/sg-report-host-history @@ -39,7 +39,7 @@ our @blessings; =20 open DEBUG, ">/dev/null"; =20 -my $namecond=3D "(name =3D 'host' OR name LIKE '%\_host')"; +my $namecond=3D "(name =3D 'host' OR name LIKE '%\\_host')"; csreadconfig(); =20 while (@ARGV && $ARGV[0] =3D~ m/^-/) { @@ -172,7 +172,7 @@ sub mainquery ($) { SELECT flight, job, name, status FROM runvars JOIN jobs USING (flight, job) - WHERE (name =3D 'host' OR name LIKE '%\_host') + WHERE (name =3D 'host' OR name LIKE '%\\_host') AND val =3D ? AND $flightcond AND $restrictflight_cond @@ -246,7 +246,7 @@ END FROM runvars WHERE flight=3D? AND job=3D? AND ( - name LIKE (? || '\_power\_%') + name LIKE (? || '\\_power\\_%') ) END =20 @@ -449,7 +449,7 @@ foreach my $host (@ARGV) { SELECT DISTINCT val FROM runvars WHERE flight=3D? - AND (name =3D 'host' OR name LIKE '%\_host') + AND (name =3D 'host' OR name LIKE '%\\_host') END $hostsinflightq->execute($flight); while (my $row =3D $hostsinflightq->fetchrow_hashref()) { diff --git a/sg-report-job-history b/sg-report-job-history index 22a28627..6008ca72 100755 --- a/sg-report-job-history +++ b/sg-report-job-history @@ -92,7 +92,7 @@ if (defined($flight)) { our $revisionsq=3D db_prepare(<prepare(<execute($flight, $job); --=20 2.20.1