Fix several bugs including:

- {} should NOT match anything other than an empty dictionary in some cases
- indexes should be checked after all update operators

Author: Xin Dong

test/correctness/gen.py

@@ -183,9 +183,8 @@ def random_id_value():
 def random_value():
     r = global_prng.random()
     while True:
-        # TODO re-enable None value generating
         # if (r < 0.1) and generator_options.test_nulls:
-        #     val = None
+            # val = None
         if (r < 0.2):
             val = random_float()
         elif (r < 0.4):

test/correctness/mongo_model.py

@@ -835,11 +835,9 @@ def process_update_operator_pull_all(self, key, update_expression):
                     raise MongoModelException("Cannot apply $pullAll to a non-array field.", code=10142)
 
     def evaluate(self, query, document):
-        if len(query) == 0:
-            # If we made it here, the evaluate function must NOT be called from the `find` function, and thus
-            # we can return false. Note in find() function, an empty query means maches all documents.
-            return False
         acc = True
+        if len(query) == 0:
+            return len(document) == 0
         for field in query.keys():
             if field == '_id':
                 tmp = OrderedDict()
@@ -960,21 +958,15 @@ def has_operator_expressions(doc):
 
     def process_update_operator(self, key, update, new_doc=False):
         op_update = self.has_operator_expressions(update)
-        old_data = None
-
-        try:
-            old_data = deepcopy(self.data[key])
-            if op_update:
-                for k in update:
-                    if k == '$setOnInsert':
-                        self.mapUpdateOperator[k](key, update[k], new_doc=new_doc)
-                    elif k in self.mapUpdateOperator:
-                        self.mapUpdateOperator[k](key, update[k])
-            else:
-                self.replace(key, update)
-        except MongoModelException as e:
-            self.data[key] = old_data
-            raise e
+        old_data = deepcopy(self.data[key])
+        if op_update:
+            for k in update:
+                if k == '$setOnInsert':
+                    self.mapUpdateOperator[k](key, update[k], new_doc=new_doc)
+                elif k in self.mapUpdateOperator:
+                    self.mapUpdateOperator[k](key, update[k])
+        else:
+            self.replace(key, update)
 
     def deep_transform_logical_operators(self, selector=None):
         new_selector = {}
@@ -1124,26 +1116,27 @@ def update(self, query, update, upsert, multi):
             raise MongoModelException('multi update only works with $ operators', code=10158)
         if isOperatorUpdate:
             self.validate_update_object(update)
-        if len(query) == 0:
-            return
-        key = query.keys()[0]
         any = False
         old_data = deepcopy(self.data)
         n = 0
         try:
+            if len(query) == 0:
+                # Update all existing docs. And since the query is empty, do NOT do upsert.
+                any = True
+                for k in self.data.keys():
+                    n +=1
+                    self.process_update_operator(k, update)
+                    if not multi:
+                        break
+            key = query.keys()[0]
             for k, item in self.data.iteritems():
                 if evaluate(key, query[key], item, self.options):
                     any = True
                     n += 1
                     # print "Result: ", item
-                    if len(update) > 0:
-                        self.process_update_operator(k, update)
-                        if not multi:
-                            return
-                    else:
-                        self.replace(k, update)
-                        if not multi:
-                            return
+                    self.process_update_operator(k, update)
+                    if not multi:
+                        break
             if any:
                 for index in self.indexes:
                     if not index.inError:
@@ -1184,7 +1177,7 @@ def update(self, query, update, upsert, multi):
                 if "_id" in query:
                     update["_id"] = query["_id"]
                 self.insert(update)
-        else:
+        elif not any:
             # mongoDB raise an exception for the '$setOnInsert' update operator even if the upsert is False
             if '$setOnInsert' in update.keys() and len(update['$setOnInsert']) == 0:
                 raise MongoModelException(