[Sqlalchemy-commits] [1669] sqlalchemy/trunk: fixes to pool_invalidate [ticket:224]
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1669] sqlalchemy/trunk: fixes to pool_invalidate [ticket:224]
|
From: <co...@sq...> - 2006-06-27 23:56:26
|
<!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>[1669] sqlalchemy/trunk: fixes to pool_invalidate [ticket:224]</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1669</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-06-27 18:56:14 -0500 (Tue, 27 Jun 2006)</dd> </dl> <h3>Log Message</h3> <pre>fixes to pool_invalidate [ticket:224]</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunkCHANGES">sqlalchemy/trunk/CHANGES</a></li> <li><a href="#sqlalchemytrunklibsqlalchemypoolpy">sqlalchemy/trunk/lib/sqlalchemy/pool.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunkCHANGES"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/CHANGES (1668 => 1669)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/CHANGES 2006-06-27 22:24:39 UTC (rev 1668) +++ sqlalchemy/trunk/CHANGES 2006-06-27 23:56:14 UTC (rev 1669) </span><span class="lines">@@ -34,6 +34,7 @@ </span><span class="cx"> - new MySQL types: MSEnum, MSTinyText, MSMediumText, MSLongText, etc. </span><span class="cx"> more support for MS-specific length/precision params in numeric types </span><span class="cx"> patch courtesy Mike Bernson </span><ins>+- some fixes to connection pool invalidate() [ticket:224] </ins><span class="cx"> </span><span class="cx"> 0.2.3 </span><span class="cx"> - overhaul to mapper compilation to be deferred. this allows mappers </span></span></pre></div> <a id="sqlalchemytrunklibsqlalchemypoolpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/pool.py (1668 => 1669)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/pool.py 2006-06-27 22:24:39 UTC (rev 1668) +++ sqlalchemy/trunk/lib/sqlalchemy/pool.py 2006-06-27 23:56:14 UTC (rev 1669) </span><span class="lines">@@ -91,20 +91,24 @@ </span><span class="cx"> self._threadconns[thread.get_ident()] = agent </span><span class="cx"> return agent </span><span class="cx"> </span><del>- def return_conn(self, agent): </del><ins>+ def _purge_for_threadlocal(self): </ins><span class="cx"> if self._use_threadlocal: </span><span class="cx"> try: </span><span class="cx"> del self._threadconns[thread.get_ident()] </span><span class="cx"> except KeyError: </span><span class="cx"> pass </span><ins>+ + def return_conn(self, agent): + self._purge_for_threadlocal() </ins><span class="cx"> self.do_return_conn(agent.connection) </span><ins>+ + def return_invalid(self): + self._purge_for_threadlocal() + self.do_return_invalid() </ins><span class="cx"> </span><span class="cx"> def get(self): </span><span class="cx"> return self.do_get() </span><span class="cx"> </span><del>- def return_invalid(self): - self.do_return_invalid() - </del><span class="cx"> def do_get(self): </span><span class="cx"> raise NotImplementedError() </span><span class="cx"> </span><span class="lines">@@ -138,7 +142,6 @@ </span><span class="cx"> def invalidate(self): </span><span class="cx"> if self.pool.echo: </span><span class="cx"> self.pool.log("Invalidate connection %s" % repr(self.connection)) </span><del>- self.connection.rollback() </del><span class="cx"> self.connection = None </span><span class="cx"> self.pool.return_invalid() </span><span class="cx"> def cursor(self, *args, **kwargs): </span><span class="lines">@@ -220,8 +223,7 @@ </span><span class="cx"> self._overflow -= 1 </span><span class="cx"> </span><span class="cx"> def do_return_invalid(self): </span><del>- if self._pool.full(): - self._overflow -= 1 </del><ins>+ self._overflow -= 1 </ins><span class="cx"> </span><span class="cx"> def do_get(self): </span><span class="cx"> try: </span></span></pre> </div> </div> </body> </html> |