openstack/swift
Code Issues Proposed changes

Merge "Simplify ContainerBroker._get_shard_range_rows()"

Browse Source
This commit is contained in:
Zuul
2018-05-22 19:31:51 +00:00
committed by Gerrit Code Review
parent 83373f833d 0ee2a1df70
commit 53f418f919
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
swift/container/backend.py
View File

@@ -1593,8 +1593,8 @@ class ContainerBroker(DatabaseBroker):
raise raise
def _get_shard_range_rows(self, connection=None, include_deleted=False, def _get_shard_range_rows(self, connection=None, include_deleted=False,
states=None, states=None, include_own=False,
include_own=False, exclude_others=False): exclude_others=False):
""" """
Returns a list of shard range rows. Returns a list of shard range rows.
@@ -1620,15 +1620,11 @@ class ContainerBroker(DatabaseBroker):
if exclude_others and not include_own: if exclude_others and not include_own:
return [] return []
def prep_states(states): included_states = set()
state_set = set()
if isinstance(states, (list, tuple, set)): if isinstance(states, (list, tuple, set)):
state_set.update(states) included_states.update(states)
elif states is not None: elif states is not None:
state_set.add(states) included_states.add(states)
return state_set
included_states = prep_states(states)
def do_query(conn): def do_query(conn):
try: try: