From 14e8c4fcad9fe7940647150f0956ce89ea097bbe Mon Sep 17 00:00:00 2001 From: Guruprasad Anada Date: Wed, 17 Dec 2008 12:13:38 -0500 Subject: [PATCH] speed enhancement for incorrect_gops_jobs script. --- scripts/others/incorrect_gops_jobs.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/scripts/others/incorrect_gops_jobs.py b/scripts/others/incorrect_gops_jobs.py index 27695cca591..b67f4526fc4 100755 --- a/scripts/others/incorrect_gops_jobs.py +++ b/scripts/others/incorrect_gops_jobs.py @@ -42,13 +42,19 @@ def main(): try: for job in app.model.Job.filter( sa.and_( app.model.Job.table.c.create_time.between( '2008-05-23', '2008-11-29' ), app.model.Job.table.c.state == 'ok', - sa.or_( app.model.Job.table.c.tool_id == 'gops_intersect_1', - app.model.Job.table.c.tool_id == 'gops_subtract_1', - app.model.Job.table.c.tool_id == 'gops_merge_1', - app.model.Job.table.c.tool_id == 'gops_coverage_1', - app.model.Job.table.c.tool_id == 'gops_complement_1', - ), - sa.not_( app.model.Job.table.c.command_line.like( '%-2 1,2,3%' ) ) + sa.or_( + sa.and_( sa.or_( app.model.Job.table.c.tool_id == 'gops_intersect_1', + app.model.Job.table.c.tool_id == 'gops_subtract_1', + app.model.Job.table.c.tool_id == 'gops_coverage_1', + ), + sa.not_( app.model.Job.table.c.command_line.like( '%-2 1,2,3%' ) ) + ), + sa.and_( sa.or_( app.model.Job.table.c.tool_id == 'gops_complement_1', + app.model.Job.table.c.tool_id == 'gops_merge_1', + ), + sa.not_( app.model.Job.table.c.command_line.like( '%-1 1,2,3%' ) ) + ) + ) ) ).all(): print "# processing job id %s" % str( job.id )