Mercurial > libervia-pubsub
annotate idavoll/pgsql_storage.py @ 121:4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
have
been deleted in between calls.
Add Node.get_subscription().
Only fire deferred (with None) on success of Node.add_subscription().
Fix Node.set_configuration() to actually work and only update the Node objects
configuration when the SQL query has succeeded.
Implement Node.remove_subscription().
Implement Node.is_subscribed().
Implement LeafNode methods (unchecked!).
| author | Ralph Meijer <ralphm@ik.nu> |
|---|---|
| date | Tue, 12 Apr 2005 12:26:05 +0000 |
| parents | dfef919aaf1b |
| children | c4ee16bc48e5 |
| rev | line source |
|---|---|
| 107 | 1 import copy |
| 2 import storage | |
| 3 from twisted.enterprise import adbapi | |
| 4 from twisted.internet import defer | |
| 5 from twisted.words.protocols.jabber import jid | |
| 6 from zope.interface import implements | |
| 7 | |
| 8 class Storage: | |
| 9 | |
| 10 implements(storage.IStorage) | |
| 11 | |
| 12 def __init__(self, user, database): | |
| 13 self._dbpool = adbapi.ConnectionPool('pyPgSQL.PgSQL', user=user, | |
| 14 database=database) | |
| 15 | |
| 16 def get_node(self, node_id): | |
| 17 return self._dbpool.runInteraction(self._get_node, node_id) | |
| 18 | |
| 19 def _get_node(self, cursor, node_id): | |
| 20 configuration = {} | |
| 21 cursor.execute("""SELECT persistent, deliver_payload FROM nodes | |
| 22 WHERE node=%s""", | |
| 23 (node_id,)) | |
| 24 try: | |
| 25 (configuration["pubsub#persist_items"], | |
| 26 configuration["pubsub#deliver_payloads"]) = cursor.fetchone() | |
| 27 except TypeError: | |
| 28 raise storage.NodeNotFound | |
| 29 else: | |
| 30 node = LeafNode(node_id, configuration) | |
| 31 node._dbpool = self._dbpool | |
| 32 return node | |
| 33 | |
| 34 def get_node_ids(self): | |
| 35 d = self._dbpool.runQuery("""SELECT node from nodes""") | |
| 36 d.addCallback(lambda results: [r[0] for r in results]) | |
| 37 return d | |
| 38 | |
| 39 def create_node(self, node_id, owner, type='leaf'): | |
| 40 return self._dbpool.runInteraction(self._create_node, node_id, owner) | |
| 41 | |
| 42 def _create_node(self, cursor, node_id, owner): | |
| 113 | 43 node_id = node_id.encode('utf-8') |
| 44 owner = owner.userhost().encode('utf-8') | |
| 107 | 45 try: |
| 46 cursor.execute("""INSERT INTO nodes (node) VALUES (%s)""", | |
| 113 | 47 (node_id)) |
| 48 except cursor._pool.dbapi.OperationalError: | |
| 107 | 49 raise storage.NodeExists |
| 50 | |
| 51 cursor.execute("""SELECT 1 from entities where jid=%s""", | |
| 113 | 52 (owner)) |
| 107 | 53 |
| 54 if not cursor.fetchone(): | |
| 55 cursor.execute("""INSERT INTO entities (jid) VALUES (%s)""", | |
| 113 | 56 (owner)) |
| 107 | 57 |
| 58 cursor.execute("""INSERT INTO affiliations | |
| 59 (node_id, entity_id, affiliation) | |
| 60 SELECT n.id, e.id, 'owner' FROM | |
| 61 (SELECT id FROM nodes WHERE node=%s) AS n | |
| 62 CROSS JOIN | |
| 63 (SELECT id FROM entities WHERE jid=%s) AS e""", | |
| 113 | 64 (node_id, owner)) |
| 107 | 65 |
| 66 def delete_node(self, node_id): | |
| 67 return self._dbpool.runInteraction(self._delete_node, node_id) | |
| 68 | |
| 69 def _delete_node(self, cursor, node_id): | |
| 70 cursor.execute("""DELETE FROM nodes WHERE node=%s""", | |
| 71 (node_id.encode('utf-8'),)) | |
| 72 | |
| 73 if cursor.rowcount != 1: | |
| 74 raise storage.NodeNotFound | |
| 75 | |
| 76 def get_affiliations(self, entity): | |
| 77 d = self._dbpool.runQuery("""SELECT node, affiliation FROM entities | |
| 78 JOIN affiliations ON | |
| 79 (affiliations.entity_id=entities.id) | |
| 80 JOIN nodes ON | |
| 81 (nodes.id=affiliations.node_id) | |
| 82 WHERE jid=%s""", | |
| 113 | 83 (entity.userhost().encode('utf8'),)) |
| 107 | 84 d.addCallback(lambda results: [tuple(r) for r in results]) |
| 85 return d | |
| 86 | |
| 87 def get_subscriptions(self, entity): | |
| 88 d = self._dbpool.runQuery("""SELECT node, jid, resource, subscription | |
| 89 FROM entities JOIN subscriptions ON | |
| 90 (subscriptions.entity_id=entities.id) | |
| 91 JOIN nodes ON | |
| 92 (nodes.id=subscriptions.node_id) | |
| 93 WHERE jid=%s""", | |
| 94 (entity.userhost().encode('utf8'),)) | |
| 95 d.addCallback(self._convert_subscription_jids) | |
| 96 return d | |
| 97 | |
| 98 def _convert_subscription_jids(self, subscriptions): | |
| 99 return [(node, jid.JID('%s/%s' % (subscriber, resource)), subscription) | |
| 100 for node, subscriber, resource, subscription in subscriptions] | |
| 101 | |
| 102 class Node: | |
| 103 | |
| 104 implements(storage.INode) | |
| 105 | |
| 106 def __init__(self, node_id, config): | |
| 107 self.id = node_id | |
| 108 self._config = config | |
| 109 | |
|
121
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
110 def _check_node_exists(self, cursor): |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
111 cursor.execute("""SELECT id FROM nodes WHERE node=%s""", |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
112 (self.id.encode('utf8'))) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
113 if not cursor.fetchone(): |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
114 raise backend.NodeNotFound |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
115 |
| 107 | 116 def get_type(self): |
| 117 return self.type | |
| 118 | |
| 119 def get_configuration(self): | |
| 120 return self._config | |
| 121 | |
| 122 def set_configuration(self, options): | |
|
121
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
123 return self._dbpool.runInteraction(self._set_configuration, |
| 107 | 124 options) |
| 125 | |
| 126 def _set_configuration(self, cursor, options): | |
|
121
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
127 self._check_node_exists(cursor) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
128 |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
129 config = copy.copy(self._config) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
130 |
| 107 | 131 for option in options: |
|
121
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
132 if option in config: |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
133 config[option] = options[option] |
| 107 | 134 |
| 135 cursor.execute("""UPDATE nodes SET persistent=%s, deliver_payload=%s | |
| 136 WHERE node=%s""", | |
|
121
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
137 (config["pubsub#persist_items"], |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
138 config["pubsub#deliver_payloads"], |
| 107 | 139 self.id.encode('utf-8'))) |
| 140 | |
|
121
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
141 self._config = config |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
142 |
| 107 | 143 def get_meta_data(self): |
| 144 config = copy.copy(self._config) | |
| 145 config["pubsub#node_type"] = self.type | |
| 146 return config | |
| 147 | |
| 148 def get_affiliation(self, entity): | |
| 149 return self._dbpool.runInteraction(self._get_affiliation, entity) | |
| 150 | |
| 151 def _get_affiliation(self, cursor, entity): | |
|
121
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
152 self._check_node_exists(cursor) |
| 107 | 153 cursor.execute("""SELECT affiliation FROM affiliations |
| 154 JOIN nodes ON (node_id=nodes.id) | |
| 155 JOIN entities ON (entity_id=entities.id) | |
| 156 WHERE node=%s AND jid=%s""", | |
| 157 (self.id.encode('utf8'), | |
| 113 | 158 entity.userhost().encode('utf8'))) |
| 107 | 159 |
| 160 try: | |
| 161 return cursor.fetchone()[0] | |
| 162 except TypeError: | |
| 163 return None | |
| 164 | |
|
121
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
165 def get_subscription(self, subscriber): |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
166 return self._dbpool.runInteraction(self._get_subscription, subscriber) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
167 |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
168 def _get_subscription(self, cursor, subscriber): |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
169 self._check_node_exists(cursor) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
170 |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
171 userhost = subscriber.userhost() |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
172 resource = subscriber.resource or '' |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
173 |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
174 cursor.execute("""SELECT subscription FROM subscriptions |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
175 JOIN nodes ON (nodes.id=subscriptions.node_id) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
176 JOIN entities ON |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
177 (entities.id=subscriptions.entity_id) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
178 WHERE node=%s AND jid=%s AND resource=%s""", |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
179 (self.id.encode('utf8'), |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
180 userhost.encode('utf8'), |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
181 resource.encode('utf8'))) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
182 try: |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
183 return cursor.fetchone()[0] |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
184 except TypeError: |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
185 return None |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
186 |
| 107 | 187 def add_subscription(self, subscriber, state): |
| 188 return self._dbpool.runInteraction(self._add_subscription, subscriber, | |
| 189 state) | |
| 190 | |
| 191 def _add_subscription(self, cursor, subscriber, state): | |
|
121
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
192 self._check_node_exists(cursor) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
193 |
| 107 | 194 userhost = subscriber.userhost() |
| 195 resource = subscriber.resource or '' | |
| 196 | |
| 197 try: | |
| 198 cursor.execute("""INSERT INTO entities (jid) VALUES (%s)""", | |
| 199 (userhost.encode('utf8'))) | |
| 113 | 200 except cursor._pool.dbapi.OperationalError: |
| 107 | 201 pass |
| 202 | |
| 203 try: | |
| 204 cursor.execute("""INSERT INTO subscriptions | |
| 205 (node_id, entity_id, resource, subscription) | |
| 206 SELECT n.id, e.id, %s, %s FROM | |
| 207 (SELECT id FROM nodes WHERE node=%s) AS n | |
| 208 CROSS JOIN | |
| 209 (SELECT id FROM entities WHERE jid=%s) AS e""", | |
| 210 (resource.encode('utf8'), | |
| 211 state.encode('utf8'), | |
| 212 self.id.encode('utf8'), | |
| 213 userhost.encode('utf8'))) | |
| 113 | 214 except cursor._pool.dbapi.OperationalError: |
|
121
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
215 raise storage.SubscriptionExists |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
216 |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
217 def remove_subscription(self, subscriber): |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
218 return self._dbpool.runInteraction(self._remove_subscription, |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
219 subscriber) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
220 |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
221 def _remove_subscription(self, cursor, subscriber): |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
222 self._check_node_exists(cursor) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
223 |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
224 userhost = subscriber.userhost() |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
225 resource = subscriber.resource or '' |
| 107 | 226 |
|
121
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
227 cursor.execute("""DELETE FROM subscriptions WHERE |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
228 node_id=(SELECT id FROM nodes WHERE node=%s) AND |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
229 entity_id=(SELECT id FROM entities WHERE jid=%s) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
230 AND resource=%s""", |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
231 (self.id.encode('utf8'), |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
232 userhost.encode('utf8'), |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
233 resource.encode('utf8'))) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
234 if cursor.rowcount != 1: |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
235 raise storage.SubscriptionNotFound |
| 107 | 236 |
|
121
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
237 return None |
| 107 | 238 |
| 239 def get_subscribers(self): | |
|
121
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
240 d = self._dbpool.runInteraction(self._get_subscribers) |
| 107 | 241 d.addCallback(self._convert_to_jids) |
| 242 return d | |
| 243 | |
|
121
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
244 def _get_subscribers(self, cursor): |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
245 self._check_node_exists(cursor) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
246 cursor.execute("""SELECT jid, resource FROM subscriptions |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
247 JOIN nodes ON (node_id=nodes.id) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
248 JOIN entities ON (entity_id=entities.id) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
249 WHERE node=%s AND |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
250 subscription='subscribed'""", |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
251 (self.id.encode('utf8'),)) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
252 return cursor.fetchall() |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
253 |
| 107 | 254 def _convert_to_jids(self, list): |
| 255 return [jid.JID("%s/%s" % (l[0], l[1])) for l in list] | |
| 256 | |
| 257 def is_subscribed(self, subscriber): | |
|
121
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
258 return self._dbpool.runInteraction(self._is_subscribed, subscriber) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
259 |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
260 def _is_subscribed(self, cursor, subscriber): |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
261 self._check_node_exists(cursor) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
262 |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
263 userhost = subscriber.userhost() |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
264 resource = subscriber.resource or '' |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
265 |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
266 cursor.execute("""SELECT 1 FROM entities |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
267 JOIN subscriptions ON |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
268 (entities.id=subscriptions.entity_id) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
269 JOIN nodes ON |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
270 (nodes.id=subscriptions.node_id) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
271 WHERE entities.jid=%s AND resource=%s |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
272 AND node=%s AND subscription='subscribed'""", |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
273 (userhost.encode('utf8'), |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
274 resource.encode('utf8'), |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
275 self.id.encode('utf8'))) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
276 |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
277 return cursor.fetchone() is not None |
| 107 | 278 |
| 279 class LeafNode(Node): | |
| 280 | |
| 281 implements(storage.ILeafNode) | |
| 282 | |
| 283 type = 'leaf' | |
| 284 | |
| 285 def store_items(self, items, publisher): | |
|
121
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
286 return self._dbpool.runInteraction(self._store_items, items, publisher) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
287 |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
288 def _store_items(self, cursor, items, publisher): |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
289 self._check_node_exists(cursor) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
290 for item in items: |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
291 self._store_item(cursor, item, publisher) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
292 |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
293 def _store_item(self, cursor, item, publisher): |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
294 data = item.toXml() |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
295 cursor.execute("""UPDATE items SET date=now(), publisher=%s, data=%s |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
296 FROM nodes |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
297 WHERE nodes.id = items.node_id AND |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
298 nodes.node = %s and items.item=%s""", |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
299 (publisher.full().encode('utf8'), |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
300 data.encode('utf8'), |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
301 self.id.encode('utf8'), |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
302 item["id"].encode('utf8'))) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
303 if cursor.rowcount == 1: |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
304 return |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
305 |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
306 cursor.execute("""INSERT INTO items (node_id, item, publisher, data) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
307 SELECT id, %s, %s, %s FROM nodes WHERE node=%s""", |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
308 (item["id"].encode('utf8'), |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
309 publisher.full().encode('utf8'), |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
310 data.encode('utf8'), |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
311 self.id.encode('utf8'))) |
| 107 | 312 |
| 313 def remove_items(self, item_ids): | |
|
121
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
314 return self._dbpool.runInteraction(self._remove_items, item_ids) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
315 |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
316 def _remove_items(self, cursor, item_ids): |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
317 self._check_node_exists(cursor) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
318 |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
319 deleted = [] |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
320 |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
321 for item_id in item_ids: |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
322 cursor.execute("""DELETE FROM items WHERE |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
323 node_id=(SELECT id FROM nodes WHERE node=%s) AND |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
324 item=%s""", |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
325 (self.id.encode('utf-8'), |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
326 item_id.encode('utf-8'))) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
327 |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
328 if cursor.rowcount: |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
329 deleted.append(item_id) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
330 |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
331 return deleted |
| 107 | 332 |
| 333 def get_items(self, max_items=None): | |
|
121
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
334 return self._dbpool.runInteraction(self._get_items, max_items) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
335 |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
336 def _get_items(self, cursor, max_items): |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
337 self._check_node_exists(cursor) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
338 query = """SELECT data FROM nodes JOIN items ON |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
339 (nodes.id=items.node_id) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
340 WHERE node=%s ORDER BY date DESC""" |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
341 if max_items: |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
342 cursor.execute(query + " LIMIT %s", |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
343 (self.id.encode('utf8'), |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
344 max_items)) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
345 else: |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
346 cursor.execute(query, (self.id.encode('utf8'))) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
347 |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
348 result = cursor.fetchall() |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
349 return [r[0] for r in result] |
| 107 | 350 |
|
121
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
351 def get_items_by_ids(self, item_ids): |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
352 return self._dbpool.runInteraction(self._get_items_by_ids, item_ids) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
353 |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
354 def _get_items_by_ids(self, cursor, item_ids): |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
355 self._check_node_exists(cursor) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
356 items = [] |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
357 for item_id in item_ids: |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
358 cursor.execute("""SELECT data FROM nodes JOIN items ON |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
359 (nodes.id=items.node_id) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
360 WHERE node=%s AND item=%s""", |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
361 (self.id.encode('utf8'), |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
362 item_id.encode('utf8'))) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
363 result = cursor.fetchone() |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
364 if result: |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
365 items.append(result[0]) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
366 return items |
| 107 | 367 |
| 368 def purge(self): | |
|
121
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
369 return self._dbpool.runInteraction(self._purge) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
370 |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
371 def _purge_node(self, cursor): |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
372 self._check_node_exists(cursor) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
373 |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
374 cursor.execute("""DELETE FROM items WHERE |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
375 node_id=(SELECT id FROM nodes WHERE node=%s)""", |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
376 (self.id.encode('utf-8'),)) |
|
4f0113adb7ed
Add Node._check_node_exists() calls to all Node methods, because nodes could
Ralph Meijer <ralphm@ik.nu>
parents:
113
diff
changeset
|
377 |