cubicweb: comparison server/repository.py

equal deleted inserted replaced

-:d2874ddd4347
+:b0a2e779845c
 # if inlined relations are specified, fill entity's related cache to
 # avoid unnecessary queries
 for attr in entity.keys():
 rschema = eschema.subject_relation(attr)
 if not rschema.is_final(): # inlined relation
-entity.set_related_cache(attr, 'subject',
-entity.req.eid_rset(entity[attr]))
 relations.append((attr, entity[attr]))
 if source.should_call_hooks:
 self.hm.call_hooks('before_add_entity', etype, session, entity)
+entity.edited_attributes = entity.keys()
 entity.set_defaults()
 entity.check(creation=True)
 source.add_entity(session, entity)
 if source.uri != 'system':
 extid = source.get_extid(entity)
 self._extid_cache[(str(extid), source.uri)] = entity.eid
 else:
 extid = None
 self.add_info(session, entity, source, extid, complete=False)
 entity._is_saved = True # entity has an eid and is saved
+# prefill entity relation caches
+session.set_entity_cache(entity)
+for rschema in eschema.subject_relations():
+rtype = str(rschema)
+if rtype in VIRTUAL_RTYPES:
+continue
+if rschema.is_final():
+entity.setdefault(rtype, None)
+else:
+entity.set_related_cache(rtype, 'subject', session.empty_rset())
+for rschema in eschema.object_relations():
+rtype = str(rschema)
+if rtype in VIRTUAL_RTYPES:
+continue
+entity.set_related_cache(rtype, 'object', session.empty_rset())
 # trigger after_add_entity after after_add_relation
 if source.should_call_hooks:
 self.hm.call_hooks('after_add_entity', etype, session, entity)
 # call hooks for inlined relations
 for attr, value in relations:
 self.hm.call_hooks('before_add_relation', attr, session,
 entity.eid, attr, value)
+session.update_rel_cache_add(entity.eid, attr, value)
 self.hm.call_hooks('after_add_relation', attr, session,
 entity.eid, attr, value)
 return entity.eid
 def glob_update_entity(self, session, entity):
 etype = str(entity.e_schema)
 if server.DEBUG & server.DBG_REPO:
 print 'UPDATE entity', etype, entity.eid, dict(entity)
 entity.check()
 eschema = entity.e_schema
+session.set_entity_cache(entity)
 only_inline_rels, need_fti_update = True, False
 relations = []
 for attr in entity.keys():
 if attr == 'eid':
 continue
 else:
 # inlined relation
 previous_value = entity.related(attr)
 if previous_value:
 previous_value = previous_value[0][0] # got a result set
-self.hm.call_hooks('before_delete_relation', attr, session,
+if previous_value == entity[attr]:
-entity.eid, attr, previous_value)
+previous_value = None
-entity.set_related_cache(attr, 'subject',
+else:
-entity.req.eid_rset(entity[attr]))
+self.hm.call_hooks('before_delete_relation', attr,
+session, entity.eid, attr,
+previous_value)
 relations.append((attr, entity[attr], previous_value))
 source = self.source_from_eid(entity.eid, session)
 if source.should_call_hooks:
 # call hooks for inlined relations
 for attr, value, _ in relations:
 if source.should_call_hooks:
 self.hm.call_hooks('after_update_entity', etype, session,
 entity)
 if source.should_call_hooks:
 for attr, value, prevvalue in relations:
+# if the relation is already cached, update existant cache
+relcache = entity.relation_cached(attr, 'subject')
 if prevvalue:
 self.hm.call_hooks('after_delete_relation', attr, session,
 entity.eid, attr, prevvalue)
+if relcache is not None:
+session.update_rel_cache_del(entity.eid, attr, prevvalue)
 del_existing_rel_if_needed(session, entity.eid, attr, value)
+if relcache is not None:
+session.update_rel_cache_add(entity.eid, attr, value)
+else:
+entity.set_related_cache(attr, 'subject',
+session.eid_rset(value))
 self.hm.call_hooks('after_add_relation', attr, session,
 entity.eid, attr, value)
 def glob_delete_entity(self, session, eid):
 """delete an entity and all related entities from the repository"""
 # call delete_info before hooks
 self._prepare_delete_info(session, eid)
 etype, uri, extid = self.type_and_source_from_eid(eid, session)
 if server.DEBUG & server.DBG_REPO:
 print 'DELETE entity', etype, eid
+if eid == 937:
+server.DEBUG |= (server.DBG_SQL | server.DBG_RQL | server.DBG_MORE)
 source = self.sources_by_uri[uri]
 if source.should_call_hooks:
 self.hm.call_hooks('before_delete_entity', etype, session, eid)
 self._delete_info(session, eid)
 source.delete_entity(session, etype, eid)
 if source.should_call_hooks:
 del_existing_rel_if_needed(session, subject, rtype, object)
 self.hm.call_hooks('before_add_relation', rtype, session,
 subject, rtype, object)
 source.add_relation(session, subject, rtype, object)
+rschema = self.schema.rschema(rtype)
+session.update_rel_cache_add(subject, rtype, object, rschema.symetric)
 if source.should_call_hooks:
 self.hm.call_hooks('after_add_relation', rtype, session,
 subject, rtype, object)
 def glob_delete_relation(self, session, subject, rtype, object):
 source = self.locate_relation_source(session, subject, rtype, object)
 if source.should_call_hooks:
 self.hm.call_hooks('before_delete_relation', rtype, session,
 subject, rtype, object)
 source.delete_relation(session, subject, rtype, object)
-if self.schema.rschema(rtype).symetric:
+rschema = self.schema.rschema(rtype)
+session.update_rel_cache_del(subject, rtype, object, rschema.symetric)
+if rschema.symetric:
 # on symetric relation, we can't now in which sense it's
 # stored so try to delete both
 source.delete_relation(session, object, rtype, subject)
 if source.should_call_hooks:
 self.hm.call_hooks('after_delete_relation', rtype, session,

changeset 2647	b0a2e779845c
parent 2641	9c33d98a074e
child 2650	18aec79ec3a3