pub/mongoengine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed keeptemp from map_reduce as 0.5 requires pymongo 1.11

Browse Source 
Closes #258
This commit is contained in:
Ross Lawley 2011-08-17 21:38:46 +01:00
parent 97ac7e5476
commit 11621c6f5a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mongoengine/queryset.py
View File

@ -872,7 +872,7 @@ class QuerySet(object):
return self.count() return self.count()
def map_reduce(self, map_f, reduce_f, output, finalize_f=None, limit=None, def map_reduce(self, map_f, reduce_f, output, finalize_f=None, limit=None,
scope=None, keep_temp=False): scope=None):
"""Perform a map/reduce query using the current query spec """Perform a map/reduce query using the current query spec
and ordering. While ``map_reduce`` respects ``QuerySet`` chaining, and ordering. While ``map_reduce`` respects ``QuerySet`` chaining,
it must be the last call made, as it does not return a maleable it must be the last call made, as it does not return a maleable
@ -920,7 +920,7 @@ class QuerySet(object):
reduce_f_code = self._sub_js_fields(reduce_f) reduce_f_code = self._sub_js_fields(reduce_f)
reduce_f = pymongo.code.Code(reduce_f_code, reduce_f_scope) reduce_f = pymongo.code.Code(reduce_f_code, reduce_f_scope)
mr_args = {'query': self._query, 'keeptemp': keep_temp} mr_args = {'query': self._query}
if finalize_f: if finalize_f:
finalize_f_scope = {} finalize_f_scope = {}
@ -937,7 +937,7 @@ class QuerySet(object):
if limit: if limit:
mr_args['limit'] = limit mr_args['limit'] = limit
if output == 'inline' or (not keep_temp and not self._ordering): if output == 'inline' and not self._ordering:
map_reduce_function = 'inline_map_reduce' map_reduce_function = 'inline_map_reduce'
else: else:
map_reduce_function = 'map_reduce' map_reduce_function = 'map_reduce'
@ -1514,7 +1514,7 @@ class QuerySet(object):
return total; return total;
} }
""" """
values = self.map_reduce(map_func, reduce_func, 'inline', keep_temp=False) values = self.map_reduce(map_func, reduce_func, 'inline')
frequencies = {} frequencies = {}
for f in values: for f in values:
key = f.key key = f.key