January 2006 - elephant-cvs@common-lisp.net

[elephant-cvs] CVS elephant/doc
by rread 24 Jan '06

24 Jan '06

Update of /project/elephant/cvsroot/elephant/doc In directory common-lisp:/tmp/cvs-serv22618/doc Modified Files: tutorial.texinfo Log Message: Clearer test usage and system-specific test invocation patterns --- /project/elephant/cvsroot/elephant/doc/tutorial.texinfo 2006/01/06 14:42:34 1.2 +++ /project/elephant/cvsroot/elephant/doc/tutorial.texinfo 2006/01/24 18:25:00 1.3 @@ -625,7 +625,7 @@ * (open-store "testdb")) @end lisp -is preferred. +is the preferred mechanism. This opens the environment and database. The @code{persistent-*} objects reference the @code{*store-controller*} special. (This is in part because

1 0

[elephant-cvs] CVS elephant/tests/testdb2
by rread 24 Jan '06

24 Jan '06

Update of /project/elephant/cvsroot/elephant/tests/testdb2 In directory common-lisp:/tmp/cvs-serv20770/testdb2 Log Message: Directory /project/elephant/cvsroot/elephant/tests/testdb2 added to the repository

1 0

[elephant-cvs] CVS elephant/src
by rread 24 Jan '06

24 Jan '06

Update of /project/elephant/cvsroot/elephant/src In directory common-lisp:/tmp/cvs-serv9274 Modified Files: RUNTEST.lisp classes.lisp collections.lisp controller.lisp elephant.lisp metaclasses.lisp sql-controller.lisp Log Message: Changes from Andrew Blumberg discovered while debugging on openMCL. --- /project/elephant/cvsroot/elephant/src/RUNTEST.lisp 2005/11/23 17:51:37 1.2 +++ /project/elephant/cvsroot/elephant/src/RUNTEST.lisp 2006/01/24 15:42:30 1.3 @@ -19,6 +19,10 @@ (setq *test-path-primary* *testpg-path*) (setq *test-path-primary* *testsqlite3-path*) (setq *test-path-secondary* *testdb-path*) + +(setq *test-path-primary* *testdb-path*) +(setq *test-path-secondary* nil) + (do-all-tests-spec *test-path-primary*) --- /project/elephant/cvsroot/elephant/src/classes.lisp 2005/11/23 17:51:37 1.14 +++ /project/elephant/cvsroot/elephant/src/classes.lisp 2006/01/24 15:42:30 1.15 @@ -187,6 +187,9 @@ (setf (slot-value-using-class class instance slot-def) (funcall initfun)))) ) +;; (format t "transient-slot-inits ~A~%" transient-slot-inits) +;; (format t "indices boundp ~A~%" (slot-boundp instance 'indices)) +;; (format t "indices-caches boundp ~A~%" (slot-boundp instance 'indices-cache)) ;; let the implementation initialize the transient slots (apply #'call-next-method instance transient-slot-inits initargs)))))) @@ -194,11 +197,16 @@ ;; probably should delete discarded slots, but we'll worry about that later (prog1 (call-next-method) + (format t "persisent-slots ~A~%" (persistent-slots (class-of instance))) +;; (format t "slot-boundp ~A~%" (slot-boundp instance '%persistent-slots)) (let* ((class (class-of instance)) (new-persistent-slots (set-difference (persistent-slots class) (old-persistent-slots class)))) - (apply #'shared-initialize instance new-persistent-slots initargs)))) + (apply #'shared-initialize instance new-persistent-slots initargs)) +;; (format t "slot-boundp ~A~%" (slot-boundp instance '%persistent-slots)) + ) + ) (defun find-slot-def-by-name (class slot-name) (loop for slot-def in (class-slots class) --- /project/elephant/cvsroot/elephant/src/collections.lisp 2005/11/23 17:51:37 1.12 +++ /project/elephant/cvsroot/elephant/src/collections.lisp 2006/01/24 15:42:30 1.13 @@ -377,7 +377,8 @@ (defmethod (setf get-value) (value key (bt btree-index)) "Puts are not allowed on secondary indices. Try adding to the primary." - (declare (ignore value key bt)) + (declare (ignore value key) + (ignorable bt)) (error "Puts are forbidden on secondary indices. Try adding to the primary.")) (defgeneric get-primary-key (key bt) @@ -1008,20 +1009,23 @@ (defmethod cursor-get-both ((cursor bdb-secondary-cursor) key value) "cursor-get-both not implemented for secondary indices. Use cursor-pget-both." - (declare (ignore cursor key value)) + (declare (ignore key value) + (ignorable cursor)) (error "cursor-get-both not implemented on secondary indices. Use cursor-pget-both.")) (defmethod cursor-get-both-range ((cursor bdb-secondary-cursor) key value) "cursor-get-both-range not implemented for secondary indices. Use cursor-pget-both-range." - (declare (ignore cursor key value)) + (declare (ignore key value) + (ignorable cursor)) (error "cursor-get-both-range not implemented on secondary indices. Use cursor-pget-both-range.")) (defmethod cursor-put ((cursor bdb-secondary-cursor) value &rest rest) "Puts are forbidden on secondary indices. Try adding to the primary." - (declare (ignore rest value cursor)) + (declare (ignore rest value) + (ignorable cursor)) (error "Puts are forbidden on secondary indices. Try adding to the primary.")) (defmethod cursor-next-dup ((cursor bdb-secondary-cursor)) --- /project/elephant/cvsroot/elephant/src/controller.lisp 2005/11/23 17:51:37 1.13 +++ /project/elephant/cvsroot/elephant/src/controller.lisp 2006/01/24 15:42:30 1.14 @@ -181,7 +181,7 @@ ) (defun add-index-from-index (iname v dstibt dstsc) - (declare (type btree-index v) +#-ALLEGRO (declare (type btree-index v) (type indexed-btree dstibt)) (let ((kf (key-form v))) (format t " kf ~A ~%" kf) --- /project/elephant/cvsroot/elephant/src/elephant.lisp 2005/11/23 17:51:37 1.15 +++ /project/elephant/cvsroot/elephant/src/elephant.lisp 2006/01/24 15:42:30 1.16 @@ -216,7 +216,11 @@ slot-definition-initargs class-finalized-p finalize-inheritance - compute-slots) + compute-slots + slot-definition-readers + slot-definition-writers + class-direct-slots + ) #+allegro (:import-from :excl compute-effective-slot-definition-initargs) --- /project/elephant/cvsroot/elephant/src/metaclasses.lisp 2006/01/06 14:20:03 1.9 +++ /project/elephant/cvsroot/elephant/src/metaclasses.lisp 2006/01/24 15:42:30 1.10 @@ -94,6 +94,9 @@ default; use the :transient flag otherwise.")) (defmethod persistent-slots ((class persistent-metaclass)) + (if (slot-boundp class '%persistent-slots) + (car (%persistent-slots class)) + nil) (car (%persistent-slots class))) (defmethod persistent-slots ((class standard-class)) --- /project/elephant/cvsroot/elephant/src/sql-controller.lisp 2005/11/23 17:51:38 1.2 +++ /project/elephant/cvsroot/elephant/src/sql-controller.lisp 2006/01/24 15:42:30 1.3 @@ -533,7 +533,7 @@ :where [and [= [clctn_id] clcn]] :database con ))) - (mapcar #'(lambda (x) (mapcar #'(lambda (q) (deserialize-from-base64-string :sc sc)) x)) + (mapcar #'(lambda (x) (mapcar #'(lambda (q) (deserialize-from-base64-string q :sc sc)) x)) tuples))) (defmethod sql-from-root-existsp (key con)

1 0

[elephant-cvs] CVS update: elephant/doc/includes/PLACEHOLDER.txt
by rread＠common-lisp.net 06 Jan '06

06 Jan '06

Update of /project/elephant/cvsroot/elephant/doc/includes In directory common-lisp.net:/tmp/cvs-serv15892/includes Added Files: PLACEHOLDER.txt Log Message: Making sure the directory exists Date: Fri Jan 6 15:42:35 2006 Author: rread

1 0

[elephant-cvs] CVS update: elephant/doc/tutorial.texinfo
by rread＠common-lisp.net 06 Jan '06

06 Jan '06

Update of /project/elephant/cvsroot/elephant/doc In directory common-lisp.net:/tmp/cvs-serv15892 Modified Files: tutorial.texinfo Log Message: Making sure the directory exists Date: Fri Jan 6 15:42:34 2006 Author: rread Index: elephant/doc/tutorial.texinfo diff -u elephant/doc/tutorial.texinfo:1.1 elephant/doc/tutorial.texinfo:1.2 --- elephant/doc/tutorial.texinfo:1.1 Sun Sep 19 19:44:42 2004 +++ elephant/doc/tutorial.texinfo Fri Jan 6 15:42:34 2006 @@ -378,7 +378,7 @@ deserialization, no merge conflicts..... @lisp -* (defvar *friends-birthdays* (make-instance 'btree)) +* (defvar *friends-birthdays* (make-btree)) => *FRIENDS-BIRTHDAYS* * (add-to-root "friends-birthdays" *friends-birthdays*) @@ -500,7 +500,7 @@ and I put them in a table @lisp -* (defvar *appointments* (with-transaction () (make-instance 'indexed-btree))) +* (defvar *appointments* (with-transaction () (make-indexed-btree))) => *APPOINTMENTS* @end lisp @@ -609,7 +609,7 @@ run recovery on the database (see sleepycat docs) you can specify that with the @code{:recover} and @code{:recover-fatal} keys. -To create one by hand, +To create one by hand one can do, @lisp * (setq *store-controller* (make-instance 'store-controller :path "testdb")) @@ -619,7 +619,15 @@ => #<STORE-CONTROLLER @{49252F75@}> @end lisp -opens the environment and database. The @code{persistent-*} objects +but + +@lisp +* (open-store "testdb")) +@end lisp + +is preferred. + +This opens the environment and database. The @code{persistent-*} objects reference the @code{*store-controller*} special. (This is in part because slot accessors can't take additional arguments.) If for some reason you want to operate on 2 store controllers, you'll have to do that by

1 0

[elephant-cvs] CVS update: elephant/src/metaclasses.lisp
by rread＠common-lisp.net 06 Jan '06

06 Jan '06

Update of /project/elephant/cvsroot/elephant/src In directory common-lisp.net:/tmp/cvs-serv14714/src Modified Files: metaclasses.lisp Log Message: Andrew Philpot found this bug that broke the ACL implementation Date: Fri Jan 6 15:20:03 2006 Author: rread Index: elephant/src/metaclasses.lisp diff -u elephant/src/metaclasses.lisp:1.8 elephant/src/metaclasses.lisp:1.9 --- elephant/src/metaclasses.lisp:1.8 Wed Nov 23 18:51:37 2005 +++ elephant/src/metaclasses.lisp Fri Jan 6 15:20:03 2006 @@ -77,7 +77,10 @@ ;; It probably would be better to put a string in here in the case ;; of sleepycat... (dbonnection-spec-pst :type (or list string) :accessor :dbcn-spc-pst :initarg :dbconnection-spec-pst - :initform '()) +;; Andrew Philpot discovered that this breaks the ACL implementation. +;; We are green under both SBCL and ACL with it commented out, so I am commiting it. -- rlr 06 JAN 2006 +;; :initform '() +) ) (:documentation "Abstract superclass for all persistent classes (common

1 0