[Sqlalchemy-commits] [1148] sqlalchemy/trunk/test: reorganized SingletonThreadPool to return distinc
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [1148] sqlalchemy/trunk/test: reorganized SingletonThreadPool to return distinct connections in the same thread; use_threadlocal behavior is now switchable
<!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>[1148] sqlalchemy/trunk/test: reorganized SingletonThreadPool to return distinct connections in the same thread; use_threadlocal behavior is now switchable</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1148</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2006-03-16 13:09:53 -0600 (Thu, 16 Mar 2006)</dd> </dl> <h3>Log Message</h3> <pre>reorganized SingletonThreadPool to return distinct connections in the same thread; use_threadlocal behavior is now switchable</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemytrunklibsqlalchemypoolpy">sqlalchemy/trunk/lib/sqlalchemy/pool.py</a></li> <li><a href="#sqlalchemytrunktestpoolpy">sqlalchemy/trunk/test/pool.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemytrunklibsqlalchemypoolpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/lib/sqlalchemy/pool.py (1147 => 1148)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/lib/sqlalchemy/pool.py 2006-03-16 19:08:35 UTC (rev 1147) +++ sqlalchemy/trunk/lib/sqlalchemy/pool.py 2006-03-16 19:09:53 UTC (rev 1148) </span><span class="lines">@@ -120,7 +120,7 @@ </span><span class="cx"> raise NotImplementedError() </span><span class="cx"> </span><span class="cx"> def log(self, msg): </span><del>- self.logger.write(msg) </del><ins>+ self._logger.write(msg) </ins><span class="cx"> </span><span class="cx"> class ConnectionFairy(object): </span><span class="cx"> def __init__(self, pool, connection=None): </span><span class="lines">@@ -155,19 +155,17 @@ </span><span class="cx"> """Maintains one connection per each thread, never moving to another thread. this is </span><span class="cx"> used for SQLite and other databases with a similar restriction.""" </span><span class="cx"> def __init__(self, creator, **params): </span><del>- params['use_threadlocal'] = False </del><span class="cx"> Pool.__init__(self, **params) </span><span class="cx"> self._conns = {} </span><span class="cx"> self._creator = creator </span><span class="cx"> </span><span class="cx"> def status(self): </span><del>- return "SingletonThreadPool size: %d" % len(self._conns) </del><ins>+ return "SingletonThreadPool thread:%d size: %d" % (thread.get_ident(), len(self._conns)) </ins><span class="cx"> </span><del>- def unique_connection(self): - return ConnectionFairy(self, self._creator()) </del><ins>+ def do_return_conn(self, conn): + if self._conns.get(thread.get_ident(), None) is None: + self._conns[thread.get_ident()] = conn </ins><span class="cx"> </span><del>- def do_return_conn(self, conn): - pass </del><span class="cx"> def do_return_invalid(self): </span><span class="cx"> try: </span><span class="cx"> del self._conns[thread.get_ident()] </span><span class="lines">@@ -176,9 +174,13 @@ </span><span class="cx"> </span><span class="cx"> def do_get(self): </span><span class="cx"> try: </span><del>- return self._conns[thread.get_ident()] </del><ins>+ c = self._conns[thread.get_ident()] + if c is None: + return self._creator() </ins><span class="cx"> except KeyError: </span><del>- return self._conns.setdefault(thread.get_ident(), self._creator()) </del><ins>+ c = self._creator() + self._conns[thread.get_ident()] = None + return c </ins><span class="cx"> </span><span class="cx"> class QueuePool(Pool): </span><span class="cx"> """uses Queue.Queue to maintain a fixed-size list of connections.""" </span></span></pre></div> <a id="sqlalchemytrunktestpoolpy"></a> <div class="modfile"><h4>Modified: sqlalchemy/trunk/test/pool.py (1147 => 1148)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/trunk/test/pool.py 2006-03-16 19:08:35 UTC (rev 1147) +++ sqlalchemy/trunk/test/pool.py 2006-03-16 19:09:53 UTC (rev 1148) </span><span class="lines">@@ -69,7 +69,22 @@ </span><span class="cx"> self.assert_(status(p) == (3, 1, 0, 2)) </span><span class="cx"> c2 = None </span><span class="cx"> self.assert_(status(p) == (3, 2, 0, 1)) </span><del>- </del><ins>+ + def testthreadlocal(self): + for p in ( + pool.QueuePool(creator = lambda: sqlite.connect('foo.db'), pool_size = 3, max_overflow = -1, use_threadlocal = True, echo = False), + pool.SingletonThreadPool(creator = lambda: sqlite.connect('foo.db'), use_threadlocal = True) + ): + c1 = p.connect() + c2 = p.connect() + self.assert_(c1 is c2) + c3 = p.unique_connection() + self.assert_(c3 is not c1) + c2 = None + c2 = p.connect() + self.assert_(c1 is c2) + self.assert_(c3 is not c1) + </ins><span class="cx"> def tearDown(self): </span><span class="cx"> pool.clear_managers() </span><span class="cx"> for file in ('foo.db', 'bar.db'): </span></span></pre> </div> </div> </body> </html> |
