Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move dynamo type comparison inside the dynamo type class

Browse Source
This commit is contained in:
Steve Pulec 2013-03-15 11:10:38 -04:00
parent ffa193cb10
commit c1b9718282
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -5,4 +5,5 @@ init:
pip install -r requirements.txt pip install -r requirements.txt
test: test:
rm .coverage
nosetests --with-coverage ./tests/ nosetests --with-coverage ./tests/

22
moto/dynamodb/models.py
View File

@ -18,6 +18,10 @@ def dynamo_json_dump(dynamo_object):
class DynamoType(object): class DynamoType(object):
"""
http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/DataModel.html#DataModelDataTypes
"""
def __init__(self, type_as_dict): def __init__(self, type_as_dict):
self.type = type_as_dict.keys()[0] self.type = type_as_dict.keys()[0]
self.value = type_as_dict.values()[0] self.value = type_as_dict.values()[0]
@ -37,6 +41,14 @@ class DynamoType(object):
def to_json(self): def to_json(self):
return {self.type: self.value} return {self.type: self.value}
def compare(self, range_comparison, range_objs):
"""
Compares this type against comparison filters
"""
range_values = [obj.value for obj in range_objs]
comparison_func = get_comparison_func(range_comparison)
return comparison_func(self.value, *range_values)
class Item(object): class Item(object):
def __init__(self, hash_key, hash_key_type, range_key, range_key_type, attrs): def __init__(self, hash_key, hash_key_type, range_key, range_key_type, attrs):
@ -159,10 +171,8 @@ class Table(object):
possible_results = list(self.all_items()) possible_results = list(self.all_items())
if range_comparison: if range_comparison:
comparison_func = get_comparison_func(range_comparison)
for result in possible_results: for result in possible_results:
range_values = [obj.value for obj in range_objs] if result.range_key.compare(range_comparison, range_objs):
if comparison_func(result.range_key.value, *range_values):
results.append(result) results.append(result)
else: else:
# If we're not filtering on range key, return all values # If we're not filtering on range key, return all values
@ -186,13 +196,11 @@ class Table(object):
scanned_count += 1 scanned_count += 1
passes_all_conditions = True passes_all_conditions = True
for attribute_name, (comparison_operator, comparison_objs) in filters.iteritems(): for attribute_name, (comparison_operator, comparison_objs) in filters.iteritems():
comparison_func = get_comparison_func(comparison_operator)
attribute = result.attrs.get(attribute_name) attribute = result.attrs.get(attribute_name)
if attribute: if attribute:
# Attribute found # Attribute found
comparison_values = [obj.value for obj in comparison_objs] if not attribute.compare(comparison_operator, comparison_objs):
if not comparison_func(attribute.value, *comparison_values):
passes_all_conditions = False passes_all_conditions = False
break break
elif comparison_operator == 'NULL': elif comparison_operator == 'NULL':