Changeset 75

Timestamp:

04/12/07 21:59:41

Author:

fumanchu

Message:

New conns.ConnectionPerThread? class (and new SQLiteDatabase.threadsafe attribute).

Files:

• trunk/geniusql/conns.py (modified) (1 diff)
• trunk/geniusql/providers/sqlite.py (modified) (3 diffs)

trunk/geniusql/conns.py

@@ -119 +119 @@
-
-
+class ConnectionPerThread(object):
+    """A database connection factory which uses one connection per thread.
+    
+    This is useful for SQLite; from http://www.sqlite.org/c_interface.html:
+        
+        "If SQLite is compiled with the THREADSAFE preprocessor macro set
+        to 1, then it is safe to use SQLite from two or more threads of
+        the same process at the same time. But each thread should have
+        its own sqlite* pointer returned from sqlite_open. It is never safe
+        for two or more threads to access the same sqlite* pointer at the
+        same time.
+        
+        In precompiled SQLite libraries available on the website, the Unix
+        versions are compiled with THREADSAFE turned off but the windows
+        versions are compiled with THREADSAFE turned on. If you need
+        something different that this you will have to recompile."
+    
+    See also http://www.sqlite.org/faq.html#q8
+    """
+    
+    def __init__(self, open, close, retry=5):
+        self.open = open
+        self.close = close
+        self.retry = retry
+        self.conns = {}
+    
+    def __call__(self):
+        """Return the connection for the current thread."""
+        threadid = threading._get_ident()
+        try:
+            return self.conns[threadid]
+        except KeyError:
+            for i in xrange(self.retry):
+                try:
+                    conn = self.open()
+                    self.conns[threadid] = conn
+                    return conn
+                except errors.OutOfConnectionsError:
+                    conn = None
+                    time.sleep(i + 1)
+            raise errors.OutOfConnectionsError()
+    
+    def shutdown(self):
+        """Release all database connections."""
+        # Empty the conn map.
+        while self.conns:
+            threadid, conn = self.conns.popitem()
+            self.close(conn)
+
+
-class SingleConnection(object):
-    """A single database connection for all consumers.

trunk/geniusql/providers/sqlite.py

@@ -1 +1 @@
-import datetime
-import os
+import sys
-import time
-
@@ -564 +565 @@
-            # So we need to give :memory: databases a SingleConnection.
-            self._factory = conns.SingleConnection(self._get_conn, self._del_conn)
-
+
+
+
+
-            conns.ConnectionManager._set_factory(self)
-    
@@ -835 +839 @@
-    
-    pks_must_be_indexed = False
+    
+    # Based on SQLite FAQ: http://www.sqlite.org/faq.html#q8
+    # Override as needed.
+    threadsafe = ("win" in sys.platform)
-    
-    def __init__(self, **kwargs):