From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: [OSSTEST PATCH 2/7] Database locking: Tcl: Use db-execute-array Date: Thu, 7 Jan 2016 19:38:11 +0000 Message-ID: <1452195496-16016-3-git-send-email-ian.jackson@eu.citrix.com> References: <1452195496-16016-1-git-send-email-ian.jackson@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aHGOF-0003Sc-Ao for xen-devel@lists.xenproject.org; Thu, 07 Jan 2016 19:38:31 +0000 In-Reply-To: <1452195496-16016-1-git-send-email-ian.jackson@eu.citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org Cc: Ian Jackson , Ian Campbell List-Id: xen-devel@lists.xenproject.org Replace open-coded uses of pg_execute -array ARRAYVAR dbh STMT with jobdb::db-execute-array ARRAYVAR STMT. The only functional change is that if OSSTEST_TCL_JOBDB_DEBUG is set, there will be debugging output. But we are going to want to make db-execute-array do something more complicated involving pg_exec. Signed-off-by: Ian Jackson --- ms-ownerdaemon | 2 +- ms-queuedaemon | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ms-ownerdaemon b/ms-ownerdaemon index 33ee238..a228e3c 100755 --- a/ms-ownerdaemon +++ b/ms-ownerdaemon @@ -67,7 +67,7 @@ proc cmd/create-task {chan desc} { ( type, refkey, refinfo, live) VALUES ('ownd', [pg_quote $taskdesc], [clock seconds], 't') " - set nrows [pg_execute -array av dbh " + set nrows [jobdb::db-execute-array av " SELECT taskid FROM tasks WHERE live AND refkey = [pg_quote $taskdesc] diff --git a/ms-queuedaemon b/ms-queuedaemon index 08f88cf..b3a05ee 100755 --- a/ms-queuedaemon +++ b/ms-queuedaemon @@ -444,7 +444,7 @@ proc cmd/unwait {chan desc} { proc for-free-resources {varname body} { jobdb::transaction resources { - pg_execute -array free_resources_row dbh { + jobdb::db-execute-array free_resources_row { SELECT (restype || '/' || resname || '/' || shareix) AS r FROM resources WHERE NOT (SELECT live FROM tasks WHERE taskid=owntaskid) @@ -636,7 +636,7 @@ proc cmd/uptime {chan desc seconds} { set descpat "[regsub {\:\d+$} $desc {:%}]" transaction resources { set keys {} - pg_execute -array task dbh " + jobdb::db-execute-array task " SELECT * FROM tasks WHERE type = 'ownd' AND ( refkey LIKE [pg_quote $descpat] -- 1.7.10.4