openstack/deb-python-cassandra-driver
Code Issues Proposed changes

Ignore empty batches instead of sending invalid CQL to Cassandra.

Browse Source
This commit is contained in:
Kai Lautaportti
2013-03-22 09:52:18 +02:00
parent e10237e855
commit cad39537ef
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cqlengine/query.py
View File

@@ -169,6 +169,10 @@ class BatchQuery(object):
self.queries.append((query, params)) self.queries.append((query, params))
def execute(self): def execute(self):
if len(self.queries) == 0:
# Empty batch is a no-op
return
opener = 'BEGIN ' + (self.batch_type + ' ' if self.batch_type else '') + ' BATCH' opener = 'BEGIN ' + (self.batch_type + ' ' if self.batch_type else '') + ' BATCH'
if self.timestamp: if self.timestamp:
epoch = datetime(1970, 1, 1) epoch = datetime(1970, 1, 1)
@@ -257,7 +261,7 @@ class QuerySet(object):
def __len__(self): def __len__(self):
return self.count() return self.count()
def __del__(self): def __del__(self):
if self._con: if self._con:
self._con.close() self._con.close()
@@ -347,7 +351,7 @@ class QuerySet(object):
value_dict = dict(zip(names, values)) value_dict = dict(zip(names, values))
self._result_idx += 1 self._result_idx += 1
self._result_cache[self._result_idx] = self._construct_instance(value_dict) self._result_cache[self._result_idx] = self._construct_instance(value_dict)
#return the connection to the connection pool if we have all objects #return the connection to the connection pool if we have all objects
if self._result_cache and self._result_cache[-1] is not None: if self._result_cache and self._result_cache[-1] is not None:
self._con.close() self._con.close()
@@ -389,7 +393,7 @@ class QuerySet(object):
else: else:
self._fill_result_cache_to_idx(s) self._fill_result_cache_to_idx(s)
return self._result_cache[s] return self._result_cache[s]
def _construct_instance(self, values): def _construct_instance(self, values):
#translate column names to model names #translate column names to model names
@@ -476,7 +480,7 @@ class QuerySet(object):
'{} objects found'.format(len(self._result_cache))) '{} objects found'.format(len(self._result_cache)))
else: else:
return self[0] return self[0]
def order_by(self, colname): def order_by(self, colname):
""" """
orders the result set. orders the result set.

6
cqlengine/tests/test_batch_query.py
View File

@@ -103,3 +103,9 @@ class BatchQueryTests(BaseCassEngTestCase):
for m in TestMultiKeyModel.all(): for m in TestMultiKeyModel.all():
m.delete() m.delete()
def test_empty_batch(self):
b = BatchQuery()
b.execute()
with BatchQuery() as b:
pass