Update of /project/elephant/cvsroot/elephant/src/elephant In directory clnet:/tmp/cvs-serv9131/src/elephant
Modified Files: controller.lisp package.lisp serializer2.lisp variables.lisp Log Message: Where did bdb-slots go?
--- /project/elephant/cvsroot/elephant/src/elephant/controller.lisp 2007/01/22 16:17:43 1.21 +++ /project/elephant/cvsroot/elephant/src/elephant/controller.lisp 2007/01/22 23:11:08 1.22 @@ -80,6 +80,7 @@ (setf (gethash spec *dbconnection-spec*) sc) sc)))
+ ;; NOTE: Check for asdf loaded rather than rely on asdf to? (defun load-backend (type) (let ((record (assoc type *elephant-backends*))) @@ -109,9 +110,8 @@ (defun open-store (spec &rest args) "Conveniently open a store controller." (assert (consp spec)) - ;; Setup system config parameters from my-config - (ensure-loaded-configuration) (setq *store-controller* (get-controller spec)) + (load-user-configuration *store-controller*) (initialize-serializer *store-controller*) (apply #'open-controller *store-controller* args))
@@ -165,6 +165,13 @@ handles, the cache, table creation, counters, locks, the root (for garbage collection,) et cetera."))
+;; User configuration parameters for the controller + +(defun load-user-configuration (controller) + ;; Fast symbols + (setf (controller-fast-symbols-p controller) + (elephant-system::get-config-option :fast-symbols (asdf:find-system :elephant)))) + (defun initialize-serializer (sc) "Establish serializer version on controller startup" (cond ((prior-version-p (database-version sc) '(0 6 0)) --- /project/elephant/cvsroot/elephant/src/elephant/package.lisp 2007/01/21 21:20:04 1.7 +++ /project/elephant/cvsroot/elephant/src/elephant/package.lisp 2007/01/22 23:11:08 1.8 @@ -35,6 +35,7 @@ #:add-to-root #:get-from-root #:remove-from-root #:root-existsp #:get-cached-instance #:flush-instance-cache #:controller-symbol-cache #:controller-symbol-id-cache + #:controller-fast-symbols-p #:optimize-storage
#:with-transaction --- /project/elephant/cvsroot/elephant/src/elephant/serializer2.lisp 2007/01/22 16:17:44 1.4 +++ /project/elephant/cvsroot/elephant/src/elephant/serializer2.lisp 2007/01/22 23:11:08 1.5 @@ -473,7 +473,7 @@ (declare (type buffer-stream bs) (type symbol symbol) (type store-controller sc)) - (if *fast-symbols* + (if (controller-fast-symbols-p sc) (let ((id (lookup-id symbol sc))) (declare (type fixnum id)) (buffer-write-byte +symbol-id+ bs) --- /project/elephant/cvsroot/elephant/src/elephant/variables.lisp 2007/01/21 21:20:04 1.8 +++ /project/elephant/cvsroot/elephant/src/elephant/variables.lisp 2007/01/22 23:11:08 1.9 @@ -43,15 +43,6 @@ Users attempting to directly write this variable will run into an error")
-;;;;;;;;;;;;;;;;;;;; -;;;; User Configuration for site customization - -(defvar *fast-symbols* nil) ;; for serializer2.lisp - -(defun ensure-loaded-configuration () - (setf *fast-symbols* - (elephant-system::get-config-option :fast-symbols (asdf:find-system :elephant)))) - ;;;;;;;;;;;;;;;;; ;;;; Serializer optimization parameters