diff sat_pubsub/backend.py @ 367:a772f7dac930

backend, storage(pgsql): creation/update date + serial ids: /!\ this patch updates pgqsl schema /!\ Had to set 2 features in the same patch, to avoid updating 2 times the schema. 1) creation/last modification date: column keeping the date of creation of items is renamed from "date" to "created" the date of last modification of items is saved in the new "updated" column 2) serial ids: this experimental feature allows to have ids in series (i.e. 1, 2, 3, etc.) instead of UUID. This is a convenience feature and there are some drawbacks: - PostgreSQL sequences are used, so gaps can happen (see PostgreSQL documentation for more details) - if somebody create an item with a future id in the series, the series will adapt, which can have undesired effect, and may lead to item fail if several items are created at the same time. For instance if next id in series is "8", and somebody hads already created item "8" and "256", the item will be created with biggest value in items +1 (i.e. 257). if 2 people want to create item in this situation, the second will fail with a conflict error.
author Goffi <goffi@goffi.org>
date Sat, 04 Nov 2017 21:31:32 +0100
parents 9fbb31ce495b
children 618a92080812
line wrap: on
line diff
--- a/sat_pubsub/backend.py	Sat Nov 04 21:17:12 2017 +0100
+++ b/sat_pubsub/backend.py	Sat Nov 04 21:31:32 2017 +0100
@@ -142,6 +142,9 @@
                      const.VAL_PMODEL_SUBSCRIBERS: "Everybody which subscribed to the node",
                      }
                 },
+            const.OPT_SERIAL_IDS:
+                {"type": "boolean",
+                 "label": "Use serial ids"},
             }
 
     subscriptionOptions = {
@@ -358,6 +361,7 @@
         d.addCallback(self._doPublish, items, requestor, pep, recipient)
         return d
 
+    @defer.inlineCallbacks
     def _doPublish(self, result, items, requestor, pep, recipient):
         affiliation, node = result
         if node.nodeType == 'collection':
@@ -381,32 +385,31 @@
                 item.uri = None
                 item.defaultUri = None
                 if not item.getAttribute("id"):
-                    item["id"] = str(uuid.uuid4())
+                    item["id"] = yield node.getNextId()
+                    new_item = True
                 else:
                     check_overwrite = True
+                    new_item = False
             access_model, item_config = self.parseItemConfig(item)
             categories = self.parseCategories(item)
             schema = node.getSchema()
             if schema is not None:
                 self.enforceSchema(item, schema, affiliation)
-            items_data.append(container.ItemData(item, access_model, item_config, categories))
+            items_data.append(container.ItemData(item, access_model, item_config, categories, new=new_item))
 
         if persistItems:
+
             if check_overwrite and affiliation != 'owner':
                 # we don't want a publisher to overwrite the item
                 # of an other publisher
-                d = self._checkOverwrite(node, [item['id'] for item in items if item.getAttribute('id')], requestor)
-                d.addCallback(lambda _: node.storeItems(items_data, requestor))
-            else:
-                d = node.storeItems(items_data, requestor)
-        else:
-            d = defer.succeed(None)
+                yield self._checkOverwrite(node, [item['id'] for item in items if item.getAttribute('id')], requestor)
 
-        d.addCallback(self._doNotify, node, items_data,
-                      deliverPayloads, pep, recipient)
-        return d
+            # TODO: check conflict and recalculate max id if serial_ids is set
+            yield node.storeItems(items_data, requestor)
 
-    def _doNotify(self, result, node, items_data, deliverPayloads, pep, recipient):
+        yield self._doNotify(node, items_data, deliverPayloads, pep, recipient)
+
+    def _doNotify(self, node, items_data, deliverPayloads, pep, recipient):
         if items_data and not deliverPayloads:
             for item_data in items_data:
                 item_data.item.children = []
@@ -622,7 +625,6 @@
 
         return d
 
-
     def setNodeSchema(self, nodeIdentifier, schema, requestor, pep, recipient):
         """set or remove Schema of a node