OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Guard against empty iterables

pull/525/head
Erik Johnston 2016-01-25 15:59:29 +00:00
parent 1ebf5e3d03
commit aea5da0ef6
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/storage/_base.py
View File

@ -647,6 +647,9 @@ class SQLBaseStore(object):
""" """
results = [] results = []
if not iterable:
defer.returnValue(results)
chunks = [iterable[i:i+batch_size] for i in xrange(0, len(iterable), batch_size)] chunks = [iterable[i:i+batch_size] for i in xrange(0, len(iterable), batch_size)]
for chunk in chunks: for chunk in chunks:
rows = yield self.runInteraction( rows = yield self.runInteraction(
@ -673,6 +676,9 @@ class SQLBaseStore(object):
keyvalues : dict of column names and values to select the rows with keyvalues : dict of column names and values to select the rows with
retcols : list of strings giving the names of the columns to return retcols : list of strings giving the names of the columns to return
""" """
if not iterable:
return []
sql = "SELECT %s FROM %s" % (", ".join(retcols), table) sql = "SELECT %s FROM %s" % (", ".join(retcols), table)
clauses = [] clauses = []