[Sqlalchemy-commits] [1487] sqlalchemy/branches/schema/examples/backref: factoring the "dependency p
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1487] sqlalchemy/branches/schema/examples/backref: factoring the "dependency processor" step into two steps; a pre-topological sort version and a post-topological sort version.
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><style type="text/css"><!-- #msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } #msg dt { float: left; width: 6em; font-weight: bold; } #msg dt:after { content:':';} #msg dl, #msg dt, #msg ul, #msg li { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: bold} #msg dl a:link { color:#fc3; } #msg dl a:active { color:#ff0; } #msg dl a:visited { color:#cc6; } h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; } #msg ul, pre { overflow: auto; } #patch { width: 100%; } #patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;} #patch .propset h4, #patch .binary h4 {margin:0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;} #patch .propset .diff, #patch .binary .diff {padding:10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, .info {color:#888;background:#fff;} --></style> <title>[1487] sqlalchemy/branches/schema/examples/backref: factoring the "dependency processor" step into two steps; a pre-topological sort version and a post-topological sort version.</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1487</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-05-22 14:34:44 -0500 (Mon, 22 May 2006)</dd> </dl> <h3>Log Message</h3> <pre>factoring the "dependency processor" step into two steps; a pre-topological sort version and a post-topological sort version. this will help circularly-sorted flushes to work completely and will eventually remove the need for a possible "post-flush" task dump. sort_circular_dependencies simplified a little more (hooray).</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesschemadocbuildcontentdatamappingtxt">sqlalchemy/branches/schema/doc/build/content/datamapping.txt</a></li> <li><a href="#sqlalchemybranchesschemaexamplesadjacencytreebasic_treepy">sqlalchemy/branches/schema/examples/adjacencytree/basic_tree.py</a></li> <li><a href="#sqlalchemybranchesschemaexamplesbackrefbackref_treepy">sqlalchemy/branches/schema/examples/backref/backref_tree.py</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemyormdependencypy">sqlalchemy/branches/schema/lib/sqlalchemy/orm/dependency.py</a></li> <li><a href="#sqlalchemybranchesschemalibsqlalchemyormunitofworkpy">sqlalchemy/branches/schema/lib/sqlalchemy/orm/unitofwork.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesschemadocbuildcontentdatamappingtxt"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/doc/build/content/datamapping.txt (1486 => 1487)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/doc/build/content/datamapping.txt 2006-05-22 17:33:50 UTC (rev 1486) +++ sqlalchemy/branches/schema/doc/build/content/datamapping.txt 2006-05-22 19:34:44 UTC (rev 1487) </span><span class="lines">@@ -1,3 +1,6 @@ </span><ins>+[alpha_api]: javascript:alphaApi() +[alpha_implementation]: javascript:alphaImplementation() + </ins><span class="cx"> Data Mapping {@name=datamapping} </span><span class="cx"> ============ </span><span class="cx"> </span><span class="lines">@@ -424,6 +427,8 @@ </span><span class="cx"> </span><span class="cx"> #### More Granular Join Control Using join\_to, join\_via {@name=jointo} </span><span class="cx"> </span><ins>+Feature Status: [Alpha API][alpha_api] + </ins><span class="cx"> The `join_to` method of `Query` is a component of the `select_by` operation, and is given a keyname in order to return a "join path" from the Query's mapper to the mapper which is referenced by a `relation()` of the given name: </span><span class="cx"> </span><span class="cx"> {python} </span></span></pre></div> <a id="sqlalchemybranchesschemaexamplesadjacencytreebasic_treepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/examples/adjacencytree/basic_tree.py (1486 => 1487)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/examples/adjacencytree/basic_tree.py 2006-05-22 17:33:50 UTC (rev 1486) +++ sqlalchemy/branches/schema/examples/adjacencytree/basic_tree.py 2006-05-22 19:34:44 UTC (rev 1487) </span><span class="lines">@@ -4,47 +4,36 @@ </span><span class="cx"> </span><span class="cx"> """a basic Adjacency List model tree.""" </span><span class="cx"> </span><del>-engine = create_engine('sqlite://', echo = True) -#engine = sqlalchemy.engine.create_engine('mysql', {'db':'test', 'host':'127.0.0.1', 'user':'scott'}, echo=True) -#engine = sqlalchemy.engine.create_engine('postgres', {'database':'test', 'host':'127.0.0.1', 'user':'scott', 'password':'tiger'}, echo=True) -#engine = sqlalchemy.engine.create_engine('oracle', {'dsn':os.environ['DSN'], 'user':os.environ['USER'], 'password':os.environ['PASSWORD']}, echo=True) </del><ins>+metadata = BoundMetaData('sqlite:///', echo=True) </ins><span class="cx"> </span><ins>+"""create the treenodes table. This is a basic adjacency list model table.""" </ins><span class="cx"> </span><del>-"""create the treenodes table. This is ia basic adjacency list model table.""" - -trees = Table('treenodes', engine, </del><ins>+trees = Table('treenodes', metadata, </ins><span class="cx"> Column('node_id', Integer, Sequence('treenode_id_seq',optional=False), primary_key=True), </span><span class="cx"> Column('parent_node_id', Integer, ForeignKey('treenodes.node_id'), nullable=True), </span><span class="cx"> Column('node_name', String(50), nullable=False), </span><span class="cx"> ) </span><span class="cx"> </span><del>- </del><span class="cx"> class NodeList(util.OrderedDict): </span><del>- """extends an Ordered Dictionary, which is just a dictionary that returns its keys and values - in order upon iteration. Adds functionality to automatically associate - the parent of a TreeNode with itself, upon append to the parent's list of child nodes.""" - def __init__(self, parent): - util.OrderedDict.__init__(self) - self.parent = parent </del><span class="cx"> def append(self, node): </span><del>- node.parent = self.parent </del><span class="cx"> self[node.name] = node </span><span class="cx"> def __iter__(self): </span><span class="cx"> return iter(self.values()) </span><span class="cx"> </span><span class="cx"> class TreeNode(object): </span><span class="cx"> """a rich Tree class which includes path-based operations""" </span><del>- def __init__(self, name=None): - self.children = NodeList(self) </del><ins>+ children = NodeList + def __init__(self, name): + self.children = NodeList() </ins><span class="cx"> self.name = name </span><span class="cx"> self.parent = None </span><span class="cx"> self.id = None </span><span class="cx"> self.parent_id = None </span><span class="cx"> def append(self, node): </span><span class="cx"> if isinstance(node, str): </span><del>- self.children.append(TreeNode(node)) - else: - self.children.append(node) </del><ins>+ node = TreeNode(node) + node.parent = self + self.children.append(node) </ins><span class="cx"> def __repr__(self): </span><span class="cx"> return self._getstring(0, False) </span><span class="cx"> def __str__(self): </span><span class="lines">@@ -57,14 +46,11 @@ </span><span class="cx"> def print_nodes(self): </span><span class="cx"> return self._getstring(0, True) </span><span class="cx"> </span><del>-# define the mapper. we will make "convenient" property -# names vs. the more verbose names in the table definition - -assign_mapper(TreeNode, trees, properties=dict( </del><ins>+mapper(TreeNode, trees, properties=dict( </ins><span class="cx"> id=trees.c.node_id, </span><span class="cx"> name=trees.c.node_name, </span><span class="cx"> parent_id=trees.c.parent_node_id, </span><del>- children=relation(TreeNode, private=True), </del><ins>+ children=relation(TreeNode, private=True, backref=backref("parent", foreignkey=trees.c.node_id)), </ins><span class="cx"> )) </span><span class="cx"> </span><span class="cx"> print "\n\n\n----------------------------" </span><span class="lines">@@ -88,10 +74,12 @@ </span><span class="cx"> print node.print_nodes() </span><span class="cx"> </span><span class="cx"> print "\n\n\n----------------------------" </span><del>-print "Committing:" </del><ins>+print "Flushing:" </ins><span class="cx"> print "----------------------------" </span><span class="cx"> </span><del>-objectstore.commit() </del><ins>+session = create_session(echo_uow=True) +session.save(node) +session.flush() </ins><span class="cx"> </span><span class="cx"> print "\n\n\n----------------------------" </span><span class="cx"> print "Tree After Save:" </span><span class="lines">@@ -114,9 +102,9 @@ </span><span class="cx"> print node.print_nodes() </span><span class="cx"> </span><span class="cx"> print "\n\n\n----------------------------" </span><del>-print "Committing:" </del><ins>+print "Flushing:" </ins><span class="cx"> print "----------------------------" </span><del>-objectstore.commit() </del><ins>+session.flush() </ins><span class="cx"> </span><span class="cx"> print "\n\n\n----------------------------" </span><span class="cx"> print "Tree After Save:" </span><span class="lines">@@ -127,12 +115,12 @@ </span><span class="cx"> nodeid = node.id </span><span class="cx"> </span><span class="cx"> print "\n\n\n----------------------------" </span><del>-print "Clearing objectstore, selecting " </del><ins>+print "Clearing session, selecting " </ins><span class="cx"> print "tree new where node_id=%d:" % nodeid </span><span class="cx"> print "----------------------------" </span><span class="cx"> </span><del>-objectstore.clear() -t = TreeNode.mapper.select(TreeNode.c.node_id==nodeid)[0] </del><ins>+session.clear() +t = session.query(TreeNode).select(TreeNode.c.id==nodeid)[0] </ins><span class="cx"> </span><span class="cx"> print "\n\n\n----------------------------" </span><span class="cx"> print "Full Tree:" </span><span class="lines">@@ -141,7 +129,7 @@ </span><span class="cx"> </span><span class="cx"> print "\n\n\n----------------------------" </span><span class="cx"> print "Marking root node as deleted" </span><del>-print "and committing:" </del><ins>+print "and flushing:" </ins><span class="cx"> print "----------------------------" </span><del>-objectstore.delete(t) -objectstore.commit() </del><ins>+session.delete(t) +session.flush() </ins></span></pre></div> <a id="sqlalchemybranchesschemaexamplesbackrefbackref_treepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/examples/backref/backref_tree.py (1486 => 1487)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/examples/backref/backref_tree.py 2006-05-22 17:33:50 UTC (rev 1486) +++ sqlalchemy/branches/schema/examples/backref/backref_tree.py 2006-05-22 19:34:44 UTC (rev 1487) </span><span class="lines">@@ -1,7 +1,6 @@ </span><span class="cx"> from sqlalchemy import * </span><del>-import sqlalchemy.attributes as attributes </del><span class="cx"> </span><del>-engine = create_engine('sqlite://', echo=True) </del><ins>+metadata = BoundMetaData('sqlite:///', echo=True) </ins><span class="cx"> </span><span class="cx"> class Tree(object): </span><span class="cx"> def __init__(self, name='', father=None): </span><span class="lines">@@ -12,27 +11,25 @@ </span><span class="cx"> def __repr__(self): </span><span class="cx"> return self.__str__() </span><span class="cx"> </span><del>-table = Table('tree', engine, </del><ins>+table = Table('tree', metadata, </ins><span class="cx"> Column('id', Integer, primary_key=True), </span><span class="cx"> Column('name', String(64), nullable=False), </span><del>- Column('father_id', Integer, ForeignKey('tree.id'), nullable=True),) </del><ins>+ Column('father_id', Integer, ForeignKey('tree.id'), nullable=True)) +table.create() </ins><span class="cx"> </span><del>-assign_mapper(Tree, table, </del><ins>+mapper(Tree, table, </ins><span class="cx"> properties={ </span><del>- # set up a backref using a string - #'father':relation(Tree, foreignkey=table.c.id,primaryjoin=table.c.father_id==table.c.id, backref='childs')}, - - # or set up using the backref() function, which allows arguments to be passed - 'childs':relation(Tree, foreignkey=table.c.father_id, primaryjoin=table.c.father_id==table.c.id, backref=backref('father', uselist=False, foreignkey=table.c.id))}, </del><ins>+ 'childs':relation(Tree, foreignkey=table.c.father_id, primaryjoin=table.c.father_id==table.c.id, backref=backref('father', uselist=False, foreignkey=table.c.id))}, </ins><span class="cx"> ) </span><span class="cx"> </span><del>-table.create() </del><span class="cx"> root = Tree('root') </span><span class="cx"> child1 = Tree('child1', root) </span><span class="cx"> child2 = Tree('child2', root) </span><span class="cx"> child3 = Tree('child3', child1) </span><span class="cx"> </span><del>-objectstore.commit() </del><ins>+session = create_session() +session.save(root) +session.flush() </ins><span class="cx"> </span><span class="cx"> print root.childs </span><span class="cx"> print child1.childs </span></span></pre></div> <a id="sqlalchemybranchesschemalibsqlalchemyormdependencypy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/orm/dependency.py (1486 => 1487)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/orm/dependency.py 2006-05-22 17:33:50 UTC (rev 1486) +++ sqlalchemy/branches/schema/lib/sqlalchemy/orm/dependency.py 2006-05-22 19:34:44 UTC (rev 1487) </span><span class="lines">@@ -105,6 +105,8 @@ </span><span class="cx"> raise AssertionError(" no foreign key ?") </span><span class="cx"> </span><span class="cx"> def get_object_dependencies(self, obj, uowcommit, passive = True): </span><ins>+ """returns the list of objects that are dependent on the given object, as according to the relationship + this dependency processor represents""" </ins><span class="cx"> return uowcommit.uow.attributes.get_history(obj, self.key, passive = passive) </span><span class="cx"> </span><span class="cx"> def whose_dependent_on_who(self, obj1, obj2): </span><span class="lines">@@ -120,19 +122,21 @@ </span><span class="cx"> return (obj2, obj1) </span><span class="cx"> </span><span class="cx"> def process_dependencies(self, task, deplist, uowcommit, delete = False): </span><del>- """this method is called during a commit operation to synchronize data between a parent and child object. - it also can establish child or parent objects within the unit of work as "to be saved" or "deleted" - in some cases.""" </del><ins>+ """this method is called during a flush operation to synchronize data between a parent and child object. + it is called within the context of the various mappers and sometimes individual objects sorted according to their + insert/update/delete order (topological sort).""" </ins><span class="cx"> #print self.mapper.table.name + " " + self.key + " " + repr(len(deplist)) + " process_dep isdelete " + repr(delete) + " direction " + repr(self.direction) </span><span class="cx"> </span><span class="cx"> def getlist(obj, passive=True): </span><span class="cx"> return self.get_object_dependencies(obj, uowcommit, passive) </span><span class="cx"> </span><del>- connection = uowcommit.transaction.connection(self.mapper) - </del><span class="cx"> # plugin point </span><span class="cx"> </span><ins>+ # TODO: process_dependencies has been refactored into two methods, process_dependencies and preprocess_dependencies. + # cleanup is still required to hone the method down to its minimal amount of code. + </ins><span class="cx"> if self.direction == MANYTOMANY: </span><ins>+ connection = uowcommit.transaction.connection(self.mapper) </ins><span class="cx"> secondary_delete = [] </span><span class="cx"> secondary_insert = [] </span><span class="cx"> if delete: </span><span class="lines">@@ -164,11 +168,7 @@ </span><span class="cx"> connection.execute(statement, secondary_insert) </span><span class="cx"> elif self.direction == MANYTOONE and delete: </span><span class="cx"> if self.cascade.delete_orphan: </span><del>- for obj in deplist: - childlist = getlist(obj, False) - for child in childlist.deleted_items() + childlist.unchanged_items(): - if child is not None and childlist.hasparent(child) is False: - uowcommit.register_object(child, isdelete=True) </del><ins>+ pass </ins><span class="cx"> elif self.post_update: </span><span class="cx"> # post_update means we have to update our row to not reference the child object </span><span class="cx"> # before we can DELETE the row </span><span class="lines">@@ -179,25 +179,20 @@ </span><span class="cx"> # head object is being deleted, and we manage its list of child objects </span><span class="cx"> # the child objects have to have their foreign key to the parent set to NULL </span><span class="cx"> if self.cascade.delete_orphan and not self.post_update: </span><del>- for obj in deplist: - childlist = getlist(obj, False) - for child in childlist.deleted_items(): - if child is not None and childlist.hasparent(child) is False: - uowcommit.register_object(child, isdelete=True) - for child in childlist.unchanged_items(): - if child is not None: - uowcommit.register_object(child, isdelete=True) </del><ins>+ pass </ins><span class="cx"> else: </span><span class="cx"> for obj in deplist: </span><span class="cx"> childlist = getlist(obj, False) </span><span class="cx"> for child in childlist.deleted_items(): </span><span class="cx"> if child is not None and childlist.hasparent(child) is False: </span><span class="cx"> self._synchronize(obj, child, None, True) </span><del>- uowcommit.register_object(child, postupdate=self.post_update) </del><ins>+ if self.post_update: + uowcommit.register_object(child, postupdate=True) </ins><span class="cx"> for child in childlist.unchanged_items(): </span><span class="cx"> if child is not None: </span><span class="cx"> self._synchronize(obj, child, None, True) </span><del>- uowcommit.register_object(child, postupdate=self.post_update) </del><ins>+ if self.post_update: + uowcommit.register_object(child, postupdate=True) </ins><span class="cx"> elif self.association is not None: </span><span class="cx"> # manage association objects. </span><span class="cx"> for obj in deplist: </span><span class="lines">@@ -240,21 +235,86 @@ </span><span class="cx"> if childlist is not None: </span><span class="cx"> for child in childlist.added_items(): </span><span class="cx"> self._synchronize(obj, child, None, False) </span><ins>+ if self.direction == ONETOMANY and child is not None and self.post_update: + uowcommit.register_object(child, postupdate=True) + if self.direction == MANYTOONE: + if self.post_update: + uowcommit.register_object(obj, postupdate=True) + else: + for child in childlist.deleted_items(): + if not self.cascade.delete_orphan: + self._synchronize(obj, child, None, True) + + def preprocess_dependencies(self, task, deplist, uowcommit, delete = False): + """used before the flushes' topological sort to traverse through related objects and insure every + instance which will require save/update/delete is properly added to the UOWTransaction.""" + #print self.mapper.table.name + " " + self.key + " " + repr(len(deplist)) + " process_dep isdelete " + repr(delete) + " direction " + repr(self.direction) + + # TODO: post_update instructions should be established in this step as well + # (and executed in the regular traversal) + if self.post_update: + return + + # TODO: this method is the product of splitting process_dependencies into two methods. + # cleanup is still required to hone the method down to its minimal amount of code. + + def getlist(obj, passive=True): + return self.get_object_dependencies(obj, uowcommit, passive) + + if self.direction == MANYTOMANY: + pass + elif self.direction == MANYTOONE and delete: + if self.cascade.delete_orphan: + for obj in deplist: + childlist = getlist(obj, False) + for child in childlist.deleted_items() + childlist.unchanged_items(): + if child is not None and childlist.hasparent(child) is False: + uowcommit.register_object(child, isdelete=True) + elif self.direction == ONETOMANY and delete: + # head object is being deleted, and we manage its list of child objects + # the child objects have to have their foreign key to the parent set to NULL + if self.cascade.delete_orphan and not self.post_update: + for obj in deplist: + childlist = getlist(obj, False) + for child in childlist.deleted_items(): + if child is not None and childlist.hasparent(child) is False: + uowcommit.register_object(child, isdelete=True) + for child in childlist.unchanged_items(): + if child is not None: + uowcommit.register_object(child, isdelete=True) + else: + for obj in deplist: + childlist = getlist(obj, False) + for child in childlist.deleted_items(): + if child is not None and childlist.hasparent(child) is False: + uowcommit.register_object(child) + for child in childlist.unchanged_items(): + if child is not None: + uowcommit.register_object(child) + elif self.association is not None: + # TODO: clean up the association step in process_dependencies and move the + # appropriate sections of it to here + pass + else: + for obj in deplist: + childlist = getlist(obj, passive=True) + if childlist is not None: + for child in childlist.added_items(): </ins><span class="cx"> if self.direction == ONETOMANY and child is not None: </span><del>- uowcommit.register_object(child, postupdate=self.post_update) </del><ins>+ uowcommit.register_object(child) </ins><span class="cx"> if self.direction == MANYTOONE: </span><del>- uowcommit.register_object(obj, postupdate=self.post_update) </del><ins>+ uowcommit.register_object(obj) </ins><span class="cx"> else: </span><span class="cx"> for child in childlist.deleted_items(): </span><span class="cx"> if not self.cascade.delete_orphan: </span><del>- self._synchronize(obj, child, None, True) </del><span class="cx"> uowcommit.register_object(child, isdelete=False) </span><span class="cx"> elif childlist.hasparent(child) is False: </span><span class="cx"> uowcommit.register_object(child, isdelete=True) </span><span class="cx"> </span><ins>+ </ins><span class="cx"> def _synchronize(self, obj, child, associationrow, clearkeys): </span><del>- """called during a commit to execute the full list of syncrules on the - given object/child/optional association row""" </del><ins>+ """called during a flush to synchronize primary key identifier values between a parent/child object, as well as + to an associationrow in the case of many-to-many.""" </ins><span class="cx"> if self.direction == ONETOMANY: </span><span class="cx"> source = obj </span><span class="cx"> dest = child </span></span></pre></div> <a id="sqlalchemybranchesschemalibsqlalchemyormunitofworkpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/schema/lib/sqlalchemy/orm/unitofwork.py (1486 => 1487)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/schema/lib/sqlalchemy/orm/unitofwork.py 2006-05-22 17:33:50 UTC (rev 1486) +++ sqlalchemy/branches/schema/lib/sqlalchemy/orm/unitofwork.py 2006-05-22 19:34:44 UTC (rev 1487) </span><span class="lines">@@ -269,6 +269,7 @@ </span><span class="cx"> self.dependencies = {} </span><span class="cx"> self.tasks = {} </span><span class="cx"> self.__modified = False </span><ins>+ self._is_executing = False </ins><span class="cx"> </span><span class="cx"> def register_object(self, obj, isdelete = False, listonly = False, postupdate=False, **kwargs): </span><span class="cx"> """adds an object to this UOWTransaction to be updated in the database. </span><span class="lines">@@ -298,7 +299,7 @@ </span><span class="cx"> # can put an assertion here to make sure.... </span><span class="cx"> if task.circular: </span><span class="cx"> return </span><del>- </del><ins>+ </ins><span class="cx"> mod = task.append(obj, listonly, isdelete=isdelete, **kwargs) </span><span class="cx"> self.__modified = self.__modified or mod </span><span class="cx"> </span><span class="lines">@@ -341,13 +342,17 @@ </span><span class="cx"> mapperfrom = mapperfrom._primary_mapper() </span><span class="cx"> task = self.get_task_by_mapper(mapper) </span><span class="cx"> targettask = self.get_task_by_mapper(mapperfrom) </span><del>- task.dependencies.append(UOWDependencyProcessor(processor, targettask, isdeletefrom)) </del><ins>+ up = UOWDependencyProcessor(processor, targettask, isdeletefrom) + task.dependencies.append(up) + up.preexecute(self) </ins><span class="cx"> self.__modified = True </span><span class="cx"> </span><span class="cx"> def execute(self, echo=False): </span><span class="cx"> for task in self.tasks.values(): </span><span class="cx"> task.mapper.register_dependencies(self) </span><span class="cx"> </span><ins>+ self._is_executing = True + </ins><span class="cx"> head = self._sort_dependencies() </span><span class="cx"> self.__modified = False </span><span class="cx"> if LOG or echo: </span><span class="lines">@@ -357,6 +362,8 @@ </span><span class="cx"> print "Task dump:\n" + head.dump() </span><span class="cx"> if head is not None: </span><span class="cx"> head.execute(self) </span><ins>+ #if self.__modified and head is not None: + # raise "Assertion failed ! new pre-execute dependency step should eliminate post-execute changes (except post_update stuff)." </ins><span class="cx"> if LOG or echo: </span><span class="cx"> if self.__modified and head is not None: </span><span class="cx"> print "\nAfter Execute:\n" + head.dump() </span><span class="lines">@@ -425,11 +432,17 @@ </span><span class="cx"> self.targettask = targettask </span><span class="cx"> self.isdeletefrom = isdeletefrom </span><span class="cx"> </span><del>- def execute(self, trans, delete): - if not delete: - self.processor.process_dependencies(self.targettask, [elem.obj for elem in self.targettask.tosave_elements() if elem.obj is not None], trans, delete = delete) </del><ins>+ def preexecute(self, trans): + if not self.isdeletefrom: + self.processor.preprocess_dependencies(self.targettask, [elem.obj for elem in self.targettask.tosave_elements() if elem.obj is not None], trans, delete=self.isdeletefrom) </ins><span class="cx"> else: </span><del>- self.processor.process_dependencies(self.targettask, [elem.obj for elem in self.targettask.todelete_elements() if elem.obj is not None], trans, delete = delete) </del><ins>+ self.processor.preprocess_dependencies(self.targettask, [elem.obj for elem in self.targettask.todelete_elements() if elem.obj is not None], trans, delete=self.isdeletefrom) + + def execute(self, trans): + if not self.isdeletefrom: + self.processor.process_dependencies(self.targettask, [elem.obj for elem in self.targettask.tosave_elements() if elem.obj is not None], trans, delete=self.isdeletefrom) + else: + self.processor.process_dependencies(self.targettask, [elem.obj for elem in self.targettask.todelete_elements() if elem.obj is not None], trans, delete=self.isdeletefrom) </ins><span class="cx"> </span><span class="cx"> def get_object_dependencies(self, obj, trans, passive): </span><span class="cx"> return self.processor.get_object_dependencies(obj, trans, passive=passive) </span><span class="lines">@@ -497,16 +510,16 @@ </span><span class="cx"> </span><span class="cx"> self.mapper.save_obj(self.tosave_objects(), trans) </span><span class="cx"> for dep in self.cyclical_save_dependencies(): </span><del>- dep.execute(trans, delete=False) </del><ins>+ dep.execute(trans) </ins><span class="cx"> for element in self.tosave_elements(): </span><span class="cx"> for task in element.childtasks: </span><span class="cx"> task.execute(trans) </span><span class="cx"> for dep in self.save_dependencies(): </span><del>- dep.execute(trans, delete=False) </del><ins>+ dep.execute(trans) </ins><span class="cx"> for dep in self.delete_dependencies(): </span><del>- dep.execute(trans, delete=True) </del><ins>+ dep.execute(trans) </ins><span class="cx"> for dep in self.cyclical_delete_dependencies(): </span><del>- dep.execute(trans, delete=True) </del><ins>+ dep.execute(trans) </ins><span class="cx"> for child in self.childtasks: </span><span class="cx"> child.execute(trans) </span><span class="cx"> for element in self.todelete_elements(): </span><span class="lines">@@ -550,14 +563,18 @@ </span><span class="cx"> cycles = Set(cycles) </span><span class="cx"> </span><span class="cx"> #print "BEGIN CIRC SORT-------" </span><ins>+ #print "PRE-CIRC:" + #print list(cycles)[0].dump() + </ins><span class="cx"> # dependency processors that arent part of the cyclical thing </span><span class="cx"> # get put here </span><span class="cx"> extradeplist = [] </span><span class="cx"> </span><span class="cx"> object_to_original_task = {} </span><span class="cx"> </span><del>- # this creates a map of UOWTasks mapped to a particular object - # and a particular dependency processor. </del><ins>+ # organizes a set of new UOWTasks that will be assembled into + # the final tree, for the purposes of holding new UOWDependencyProcessors + # which process small sub-sections of dependent parent/child operations </ins><span class="cx"> dependencies = {} </span><span class="cx"> def get_dependency_task(obj, depprocessor): </span><span class="cx"> try: </span><span class="lines">@@ -572,9 +589,7 @@ </span><span class="cx"> dp[depprocessor] = l </span><span class="cx"> return l </span><span class="cx"> </span><del>- # work out a list of all the "dependency processors" that - # represent objects that have to be dependency sorted at the - # per-object level. </del><ins>+ # organize all original UOWDependencyProcessors by their target task </ins><span class="cx"> deps_by_targettask = {} </span><span class="cx"> for task in cycles: </span><span class="cx"> for dep in task.dependencies: </span><span class="lines">@@ -605,6 +620,7 @@ </span><span class="cx"> childtask = trans.get_task_by_mapper(processor.mapper) </span><span class="cx"> # is this dependency involved in one of the cycles ? </span><span class="cx"> cyclicaldep = dep.targettask in cycles and trans.get_task_by_mapper(dep.processor.mapper) in cycles </span><ins>+ </ins><span class="cx"> if isdelete: </span><span class="cx"> childlist = childlist.unchanged_items() + childlist.deleted_items() </span><span class="cx"> else: </span><span class="lines">@@ -614,26 +630,20 @@ </span><span class="cx"> if o is None: </span><span class="cx"> continue </span><span class="cx"> if not o in childtask.objects: </span><del>- # item needs to be saved since its added, or attached to a deleted object - if isdelete: - childtask.append(o, processor.cascade.delete) - if cyclicaldep: - object_to_original_task[o] = task - if not cyclicaldep: - # not cyclical, so we are done with this - continue - # cyclical, so create an ordered pair for the dependency sort - whosdep = dep.whose_dependent_on_who(obj, o) - if whosdep is not None: - tuples.append(whosdep) - # create a UOWDependencyProcessor representing this pair of objects. - # append it to a UOWTask - if whosdep[0] is obj: - get_dependency_task(obj, dep).append(whosdep[0], isdelete=isdelete) </del><ins>+ object_to_original_task[o] = childtask + if cyclicaldep: + # cyclical, so create an ordered pair for the dependency sort + whosdep = dep.whose_dependent_on_who(obj, o) + if whosdep is not None: + tuples.append(whosdep) + # create a UOWDependencyProcessor representing this pair of objects. + # append it to a UOWTask + if whosdep[0] is obj: + get_dependency_task(obj, dep).append(whosdep[0], isdelete=isdelete) + else: + get_dependency_task(obj, dep).append(whosdep[1], isdelete=isdelete) </ins><span class="cx"> else: </span><del>- get_dependency_task(obj, dep).append(whosdep[1], isdelete=isdelete) - else: - get_dependency_task(obj, dep).append(obj, isdelete=isdelete) </del><ins>+ get_dependency_task(obj, dep).append(obj, isdelete=isdelete) </ins><span class="cx"> </span><span class="cx"> head = DependencySorter(tuples, allobjects).sort() </span><span class="cx"> if head is None: </span></span></pre> </div> </div> </body> </html> |
