X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=sql%2Fpool.lisp;h=1ac0a37b5b550374c0a55d0fd58b60feae0a220a;hp=f58e752848a810a329760409a7b78b14f4e6c66a;hb=1b07d2fd927cf8f1943ac0a0b8c980d1dc707076;hpb=bada52b7a8fd2cc484dee33cccd64ca09a52ec3d

diff --git a/sql/pool.lisp b/sql/pool.lisp
index f58e752..1ac0a37 100644
--- a/sql/pool.lisp
+++ b/sql/pool.lisp
@@ -16,33 +16,14 @@
 ;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
-(in-package clsql-sys)
-
-(defun make-process-lock (name) 
-  #+allegro (mp:make-process-lock :name name)
-  #+scl (thread:make-lock name)
-  #+lispworks (mp:make-lock :name name)
-  #-(or allegro scl lispworks) (declare (ignore name))
-  #-(or allegro scl lispworks) nil)
-
-(defmacro with-process-lock ((lock desc) &body body)
-  #+scl `(thread:with-lock-held (,lock ,desc) ,@body)
-  #+(or allegro lispworks)
-  (declare (ignore desc))
-  #+(or allegro lispworks)
-  (let ((l (gensym)))
-    `(let ((,l ,lock))
-       #+allegro (mp:with-process-lock (,l) ,@body)
-       #+lispworks (mp:with-lock (,l) ,@body)))
-  #-(or scl allegro lispworks) (declare (ignore lock desc))
-  #-(or scl allegro lispworks) `(progn ,@body))
+(in-package #:clsql-sys)
 
 (defvar *db-pool* (make-hash-table :test #'equal))
 (defvar *db-pool-lock* (make-process-lock "DB Pool lock"))
 
 (defclass conn-pool ()
   ((connection-spec :accessor connection-spec :initarg :connection-spec)
-   (database-type :accessor database-type :initarg :database-type)
+   (database-type :accessor pool-database-type :initarg :pool-database-type)
    (free-connections :accessor free-connections
 		     :initform (make-array 5 :fill-pointer 0 :adjustable t))
    (all-connections :accessor all-connections
@@ -52,11 +33,32 @@
 
 (defun acquire-from-conn-pool (pool)
   (or (with-process-lock ((conn-pool-lock pool) "Acquire from pool")
-	(and (plusp (length (free-connections pool)))
-	     (vector-pop (free-connections pool))))
+	(when (plusp (length (free-connections pool)))
+          (let ((pconn (vector-pop (free-connections pool))))
+            ;; test if connection still valid.
+            ;; Currently, on supported on MySQL
+            (cond
+              ((eq :mysql (database-type pconn))
+               (handler-case
+                   (database-query "SHOW ERRORS LIMIT 1" pconn nil nil)
+                 (error (e)
+                   ;; we could check for error type 2006 for "SERVER GONE AWAY",
+                   ;; but, it's safer just to disconnect the pooled conn for any error
+                   (warn "Database connection ~S had an error when attempted to be acquired from the pool:
+  ~S
+Disconnecting.~%"
+                         pconn e)
+                   (ignore-errors (database-disconnect :database pconn))
+                   nil)
+                 (:no-error (res fields)
+                   (declare (ignore res fields))
+                   pconn)))
+              (t
+               pconn)))))
       (let ((conn (connect (connection-spec pool)
-			   :database-type (database-type pool)
-			   :if-exists :new)))
+			   :database-type (pool-database-type pool)
+			   :if-exists :new
+                           :make-default nil)))
 	(with-process-lock ((conn-pool-lock pool) "Acquire from pool")
 	  (vector-push-extend conn (all-connections pool))
 	  (setf (conn-pool conn) pool))
@@ -71,20 +73,22 @@
   (with-process-lock ((conn-pool-lock pool) "Clear pool")
     (loop for conn across (all-connections pool)
 	  do (setf (conn-pool conn) nil)
-	  (disconnect :database conn))
+	  ;; disconnect may error if remote side closed connection
+	  (ignore-errors (disconnect :database conn)))
     (setf (fill-pointer (free-connections pool)) 0)
     (setf (fill-pointer (all-connections pool)) 0))
   nil)
 
 (defun find-or-create-connection-pool (connection-spec database-type)
-  "Find connection pool in hash table, creates a new connection pool if not found"
+  "Find connection pool in hash table, creates a new connection pool
+if not found"
   (with-process-lock (*db-pool-lock* "Find-or-create connection")
     (let* ((key (list connection-spec database-type))
 	   (conn-pool (gethash key *db-pool*)))
       (unless conn-pool
 	(setq conn-pool (make-instance 'conn-pool
 				       :connection-spec connection-spec
-				       :database-type database-type))
+				       :pool-database-type database-type))
 	(setf (gethash key *db-pool*) conn-pool))
       conn-pool)))
 
@@ -97,7 +101,7 @@
   (release-to-conn-pool database))
 
 (defun disconnect-pooled (&optional clear)
-  "Disconnects all connections in the pool"
+  "Disconnects all connections in the pool."
   (with-process-lock (*db-pool-lock* "Disconnect pooled")
     (maphash
      #'(lambda (key conn-pool)
@@ -106,3 +110,24 @@
      *db-pool*)
     (when clear (clrhash *db-pool*)))
   t)
+
+;(defun pool-start-sql-recording (pool &key (types :command))
+;  "Start all stream in the pool recording actions of TYPES"
+;  (dolist (con (pool-connections pool))
+;    (start-sql-recording :type types
+;			 :database (connection-database con))))
+
+;(defun pool-stop-sql-recording (pool &key (types :command))
+;  "Start all stream in the pool recording actions of TYPES"
+;  (dolist (con (pool-connections pool))
+;    (stop-sql-recording :type types
+;			  :database (connection-database con))))
+
+;(defmacro with-database-connection (pool &body body)
+;  `(let ((connection (obtain-connection ,pool))
+;         (results nil))
+;    (unwind-protect
+;         (with-database ((connection-database connection))
+;           (setq results (multiple-value-list (progn ,@body))))
+;      (release-connection connection))
+;    (values-list results)))