September 2004 - elephant-cvs@common-lisp.net

[elephant-cvs] CVS update: elephant/src/collections.lisp
by blee＠common-lisp.net 25 Sep '04

25 Sep '04

Update of /project/elephant/cvsroot/elephant/src In directory common-lisp.net:/tmp/cvs-serv19911/src Modified Files: collections.lisp Log Message: because of allocation type weirdness, should always init indices-cache Date: Sat Sep 25 20:57:37 2004 Author: blee Index: elephant/src/collections.lisp diff -u elephant/src/collections.lisp:1.10 elephant/src/collections.lisp:1.11 --- elephant/src/collections.lisp:1.10 Tue Sep 21 21:36:03 2004 +++ elephant/src/collections.lisp Sat Sep 25 20:57:37 2004 @@ -103,9 +103,8 @@ (defmethod shared-initialize :after ((instance indexed-btree) slot-names &rest rest) - (declare (ignore rest)) - (if (member 'indices slot-names :test #'eq) - (setf (indices-cache instance) (indices instance)))) + (declare (ignore slot-names rest)) + (setf (indices-cache instance) (indices instance))) (defgeneric add-index (bt &key index-name key-form populate) (:documentation

1 0

[elephant-cvs] CVS update: elephant/tests/mop-tests.lisp
by blee＠common-lisp.net 21 Sep '04

21 Sep '04

Update of /project/elephant/cvsroot/elephant/tests In directory common-lisp.net:/tmp/cvs-serv4131/tests Modified Files: mop-tests.lisp Log Message: new tests for change class, update class Date: Tue Sep 21 21:36:35 2004 Author: blee Index: elephant/tests/mop-tests.lisp diff -u elephant/tests/mop-tests.lisp:1.5 elephant/tests/mop-tests.lisp:1.6 --- elephant/tests/mop-tests.lisp:1.5 Thu Sep 16 06:26:08 2004 +++ elephant/tests/mop-tests.lisp Tue Sep 21 21:36:34 2004 @@ -177,4 +177,45 @@ (find-slot-def 'p-class 'slot1)) ) (signals-condition (slot1 p))) + t) + +(deftest update-class + (progn + (defclass update-class () + ((slot1 :initform 1 :accessor slot1)) + (:metaclass persistent-metaclass)) + (let* ((*auto-commit* t) + (foo (make-instance 'update-class))) + (defclass update-class () + ((slot2 :initform 2 :accessor slot2)) + (:metaclass persistent-metaclass)) + (values + (slot2 foo) + (signals-condition (slot1 foo))))) + 2 t) + +(deftest change-class + (progn + (defclass class-one () + ((slot1 :initform 1 :accessor slot1)) + (:metaclass persistent-metaclass)) + + (defclass class-two () + ((slot1 :initform 0 :accessor slot1) + (slot2 :initform 2 :accessor slot2)) + (:metaclass persistent-metaclass)) + + (let* ((*auto-commit* t) + (foo (make-instance 'class-one))) + (change-class foo (find-class 'class-two)) + (values + (slot1 foo) + (slot2 foo)))) + 1 2) + +(deftest change-class2 + (with-transaction () + (let ((foo (make-instance 'btree))) + (change-class foo (find-class 'indexed-btree)) + (is-not-null (indices foo)))) t)

1 0

[elephant-cvs] CVS update: elephant/src/collections.lisp
by blee＠common-lisp.net 21 Sep '04

21 Sep '04

Update of /project/elephant/cvsroot/elephant/src In directory common-lisp.net:/tmp/cvs-serv2520/src Modified Files: collections.lisp Log Message: make shared-init on indexed-btree play nice Date: Tue Sep 21 21:36:04 2004 Author: blee Index: elephant/src/collections.lisp diff -u elephant/src/collections.lisp:1.9 elephant/src/collections.lisp:1.10 --- elephant/src/collections.lisp:1.9 Tue Sep 21 03:34:31 2004 +++ elephant/src/collections.lisp Tue Sep 21 21:36:03 2004 @@ -103,8 +103,9 @@ (defmethod shared-initialize :after ((instance indexed-btree) slot-names &rest rest) - (declare (ignore slot-names rest)) - (setf (indices-cache instance) (indices instance))) + (declare (ignore rest)) + (if (member 'indices slot-names :test #'eq) + (setf (indices-cache instance) (indices instance)))) (defgeneric add-index (bt &key index-name key-form populate) (:documentation

1 0

[elephant-cvs] CVS update: elephant/src/classes.lisp
by blee＠common-lisp.net 21 Sep '04

21 Sep '04

Update of /project/elephant/cvsroot/elephant/src In directory common-lisp.net:/tmp/cvs-serv2234/src Modified Files: classes.lisp Log Message: added preliminary support for change-class (though redef class is broken.) Date: Tue Sep 21 21:35:29 2004 Author: blee Index: elephant/src/classes.lisp diff -u elephant/src/classes.lisp:1.11 elephant/src/classes.lisp:1.12 --- elephant/src/classes.lisp:1.11 Sun Sep 19 19:47:44 2004 +++ elephant/src/classes.lisp Tue Sep 21 21:35:29 2004 @@ -111,6 +111,20 @@ ;; let the implementation initialize the transient slots (apply #'call-next-method instance transient-slot-inits initargs))))) +(defmethod update-instance-for-different-class :around ((previous persistent) (current persistent) &rest initargs &key) + "Need to also update the persistent-slots, which have +:class allocation." + (let ((new-persistent-slots + (loop for slotd in (class-slots (class-of current)) + for slot-name = (slot-definition-name slotd) + with old-slot-names = (mapcar #'slot-definition-name + (class-slots (class-of previous))) + when (and (not (member slot-name old-slot-names :test #'eq)) + (persistent-p slotd)) + collect slot-name))) + (apply #'shared-initialize current new-persistent-slots initargs) + (call-next-method))) + (defmethod slot-value-using-class :around (class (instance persistent-object) (slot-def persistent-slot-definition)) "Get the slot value from the database." (declare (optimize (speed 3))

1 0

[elephant-cvs] CVS update: elephant/TODO
by blee＠common-lisp.net 21 Sep '04

21 Sep '04

Update of /project/elephant/cvsroot/elephant In directory common-lisp.net:/tmp/cvs-serv2207 Modified Files: TODO Log Message: update Date: Tue Sep 21 21:34:37 2004 Author: blee Index: elephant/TODO diff -u elephant/TODO:1.6 elephant/TODO:1.7 --- elephant/TODO:1.6 Sun Sep 19 19:41:43 2004 +++ elephant/TODO Tue Sep 21 21:34:37 2004 @@ -43,4 +43,7 @@ cursor-put : move the cursor after insert. -change :transient flag to an allocation type (fix CMUCL!) \ No newline at end of file +change :transient flag to an allocation type (fix CMUCL!) + +make update-class-for-redefined-class work. (persistent +slots are class allocated, this is bad.)

1 0

[elephant-cvs] CVS update: elephant/Makefile
by blee＠common-lisp.net 21 Sep '04

21 Sep '04

Update of /project/elephant/cvsroot/elephant In directory common-lisp.net:/tmp/cvs-serv10579 Modified Files: Makefile Log Message: no install anymore, should be local to asdf Date: Tue Sep 21 03:38:56 2004 Author: blee Index: elephant/Makefile diff -u elephant/Makefile:1.4 elephant/Makefile:1.5 --- elephant/Makefile:1.4 Thu Sep 16 06:11:00 2004 +++ elephant/Makefile Tue Sep 21 03:38:56 2004 @@ -15,8 +15,6 @@ #DBLIBDIR=/usr/local/lib/db42 #DBINCDIR=/usr/local/include/db42 -INSTALLDIR=/usr/local/share/common-lisp/elephant-0.2/ - ifeq (Darwin,$(UNAME)) SHARED=-bundle else @@ -26,5 +24,3 @@ libsleepycat.so: src/libsleepycat.c gcc $(SHARED) -L$(DBLIBDIR) -I$(DBINCDIR) -fPIC -O3 -o $@ $< -ldb -lm -install: libsleepycat.so - install $< $(INSTALLDIR)

1 0

[elephant-cvs] CVS update: elephant/tests/elephant-tests.lisp
by blee＠common-lisp.net 21 Sep '04

21 Sep '04

Update of /project/elephant/cvsroot/elephant/tests In directory common-lisp.net:/tmp/cvs-serv8794/tests Modified Files: elephant-tests.lisp Log Message: use asdf packaging info Date: Tue Sep 21 03:38:12 2004 Author: blee Index: elephant/tests/elephant-tests.lisp diff -u elephant/tests/elephant-tests.lisp:1.3 elephant/tests/elephant-tests.lisp:1.4 --- elephant/tests/elephant-tests.lisp:1.3 Thu Sep 16 06:25:19 2004 +++ elephant/tests/elephant-tests.lisp Tue Sep 21 03:38:12 2004 @@ -82,7 +82,12 @@ (in-package :ele-tests) -(defvar *testdb-path* "/usr/local/share/common-lisp/elephant-0.2/tests/testdb") +(defvar *testdb-path* + ;;"/usr/local/share/common-lisp/elephant-0.2/tests/testdb" + (namestring + (merge-pathnames + #p"tests/testdb/" + (asdf:component-pathname (asdf:find-system 'elephant-tests))))) (defun do-all-tests() (with-open-store (*testdb-path*)

1 0

[elephant-cvs] CVS update: elephant/src/sleepycat.lisp
by blee＠common-lisp.net 21 Sep '04

21 Sep '04

Update of /project/elephant/cvsroot/elephant/src In directory common-lisp.net:/tmp/cvs-serv8199/src Modified Files: sleepycat.lisp Log Message: use asdf packaging info Date: Tue Sep 21 03:37:21 2004 Author: blee Index: elephant/src/sleepycat.lisp diff -u elephant/src/sleepycat.lisp:1.11 elephant/src/sleepycat.lisp:1.12 --- elephant/src/sleepycat.lisp:1.11 Sun Sep 19 19:51:56 2004 +++ elephant/src/sleepycat.lisp Tue Sep 21 03:37:21 2004 @@ -144,7 +144,11 @@ ;; Libsleepycat.so: edit this (unless (uffi:load-foreign-library - "/usr/local/share/common-lisp/elephant-0.2/libsleepycat.so" + (if (find-package 'asdf) + (merge-pathnames + #p"libsleepycat.so" + (asdf:component-pathname (asdf:find-system 'elephant))) + "/usr/local/share/common-lisp/elephant-0.2/libsleepycat.so") :module "libsleepycat") (error "Couldn't load libsleepycat!"))

1 0

[elephant-cvs] CVS update: elephant/src/elephant.lisp
by blee＠common-lisp.net 21 Sep '04

21 Sep '04

Update of /project/elephant/cvsroot/elephant/src In directory common-lisp.net:/tmp/cvs-serv5844/src Modified Files: elephant.lisp Log Message: typo: forgot remove-from-root Date: Tue Sep 21 03:35:11 2004 Author: blee Index: elephant/src/elephant.lisp diff -u elephant/src/elephant.lisp:1.12 elephant/src/elephant.lisp:1.13 --- elephant/src/elephant.lisp:1.12 Sun Sep 19 19:49:55 2004 +++ elephant/src/elephant.lisp Tue Sep 21 03:35:11 2004 @@ -52,7 +52,8 @@ #:open-store #:close-store #:with-open-store #:store-controller #:open-controller #:close-controller #:with-open-controller #:controller-path #:controller-environment - #:controller-db #:controller-root #:add-to-root #:get-from-root + #:controller-db #:controller-root + #:add-to-root #:get-from-root #:remove-from-root #:start-transaction #:commit-transaction #:abort-transaction #:persistent #:persistent-object #:persistent-metaclass

1 0

[elephant-cvs] CVS update: elephant/src/collections.lisp
by blee＠common-lisp.net 21 Sep '04

21 Sep '04

Update of /project/elephant/cvsroot/elephant/src In directory common-lisp.net:/tmp/cvs-serv5811/src Modified Files: collections.lisp Log Message: typo: forgot populate keyword on generic add-index Date: Tue Sep 21 03:34:32 2004 Author: blee Index: elephant/src/collections.lisp diff -u elephant/src/collections.lisp:1.8 elephant/src/collections.lisp:1.9 --- elephant/src/collections.lisp:1.8 Sun Sep 19 19:48:11 2004 +++ elephant/src/collections.lisp Tue Sep 21 03:34:31 2004 @@ -106,7 +106,7 @@ (declare (ignore slot-names rest)) (setf (indices-cache instance) (indices instance))) -(defgeneric add-index (bt &key index-name key-form) +(defgeneric add-index (bt &key index-name key-form populate) (:documentation "Add a secondary index. The indices are stored in an eq hash-table, so the index-name should be a symbol. key-form

1 0