[Sqlalchemy-commits] [1177] sqlalchemy/trunk/lib/sqlalchemy: a few changes to attributes.py to allow
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1177] sqlalchemy/trunk/lib/sqlalchemy: a few changes to attributes.py to allow faster initialization of object attributes on new objects
|
From: <co...@sq...> - 2006-03-21 04:39:15
|
<!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>[1177] sqlalchemy/trunk/lib/sqlalchemy: a few changes to attributes.py to allow faster initialization of object attributes on new objects</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1177</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-03-20 22:38:54 -0600 (Mon, 20 Mar 2006)</dd> </dl> <h3>Log Message</h3> <pre>a few changes to attributes.py to allow faster initialization of object attributes on new objects</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemyattributespy">sqlalchemy/trunk/lib/sqlalchemy/attributes.py</a></li> <li><a href="#sqlalchemytrunklibsqlalchemymappingmapperpy">sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py</a></li> <li><a href="#sqlalchemytrunklibsqlalchemymappingpropertiespy">sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemyattributespy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/attributes.py (1176 => 1177)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/attributes.py 2006-03-21 02:43:58 UTC (rev 1176) +++ sqlalchemy/trunk/lib/sqlalchemy/attributes.py 2006-03-21 04:38:54 UTC (rev 1177) </span><span class="lines">@@ -72,6 +72,8 @@ </span><span class="cx"> self.key = key </span><span class="cx"> self.orig = PropHistory.NONE </span><span class="cx"> self.extension = extension </span><ins>+ def plain_init(self, *args): + pass </ins><span class="cx"> def gethistory(self, *args, **kwargs): </span><span class="cx"> return self </span><span class="cx"> def clear(self): </span><span class="lines">@@ -152,7 +154,8 @@ </span><span class="cx"> obj.__dict__[key] = [] </span><span class="cx"> </span><span class="cx"> util.HistoryArraySet.__init__(self, list_, readonly=kwargs.get('readonly', False)) </span><del>- </del><ins>+ def plain_init(self, *args): + pass </ins><span class="cx"> def gethistory(self, *args, **kwargs): </span><span class="cx"> return self </span><span class="cx"> def list_value_changed(self, obj, key, item, listval, isdelete): </span><span class="lines">@@ -194,6 +197,14 @@ </span><span class="cx"> self.live = live </span><span class="cx"> self.kwargs = kwargs </span><span class="cx"> </span><ins>+ def plain_init(self, attrhist): + if not self.uselist: + p = PropHistory(self.obj, self.key, **self.kwargs) + self.obj.__dict__[self.key] = None + else: + p = self.manager.create_list(self.obj, self.key, None, readonly=self.live, **self.kwargs) + attrhist[self.key] = p + </ins><span class="cx"> def gethistory(self, passive=False, *args, **kwargs): </span><span class="cx"> if not self.uselist: </span><span class="cx"> if self.obj.__dict__.get(self.key, None) is None: </span><span class="lines">@@ -337,12 +348,21 @@ </span><span class="cx"> self.attribute_history(obj)[key] = p </span><span class="cx"> return p </span><span class="cx"> </span><ins>+ def init_attr(self, obj): + """sets up the _managed_attributes dictionary on an object. this happens anyway regardless + of this method being called, but saves on KeyErrors being thrown in get_history().""" + d = {} + obj.__dict__['_managed_attributes'] = d + cls_managed = self.class_managed(obj.__class__) + for value in cls_managed.values(): + value(obj, d).plain_init(d) + </ins><span class="cx"> def get_history(self, obj, key, passive=False, **kwargs): </span><span class="cx"> """returns the "history" container for the given attribute on the given object. </span><span class="cx"> If the container does not exist, it will be created based on the class-level </span><span class="cx"> history container definition.""" </span><span class="cx"> try: </span><del>- return self.attribute_history(obj)[key].gethistory(passive=passive, **kwargs) </del><ins>+ return obj.__dict__['_managed_attributes'][key].gethistory(passive=passive, **kwargs) </ins><span class="cx"> except KeyError, e: </span><span class="cx"> return self.class_managed(obj.__class__)[key](obj, **kwargs).gethistory(passive=passive, **kwargs) </span><span class="cx"> </span><span class="lines">@@ -351,14 +371,14 @@ </span><span class="cx"> this dictionary is attached to the object via the attribute '_managed_attributes'. </span><span class="cx"> If the dictionary does not exist, it will be created.""" </span><span class="cx"> try: </span><del>- attr = obj.__dict__['_managed_attributes'] </del><ins>+ return obj.__dict__['_managed_attributes'] </ins><span class="cx"> except KeyError: </span><span class="cx"> trigger = obj.__dict__.pop('_managed_trigger', None) </span><span class="cx"> if trigger: </span><span class="cx"> trigger() </span><span class="cx"> attr = {} </span><span class="cx"> obj.__dict__['_managed_attributes'] = attr </span><del>- return attr </del><ins>+ return attr </ins><span class="cx"> </span><span class="cx"> def trigger_history(self, obj, callable): </span><span class="cx"> try: </span><span class="lines">@@ -424,13 +444,15 @@ </span><span class="cx"> the new object instance as an argument to create the new history container. </span><span class="cx"> Extra keyword arguments can be sent which </span><span class="cx"> will be passed along to newly created history containers.""" </span><del>- def createprop(obj): </del><ins>+ def createprop(obj, attrhist=None): </ins><span class="cx"> if callable_ is not None: </span><span class="cx"> func = callable_(obj) </span><span class="cx"> else: </span><span class="cx"> func = None </span><span class="cx"> p = self.create_history_container(obj, key, uselist, callable_=func, **kwargs) </span><del>- self.attribute_history(obj)[key] = p </del><ins>+ if attrhist is None: + attrhist = self.attribute_history(obj) + attrhist[key] = p </ins><span class="cx"> return p </span><span class="cx"> </span><span class="cx"> self.class_managed(class_)[key] = createprop </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemymappingmapperpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py (1176 => 1177)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py 2006-03-21 02:43:58 UTC (rev 1176) +++ sqlalchemy/trunk/lib/sqlalchemy/mapping/mapper.py 2006-03-21 04:38:54 UTC (rev 1177) </span><span class="lines">@@ -239,6 +239,10 @@ </span><span class="cx"> if not self.class_.__dict__.has_key('_mapper'): </span><span class="cx"> oldinit = self.class_.__init__ </span><span class="cx"> def init(self, *args, **kwargs): </span><ins>+ # this gets the AttributeManager to do some pre-initialization, + # in order to save on KeyErrors later on + objectstore.global_attributes.init_attr(self) + </ins><span class="cx"> nohist = kwargs.pop('_mapper_nohistory', False) </span><span class="cx"> session = kwargs.pop('_sa_session', objectstore.get_session()) </span><span class="cx"> if not nohist: </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemymappingpropertiespy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py (1176 => 1177)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py 2006-03-21 02:43:58 UTC (rev 1176) +++ sqlalchemy/trunk/lib/sqlalchemy/mapping/properties.py 2006-03-21 04:38:54 UTC (rev 1177) </span><span class="lines">@@ -714,6 +714,9 @@ </span><span class="cx"> #print "new eagertqarget", p.eagertarget.name, (p.secondary and p.secondary.name or "none"), p.parent.table.name </span><span class="cx"> finally: </span><span class="cx"> del recursion_stack[self.parent.table] </span><ins>+ + self._row_decorator = self._create_decorator_row() + </ins><span class="cx"> self._eager_chained = True </span><span class="cx"> </span><span class="cx"> def _aliasize_orderby(self, orderby, copy=True): </span><span class="lines">@@ -758,7 +761,6 @@ </span><span class="cx"> for key, value in self.mapper.props.iteritems(): </span><span class="cx"> value.setup(key, statement, eagertable=self.eagertarget) </span><span class="cx"> </span><del>- self._decorator_row = self._create_decorator_row() </del><span class="cx"> </span><span class="cx"> def execute(self, instance, row, identitykey, imap, isnew): </span><span class="cx"> """receive a row. tell our mapper to look for a new object instance in the row, and attach </span><span class="lines">@@ -809,7 +811,7 @@ </span><span class="cx"> # (neither do any MapperExtensions). The row is keyed off the Column object </span><span class="cx"> # (which is what mappers use) as well as its "label" (which might be what </span><span class="cx"> # user-defined code is using) </span><del>- row = self._decorator_row(row) </del><ins>+ row = self._row_decorator(row) </ins><span class="cx"> return self.mapper._instance(row, imap, result_list) </span><span class="cx"> </span><span class="cx"> class GenericOption(MapperOption): </span></span></pre> </div> </div> </body> </html> |
