Update of /project/elephant/cvsroot/elephant/src/elephant In directory clnet:/tmp/cvs-serv2451/src/elephant
Modified Files: migrate.lisp package.lisp serializer1.lisp Removed Files: serializer2-locks.lisp Log Message: Checkpoint checkin of db-lisp
--- /project/elephant/cvsroot/elephant/src/elephant/migrate.lisp 2006/04/26 17:53:44 1.4 +++ /project/elephant/cvsroot/elephant/src/elephant/migrate.lisp 2007/02/08 23:07:18 1.5 @@ -129,7 +129,8 @@ ;; indexed persistent objects which (see below) are not copied by default ;; so we do the slot updates here (map-btree (lambda (classname classidx) - ;; Class indexes should never be copied already + ;; Class indexes should never be copied already; this checks + ;; for users breaking the class-index abstraction (assert (not (object-was-copied-p classidx))) (let ((newcidx (with-transaction (:store-controller dst) @@ -145,9 +146,9 @@ ;; Add the class index to the class root (with-transaction (:store-controller dst) (setf (get-value classname (controller-class-root dst)) newcidx)) - ;; Update the class to point at all it's new objects in the new store + ;; Update the class to point at objects in the new store (setf (%index-cache (find-class classname)) newcidx) - ;; Migrate the indexes' objects + ;; Migrate the index objects (copy-cindex-contents newcidx classidx) ;; And remember the class index just incase it's indexed elswhere ;; (and trips the assert above) --- /project/elephant/cvsroot/elephant/src/elephant/package.lisp 2007/02/04 04:34:57 1.11 +++ /project/elephant/cvsroot/elephant/src/elephant/package.lisp 2007/02/08 23:07:19 1.12 @@ -37,6 +37,8 @@ #:controller-fast-symbols-p #:optimize-storage
+ #:upgrade + #:controller-version #:controller-serializer-version #:controller-serialize #:controller-deserialize #:serialize-database-version-key --- /project/elephant/cvsroot/elephant/src/elephant/serializer1.lisp 2007/02/05 03:18:22 1.6 +++ /project/elephant/cvsroot/elephant/src/elephant/serializer1.lisp 2007/02/08 23:07:19 1.7 @@ -291,6 +291,7 @@ (type buffer-stream bs)) (let ((tag (buffer-read-byte bs))) (declare (type foreign-char tag)) + (format t "Tag: ~A~%" tag) (cond ((= tag +fixnum+) (buffer-read-fixnum bs))