Using random int as the uid of Activity

product/CMFActivity/Activity/SQLBase.py

@@ -28,6 +28,8 @@
 
 import sys
 import transaction
+import random
+from MySQLdb.constants.ER import DUP_ENTRY
 from DateTime import DateTime
 from Shared.DC.ZRDB.Results import Results
 from Shared.DC.ZRDB.DA import DatabaseError
@@ -122,8 +124,6 @@ class SQLBase(Queue):
     portal = activity_tool.getPortalObject()
     for i in xrange(0, len(registered_message_list), MAX_MESSAGE_LIST_SIZE):
       message_list = registered_message_list[i:i+MAX_MESSAGE_LIST_SIZE]
-      uid_list = portal.portal_ids.generateNewIdList(self.uid_group,
-        id_count=len(message_list), id_generator='uid')
       path_list = ['/'.join(m.object_path) for m in message_list]
       active_process_uid_list = [m.active_process_uid for m in message_list]
       method_id_list = [m.method_id for m in message_list]
@@ -137,19 +137,29 @@ class SQLBase(Queue):
       for m in message_list:
         m.order_validation_text = x = self.getOrderValidationText(m)
         processing_node_list.append(0 if x == 'none' else -1)
-      portal.SQLBase_writeMessageList(
-        table=self.sql_table,
-        uid_list=uid_list,
-        path_list=path_list,
-        active_process_uid_list=active_process_uid_list,
-        method_id_list=method_id_list,
-        priority_list=priority_list,
-        message_list=map(Message.dump, message_list),
-        group_method_id_list=group_method_id_list,
-        date_list=date_list,
-        tag_list=tag_list,
-        processing_node_list=processing_node_list,
-        serialization_tag_list=serialization_tag_list)
+      for i in range(10):
+        try:
+          uid_list = [random.randrange(0, 0x7fffffff) for _ in range(len(message_list))]
+          portal.SQLBase_writeMessageList(
+            table=self.sql_table,
+            uid_list=uid_list,
+            path_list=path_list,
+            active_process_uid_list=active_process_uid_list,
+            method_id_list=method_id_list,
+            priority_list=priority_list,
+            message_list=map(Message.dump, message_list),
+            group_method_id_list=group_method_id_list,
+            date_list=date_list,
+            tag_list=tag_list,
+            processing_node_list=processing_node_list,
+            serialization_tag_list=serialization_tag_list)
+        except MySQLdb.IntegrityError, (code, _):
+          if code != DUP_ENTRY:
+            raise
+        else:
+          break
+      else:
+        raise ValueError("Maximum retry for SQLBase_writeMessageList reached")
 
   def getNow(self, context):
     """