[Sqlalchemy-commits] [1345] sqlalchemy/trunk/test: the latest and greatest method to keep attributes
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1345] sqlalchemy/trunk/test: the latest and greatest method to keep attributes from growing
|
From: <co...@sq...> - 2006-04-27 23:56:22
|
<!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>[1345] sqlalchemy/trunk/test: the latest and greatest method to keep attributes from growing</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1345</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-04-27 18:56:09 -0500 (Thu, 27 Apr 2006)</dd> </dl> <h3>Log Message</h3> <pre>the latest and greatest method to keep attributes from growing</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemyattributespy">sqlalchemy/trunk/lib/sqlalchemy/attributes.py</a></li> <li><a href="#sqlalchemytrunktestattributespy">sqlalchemy/trunk/test/attributes.py</a></li> <li><a href="#sqlalchemytrunktestmassloadpy">sqlalchemy/trunk/test/massload.py</a></li> </ul> <h3>Added Paths</h3> <ul> <li><a href="#sqlalchemytrunktestmasscreate2py">sqlalchemy/trunk/test/masscreate2.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 (1344 => 1345)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/attributes.py 2006-04-26 21:43:33 UTC (rev 1344) +++ sqlalchemy/trunk/lib/sqlalchemy/attributes.py 2006-04-27 23:56:09 UTC (rev 1345) </span><span class="lines">@@ -79,8 +79,12 @@ </span><span class="cx"> ManagedAttribute objects associated with the instance via this dictionary.""" </span><span class="cx"> def __init__(self, obj, key): </span><span class="cx"> self.__obj = weakref.ref(obj) </span><del>- #self.obj = obj </del><span class="cx"> self.key = key </span><ins>+ def __getstate__(self): + return {'key':self.key, 'obj':self.obj} + def __setstate__(self, d): + self.key = d['key'] + self.__obj = weakref.ref(d['obj']) </ins><span class="cx"> obj = property(lambda s:s.__obj()) </span><span class="cx"> def history(self, **kwargs): </span><span class="cx"> return self </span><span class="lines">@@ -496,25 +500,4 @@ </span><span class="cx"> will be passed along to newly created ManagedAttribute.""" </span><span class="cx"> if not hasattr(class_, '_attribute_manager'): </span><span class="cx"> class_._attribute_manager = self </span><del>- class_._managed_attributes = ObjectAttributeGateway() </del><span class="cx"> setattr(class_, key, self.create_prop(class_, key, uselist, callable_, **kwargs)) </span><del>- -managed_attributes = weakref.WeakKeyDictionary() - -class ObjectAttributeGateway(object): - """handles the dictionary of ManagedAttributes for instances. this level of indirection - is to prevent circular references upon objects, as well as keeping them Pickle-compatible.""" - def __set__(self, obj, value): - managed_attributes[obj] = value - def __delete__(self, obj): - try: - del managed_attributes[obj] - except KeyError: - raise AttributeError() - def __get__(self, obj, owner): - if obj is None: - return self - try: - return managed_attributes[obj] - except KeyError: - raise AttributeError() </del><span class="cx">\ No newline at end of file </span></span></pre></div> <a id="sqlalchemytrunktestattributespy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/attributes.py (1344 => 1345)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/attributes.py 2006-04-26 21:43:33 UTC (rev 1344) +++ sqlalchemy/trunk/test/attributes.py 2006-04-27 23:56:09 UTC (rev 1345) </span><span class="lines">@@ -45,7 +45,8 @@ </span><span class="cx"> manager.register_attribute(MyTest, 'email_address', uselist = False) </span><span class="cx"> x = MyTest() </span><span class="cx"> x.user_id=7 </span><del>- pickle.dumps(x) </del><ins>+ s = pickle.dumps(x) + y = pickle.loads(s) </ins><span class="cx"> </span><span class="cx"> def testlist(self): </span><span class="cx"> class User(object):pass </span></span></pre></div> <a id="sqlalchemytrunktestmasscreate2py"></a> <div class="addfile"><h4>Added: sqlalchemy/trunk/test/masscreate2.py (1344 => 1345)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/masscreate2.py 2006-04-26 21:43:33 UTC (rev 1344) +++ sqlalchemy/trunk/test/masscreate2.py 2006-04-27 23:56:09 UTC (rev 1345) </span><span class="lines">@@ -0,0 +1,36 @@ </span><ins>+import gc + +import random, string + +from sqlalchemy.attributes import * + +# with this test, run top. make sure the Python process doenst grow in size arbitrarily. + +class User(object): + pass + +class Address(object): + pass + +attr_manager = AttributeManager() +attr_manager.register_attribute(User, 'id', uselist=False) +attr_manager.register_attribute(User, 'name', uselist=False) +attr_manager.register_attribute(User, 'addresses', uselist=True) +attr_manager.register_attribute(Address, 'email', uselist=False) +attr_manager.register_attribute(Address, 'user', uselist=False) + + +for i in xrange(1000): + for j in xrange(1000): + u = User() + u.name = str(random.randint(0, 100000000)) + for k in xrange(10): + a = Address() + a.email_address = str(random.randint(0, 100000000)) + u.addresses.append(a) + a.user = u + print "clearing" + #managed_attributes.clear() + gc.collect() + + </ins></span></pre></div> <a id="sqlalchemytrunktestmassloadpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/massload.py (1344 => 1345)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/massload.py 2006-04-26 21:43:33 UTC (rev 1344) +++ sqlalchemy/trunk/test/massload.py 2006-04-27 23:56:09 UTC (rev 1345) </span><span class="lines">@@ -56,7 +56,7 @@ </span><span class="cx"> a.value = 'changed...' </span><span class="cx"> assert len(objectstore.get_session().dirty) == len(l) </span><span class="cx"> assert len(objectstore.get_session().identity_map) == len(l) </span><del>- assert len(attributes.managed_attributes) == len(l) </del><ins>+ #assert len(attributes.managed_attributes) == len(l) </ins><span class="cx"> print len(objectstore.get_session().dirty) </span><span class="cx"> print len(objectstore.get_session().identity_map) </span><span class="cx"> objectstore.expunge(*l) </span></span></pre> </div> </div> </body> </html> |
