From patchwork Thu Jan 7 19:38:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 7979421 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 15E059F54F for ; Thu, 7 Jan 2016 19:41:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4111E20138 for ; Thu, 7 Jan 2016 19:41:49 +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 65A5520107 for ; Thu, 7 Jan 2016 19:41:48 +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 1aHGOK-0003US-4r; Thu, 07 Jan 2016 19:38:36 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aHGOI-0003UK-OJ for xen-devel@lists.xenproject.org; Thu, 07 Jan 2016 19:38:34 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id AF/45-21901-ABEBE865; Thu, 07 Jan 2016 19:38:34 +0000 X-Env-Sender: prvs=807bdda5f=Ian.Jackson@citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1452195507!14546249!3 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 52062 invoked from network); 7 Jan 2016 19:38:30 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-3.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 7 Jan 2016 19:38:30 -0000 X-IronPort-AV: E=Sophos;i="5.20,534,1444694400"; d="scan'208";a="329689542" From: Ian Jackson To: Date: Thu, 7 Jan 2016 19:38:13 +0000 Message-ID: <1452195496-16016-5-git-send-email-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1452195496-16016-1-git-send-email-ian.jackson@eu.citrix.com> References: <1452195496-16016-1-git-send-email-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Jackson , Ian Campbell Subject: [Xen-devel] [OSSTEST PATCH 4/7] Database locking: Tcl: Always use db-execute-array for SELECT 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 We are going to make it wrong to use db-execute for SELECT statements. Convert the two existing violation sites (providing a dummy arrayvar). Signed-off-by: Ian Jackson --- sg-execute-flight | 2 +- tcl/JobDB-Executive.tcl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sg-execute-flight b/sg-execute-flight index 4e3fcf2..008e661 100755 --- a/sg-execute-flight +++ b/sg-execute-flight @@ -30,7 +30,7 @@ proc check {} { jobdb::db-open - set nqueued [jobdb::db-execute " + set nqueued [jobdb::db-execute-array dummy " SELECT job FROM jobs j WHERE j.flight = $flight AND j.status = 'queued' diff --git a/tcl/JobDB-Executive.tcl b/tcl/JobDB-Executive.tcl index 239f22c..bbce6fc 100644 --- a/tcl/JobDB-Executive.tcl +++ b/tcl/JobDB-Executive.tcl @@ -275,7 +275,7 @@ proc become-task {comment} { set username "[id user]@$hostname" transaction resources { - set nrows [db-execute " + set nrows [db-execute-array dummy " UPDATE tasks SET username = [pg_quote $username], comment = [pg_quote $comment]