replace prefix w/ canonical name list
This commit is contained in:
parent
c41de8ded6
commit
ebbe58d311
3 changed files with 10 additions and 7 deletions
|
@ -77,13 +77,16 @@ class WorkQueue(object):
|
|||
._available_jobs(now, name_match_query)
|
||||
.where(~(QueueItem.queue_name << running_query)))
|
||||
|
||||
def num_available_jobs_between(self, available_min_time, available_max_time, prefix):
|
||||
def num_available_jobs_between(self, available_min_time, available_max_time, canonical_name_list):
|
||||
"""
|
||||
Returns the number of available queue items with a given prefix, between the two provided times.
|
||||
"""
|
||||
prefix = prefix.lstrip('/')
|
||||
def strip_slash(name):
|
||||
return name.lstrip('/')
|
||||
canonical_name_list = map(strip_slash, canonical_name_list)
|
||||
|
||||
available = self._available_jobs(available_max_time,
|
||||
'/'.join([self._queue_name, prefix]) + '%')
|
||||
'/'.join([self._queue_name] + canonical_name_list) + '%')
|
||||
|
||||
return available.where(QueueItem.available_after >= available_min_time).count()
|
||||
|
||||
|
|
Reference in a new issue