handle non-zero response flags

Mike Dirolf · Mike Dirolf · commit d985dc7c3833 · 2009-01-15T17:51:58.000-05:00
diff --git a/mongo.py b/mongo.py
@@ -653,7 +653,8 @@ def _refresh(self):
         """Refreshes the cursor with more data from Mongo.
 
         Returns the length of self.__data after refresh. Will exit early if
-        self.__data is already non-empty.
+        self.__data is already non-empty. Raises DatabaseException when the
+        cursor cannot be refreshed due to an error on the query.
         """
         if len(self.__data) or self.__killed:
             return len(self.__data)
@@ -663,8 +664,14 @@ def send_message(operation, message):
             request_id = self.__collection._send_message(operation, message)
             response = self.__collection.database()._receive_message(1, request_id)
 
-            # TODO handle non-zero response flags
-            assert struct.unpack("<i", response[:4])[0] == 0
+            response_flag = struct.unpack("<i", response[:4])[0]
+            if response_flag == 1:
+                raise DatabaseException("cursor id '%s' not valid at server" % self.__id)
+            elif response_flag == 2:
+                error_object = bson.to_dict(response[20:])
+                raise DatabaseException("database error: %s" % error_object["$err"])
+            else:
+                assert response_flag == 0
 
             self.__id = struct.unpack("<q", response[4:12])[0]
             assert struct.unpack("<i", response[12:16])[0] == self.__retrieved
