elephant-cvs

elephant-cvs@common-lisp.net

858 discussions

[elephant-cvs] CVS elephant/src
by rread 04 Feb '06

04 Feb '06

Update of /project/elephant/cvsroot/elephant/src In directory common-lisp:/tmp/cvs-serv456/src Modified Files: BerkeleyDB-tests.lisp MigrationTests.lisp RUNTEST.lisp SQLDB-tests.lisp bdb-enable.lisp berkeley-db.lisp classes.lisp cmu-mop-patches.lisp collections.lisp controller.lisp elephant.lisp metaclasses.lisp openmcl-mop-patches.lisp serializer.lisp sleepycat.lisp sql-collections.lisp sql-controller.lisp sql-tutorial.lisp utils.lisp Log Message: Mostly changing to LLGPL --- /project/elephant/cvsroot/elephant/src/BerkeleyDB-tests.lisp 2006/01/25 22:18:03 1.2 +++ /project/elephant/cvsroot/elephant/src/BerkeleyDB-tests.lisp 2006/02/04 22:25:09 1.3 @@ -1,3 +1,10 @@ +;;; Copyright (c) 2006 by Robert L. Read +;;; <rread(a)common-lisp.net> + +;;; Elephant users are granted the rights to distribute and use this software +;;; as governed by the terms of the Lisp Lesser GNU Public License +;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. + (asdf:operate 'asdf:load-op :elephant) (asdf:operate 'asdf:load-op :ele-bdb) (asdf:operate 'asdf:load-op :elephant-tests) --- /project/elephant/cvsroot/elephant/src/MigrationTests.lisp 2006/01/24 18:25:00 1.1 +++ /project/elephant/cvsroot/elephant/src/MigrationTests.lisp 2006/02/04 22:25:09 1.2 @@ -1,3 +1,17 @@ +;;; MigrationTests.lisp +;;; +;;; part of +;;; +;;; Elephant: an object-oriented database for Common Lisp +;;; +;;; Copyright (c) 2005,2006 by Robert L. Read +;;; <rread(a)common-lisp.net> +;;; +;;; Elephant users are granted the rights to distribute and use this software +;;; as governed by the terms of the Lisp Lesser GNU Public License +;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. + + ;; This file is an example of how to perform the ;; migration tests. You will have to modify it ;; slightly depending on the systems that want to test... --- /project/elephant/cvsroot/elephant/src/RUNTEST.lisp 2006/01/24 18:25:00 1.4 +++ /project/elephant/cvsroot/elephant/src/RUNTEST.lisp 2006/02/04 22:25:09 1.5 @@ -1,3 +1,18 @@ +;;; RUNTEST.lisp +;;; +;;; part of +;;; +;;; Elephant: an object-oriented database for Common Lisp +;;; +;;; Copyright (c) 2005,2006 by Robert L. Read +;;; <rread(a)common-lisp.net> +;;; +;;; Elephant users are granted the rights to distribute and use this software +;;; as governed by the terms of the Lisp Lesser GNU Public License +;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. + + + ;; This file is now obsolete... ;; Please use SQLDB-test.lisp or BerkeleyDB-tests.lisp --- /project/elephant/cvsroot/elephant/src/SQLDB-tests.lisp 2006/01/24 18:25:00 1.1 +++ /project/elephant/cvsroot/elephant/src/SQLDB-tests.lisp 2006/02/04 22:25:09 1.2 @@ -1,3 +1,16 @@ +;;; SQLDB-tests.lisp +;;; +;;; part of +;;; +;;; Elephant: an object-oriented database for Common Lisp +;;; +;;; Copyright (c) 2005,2006 by Robert L. Read +;;; <rread(a)common-lisp.net> +;;; +;;; Elephant users are granted the rights to distribute and use this software +;;; as governed by the terms of the Lisp Lesser GNU Public License +;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. + (asdf:operate 'asdf:load-op :elephant) (asdf:operate 'asdf:load-op :ele-clsql) (asdf:operate 'asdf:load-op :elephant-tests) --- /project/elephant/cvsroot/elephant/src/bdb-enable.lisp 2006/01/29 01:08:32 1.5 +++ /project/elephant/cvsroot/elephant/src/bdb-enable.lisp 2006/02/04 22:25:09 1.6 @@ -14,32 +14,9 @@ ;;; Copyright (c) 2004 by Andrew Blumberg and Ben Lee ;;; <ablumberg(a)common-lisp.net> <blee(a)common-lisp.net> ;;; -;;; This program is released under the following license -;;; ("GPL"). For differenct licensing terms, contact the -;;; copyright holders. -;;; -;;; This program is free software; you can redistribute it -;;; and/or modify it under the terms of the GNU General -;;; Public License as published by the Free Software -;;; Foundation; either version 2 of the License, or (at -;;; your option) any later version. -;;; -;;; This program is distributed in the hope that it will be -;;; useful, but WITHOUT ANY WARRANTY; without even the -;;; implied warranty of MERCHANTABILITY or FITNESS FOR A -;;; PARTICULAR PURPOSE. See the GNU General Public License -;;; for more details. -;;; -;;; The GNU General Public License can be found in the file -;;; LICENSE which should have been distributed with this -;;; code. It can also be found at -;;; -;;; http://www.opensource.org/licenses/gpl-license.php -;;; -;;; You should have received a copy of the GNU General -;;; Public License along with this program; if not, write -;;; to the Free Software Foundation, Inc., 59 Temple Place, -;;; Suite 330, Boston, MA 02111-1307 USA +;;; Elephant users are granted the rights to distribute and use this software +;;; as governed by the terms of the Lisp Lesser GNU Public License +;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;; (defpackage ele-bdb --- /project/elephant/cvsroot/elephant/src/berkeley-db.lisp 2005/02/24 01:06:10 1.3 +++ /project/elephant/cvsroot/elephant/src/berkeley-db.lisp 2006/02/04 22:25:09 1.4 @@ -12,34 +12,10 @@ ;;; Copyright (c) 2004 by Andrew Blumberg and Ben Lee ;;; <ablumberg(a)common-lisp.net> <blee(a)common-lisp.net> ;;; -;;; This program is released under the following license -;;; ("GPL"). For differenct licensing terms, contact the -;;; copyright holders. +;;; Elephant users are granted the rights to distribute and use this software +;;; as governed by the terms of the Lisp Lesser GNU Public License +;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;; -;;; This program is free software; you can redistribute it -;;; and/or modify it under the terms of the GNU General -;;; Public License as published by the Free Software -;;; Foundation; either version 2 of the License, or (at -;;; your option) any later version. -;;; -;;; This program is distributed in the hope that it will be -;;; useful, but WITHOUT ANY WARRANTY; without even the -;;; implied warranty of MERCHANTABILITY or FITNESS FOR A -;;; PARTICULAR PURPOSE. See the GNU General Public License -;;; for more details. -;;; -;;; The GNU General Public License can be found in the file -;;; LICENSE which should have been distributed with this -;;; code. It can also be found at -;;; -;;; http://www.opensource.org/licenses/gpl-license.php -;;; -;;; You should have received a copy of the GNU General -;;; Public License along with this program; if not, write -;;; to the Free Software Foundation, Inc., 59 Temple Place, -;;; Suite 330, Boston, MA 02111-1307 USA -;;; - (in-package "SLEEPYCAT") --- /project/elephant/cvsroot/elephant/src/classes.lisp 2006/01/25 14:09:46 1.16 +++ /project/elephant/cvsroot/elephant/src/classes.lisp 2006/02/04 22:25:09 1.17 @@ -12,35 +12,10 @@ ;;; Copyright (c) 2004 by Andrew Blumberg and Ben Lee ;;; <ablumberg(a)common-lisp.net> <blee(a)common-lisp.net> ;;; -;;; This program is released under the following license -;;; ("GPL"). For differenct licensing terms, contact the -;;; copyright holders. +;;; Elephant users are granted the rights to distribute and use this software +;;; as governed by the terms of the Lisp Lesser GNU Public License +;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;; -;;; This program is free software; you can redistribute it -;;; and/or modify it under the terms of the GNU General -;;; Public License as published by the Free Software -;;; Foundation; either version 2 of the License, or (at -;;; your option) any later version. -;;; -;;; This program is distributed in the hope that it will be -;;; useful, but WITHOUT ANY WARRANTY; without even the -;;; implied warranty of MERCHANTABILITY or FITNESS FOR A -;;; PARTICULAR PURPOSE. See the GNU General Public License -;;; for more details. -;;; -;;; The GNU General Public License can be found in the file -;;; LICENSE which should have been distributed with this -;;; code. It can also be found at -;;; -;;; http://www.opensource.org/licenses/gpl-license.php -;;; -;;; You should have received a copy of the GNU General -;;; Public License along with this program; if not, write -;;; to the Free Software Foundation, Inc., 59 Temple Place, -;;; Suite 330, Boston, MA 02111-1307 USA -;;; - - (in-package "ELEPHANT") (defmethod initialize-instance :before ((instance persistent) --- /project/elephant/cvsroot/elephant/src/cmu-mop-patches.lisp 2005/02/24 01:09:24 1.1 +++ /project/elephant/cvsroot/elephant/src/cmu-mop-patches.lisp 2006/02/04 22:25:09 1.2 @@ -1,3 +1,18 @@ +;;; cmu-mop-patches.lisp +;;; +;;; part of +;;; +;;; Elephant: an object-oriented database for Common Lisp +;;; +;;; Copyright (c) 2004 by Andrew Blumberg and Ben Lee +;;; <ablumberg(a)common-lisp.net> <blee(a)common-lisp.net> +;;; +;;; Elephant users are granted the rights to distribute and use this software +;;; as governed by the terms of the Lisp Lesser GNU Public License +;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. +;;; + + #+cmu (in-package :PCL) @@ -93,4 +108,4 @@ (unless (eq owrapper nwrapper) (update-inline-access class) (update-pv-table-cache-info class) - (maybe-update-standard-class-locations class))))) \ No newline at end of file + (maybe-update-standard-class-locations class))))) --- /project/elephant/cvsroot/elephant/src/collections.lisp 2006/01/24 15:42:30 1.13 +++ /project/elephant/cvsroot/elephant/src/collections.lisp 2006/02/04 22:25:09 1.14 @@ -12,32 +12,9 @@ ;;; Copyright (c) 2004 by Andrew Blumberg and Ben Lee ;;; <ablumberg(a)common-lisp.net> <blee(a)common-lisp.net> ;;; -;;; This program is released under the following license -;;; ("GPL"). For differenct licensing terms, contact the -;;; copyright holders. -;;; -;;; This program is free software; you can redistribute it -;;; and/or modify it under the terms of the GNU General -;;; Public License as published by the Free Software -;;; Foundation; either version 2 of the License, or (at -;;; your option) any later version. -;;; -;;; This program is distributed in the hope that it will be -;;; useful, but WITHOUT ANY WARRANTY; without even the -;;; implied warranty of MERCHANTABILITY or FITNESS FOR A -;;; PARTICULAR PURPOSE. See the GNU General Public License -;;; for more details. -;;; -;;; The GNU General Public License can be found in the file -;;; LICENSE which should have been distributed with this -;;; code. It can also be found at -;;; -;;; http://www.opensource.org/licenses/gpl-license.php -;;; -;;; You should have received a copy of the GNU General -;;; Public License along with this program; if not, write -;;; to the Free Software Foundation, Inc., 59 Temple Place, -;;; Suite 330, Boston, MA 02111-1307 USA +;;; Elephant users are granted the rights to distribute and use this software +;;; as governed by the terms of the Lisp Lesser GNU Public License +;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;; (in-package "ELEPHANT") --- /project/elephant/cvsroot/elephant/src/controller.lisp 2006/01/24 15:42:30 1.14 +++ /project/elephant/cvsroot/elephant/src/controller.lisp 2006/02/04 22:25:09 1.15 @@ -12,34 +12,10 @@ ;;; Copyright (c) 2004 by Andrew Blumberg and Ben Lee ;;; <ablumberg(a)common-lisp.net> <blee(a)common-lisp.net> ;;; -;;; This program is released under the following license -;;; ("GPL"). For differenct licensing terms, contact the -;;; copyright holders. +;;; Elephant users are granted the rights to distribute and use this software +;;; as governed by the terms of the Lisp Lesser GNU Public License +;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;; -;;; This program is free software; you can redistribute it -;;; and/or modify it under the terms of the GNU General -;;; Public License as published by the Free Software -;;; Foundation; either version 2 of the License, or (at -;;; your option) any later version. -;;; -;;; This program is distributed in the hope that it will be -;;; useful, but WITHOUT ANY WARRANTY; without even the -;;; implied warranty of MERCHANTABILITY or FITNESS FOR A -;;; PARTICULAR PURPOSE. See the GNU General Public License -;;; for more details. -;;; -;;; The GNU General Public License can be found in the file -;;; LICENSE which should have been distributed with this -;;; code. It can also be found at -;;; -;;; http://www.opensource.org/licenses/gpl-license.php -;;; -;;; You should have received a copy of the GNU General -;;; Public License along with this program; if not, write -;;; to the Free Software Foundation, Inc., 59 Temple Place, -;;; Suite 330, Boston, MA 02111-1307 USA -;;; - (in-package "ELEPHANT") @@ -48,7 +24,7 @@ ;; controller from it. (defvar *strategies* '()) -(defvar *elephant-lib-path* "/usr/local/share/common-lisp/elephant-0.3/") +(defvar *elephant-lib-path* "/usr/local/share/common-lisp/elephant/") (defun register-strategy (spec-to-controller) (setq *strategies* (delete spec-to-controller *strategies*)) @@ -184,7 +160,6 @@ #-ALLEGRO (declare (type btree-index v) (type indexed-btree dstibt)) (let ((kf (key-form v))) - (format t " kf ~A ~%" kf) (let ((index (build-btree-index dstsc :primary dstibt :key-form kf))) --- /project/elephant/cvsroot/elephant/src/elephant.lisp 2006/01/25 16:58:25 1.18 +++ /project/elephant/cvsroot/elephant/src/elephant.lisp 2006/02/04 22:25:09 1.19 @@ -12,32 +12,9 @@ ;;; Copyright (c) 2004 by Andrew Blumberg and Ben Lee ;;; <ablumberg(a)common-lisp.net> <blee(a)common-lisp.net> ;;; -;;; This program is released under the following license -;;; ("GPL"). For differenct licensing terms, contact the -;;; copyright holders. -;;; -;;; This program is free software; you can redistribute it -;;; and/or modify it under the terms of the GNU General -;;; Public License as published by the Free Software -;;; Foundation; either version 2 of the License, or (at -;;; your option) any later version. -;;; -;;; This program is distributed in the hope that it will be -;;; useful, but WITHOUT ANY WARRANTY; without even the -;;; implied warranty of MERCHANTABILITY or FITNESS FOR A -;;; PARTICULAR PURPOSE. See the GNU General Public License -;;; for more details. -;;; -;;; The GNU General Public License can be found in the file -;;; LICENSE which should have been distributed with this -;;; code. It can also be found at -;;; -;;; http://www.opensource.org/licenses/gpl-license.php -;;; -;;; You should have received a copy of the GNU General -;;; Public License along with this program; if not, write -;;; to the Free Software Foundation, Inc., 59 Temple Place, -;;; Suite 330, Boston, MA 02111-1307 USA +;;; Elephant users are granted the rights to distribute and use this software +;;; as governed by the terms of the Lisp Lesser GNU Public License +;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;; (defpackage elephant --- /project/elephant/cvsroot/elephant/src/metaclasses.lisp 2006/01/24 15:42:30 1.10 +++ /project/elephant/cvsroot/elephant/src/metaclasses.lisp 2006/02/04 22:25:09 1.11 @@ -11,33 +11,11 @@ ;;; ;;; Copyright (c) 2004 by Andrew Blumberg and Ben Lee ;;; <ablumberg(a)common-lisp.net> <blee(a)common-lisp.net> +;;; (Some changes by Robert L. Read, 2006) ;;; -;;; This program is released under the following license -;;; ("GPL"). For differenct licensing terms, contact the -;;; copyright holders. -;;; -;;; This program is free software; you can redistribute it -;;; and/or modify it under the terms of the GNU General -;;; Public License as published by the Free Software -;;; Foundation; either version 2 of the License, or (at -;;; your option) any later version. -;;; -;;; This program is distributed in the hope that it will be -;;; useful, but WITHOUT ANY WARRANTY; without even the -;;; implied warranty of MERCHANTABILITY or FITNESS FOR A -;;; PARTICULAR PURPOSE. See the GNU General Public License -;;; for more details. -;;; -;;; The GNU General Public License can be found in the file -;;; LICENSE which should have been distributed with this -;;; code. It can also be found at -;;; -;;; http://www.opensource.org/licenses/gpl-license.php -;;; -;;; You should have received a copy of the GNU General -;;; Public License along with this program; if not, write -;;; to the Free Software Foundation, Inc., 59 Temple Place, -;;; Suite 330, Boston, MA 02111-1307 USA +;;; Elephant users are granted the rights to distribute and use this software +;;; as governed by the terms of the Lisp Lesser GNU Public License +;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;; (in-package "ELEPHANT") --- /project/elephant/cvsroot/elephant/src/openmcl-mop-patches.lisp 2006/01/27 01:49:36 1.1 +++ /project/elephant/cvsroot/elephant/src/openmcl-mop-patches.lisp 2006/02/04 22:25:09 1.2 @@ -1,3 +1,17 @@ +;;; openmcl-mop-patches.lisp +;;; +;;; part of +;;; +;;; Elephant: an object-oriented database for Common Lisp +;;; +;;; Copyright (c) 2006 by Andrew Blumberg +;;; <ablumberg(a)common-lisp.net> +;;; +;;; Elephant users are granted the rights to distribute and use this software +;;; as governed by the terms of the Lisp Lesser GNU Public License +;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. +;;; + (in-package :CCL) (let ((*warn-if-redefine-kernel* nil)) @@ -63,4 +77,4 @@ :colon))) (if (and (eql 0 instance-count) (eql 0 shared-count) (eql n shared-end)) (values nil "No Slots" :comment) - (line-n-out-of-range i n))))))))))) \ No newline at end of file + (line-n-out-of-range i n))))))))))) --- /project/elephant/cvsroot/elephant/src/serializer.lisp 2005/12/05 15:08:35 1.12 +++ /project/elephant/cvsroot/elephant/src/serializer.lisp 2006/02/04 22:25:09 1.13 @@ -9,35 +9,9 @@ ;;; ;;; Elephant: an object-oriented database for Common Lisp ;;; -;;; Copyright (c) 2004 by Andrew Blumberg and Ben Lee -;;; <ablumberg(a)common-lisp.net> <blee(a)common-lisp.net> -;;; -;;; This program is released under the following license -;;; ("GPL"). For differenct licensing terms, contact the -;;; copyright holders. -;;; -;;; This program is free software; you can redistribute it -;;; and/or modify it under the terms of the GNU General -;;; Public License as published by the Free Software -;;; Foundation; either version 2 of the License, or (at -;;; your option) any later version. -;;; -;;; This program is distributed in the hope that it will be -;;; useful, but WITHOUT ANY WARRANTY; without even the -;;; implied warranty of MERCHANTABILITY or FITNESS FOR A -;;; PARTICULAR PURPOSE. See the GNU General Public License -;;; for more details. -;;; -;;; The GNU General Public License can be found in the file -;;; LICENSE which should have been distributed with this -;;; code. It can also be found at -;;; -;;; http://www.opensource.org/licenses/gpl-license.php -;;; -;;; You should have received a copy of the GNU General -;;; Public License along with this program; if not, write -;;; to the Free Software Foundation, Inc., 59 Temple Place, -;;; Suite 330, Boston, MA 02111-1307 USA +;;; Elephant users are granted the rights to distribute and use this software +;;; as governed by the terms of the Lisp Lesser GNU Public License +;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;; (in-package "ELEPHANT") --- /project/elephant/cvsroot/elephant/src/sleepycat.lisp 2006/01/29 01:08:32 1.17 +++ /project/elephant/cvsroot/elephant/src/sleepycat.lisp 2006/02/04 22:25:09 1.18 @@ -12,34 +12,10 @@ ;;; Copyright (c) 2004 by Andrew Blumberg and Ben Lee ;;; <ablumberg(a)common-lisp.net> <blee(a)common-lisp.net> ;;; -;;; This program is released under the following license -;;; ("GPL"). For differenct licensing terms, contact the -;;; copyright holders. +;;; Elephant users are granted the rights to distribute and use this software +;;; as governed by the terms of the Lisp Lesser GNU Public License +;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;; -;;; This program is free software; you can redistribute it -;;; and/or modify it under the terms of the GNU General -;;; Public License as published by the Free Software -;;; Foundation; either version 2 of the License, or (at -;;; your option) any later version. -;;; -;;; This program is distributed in the hope that it will be -;;; useful, but WITHOUT ANY WARRANTY; without even the -;;; implied warranty of MERCHANTABILITY or FITNESS FOR A -;;; PARTICULAR PURPOSE. See the GNU General Public License -;;; for more details. -;;; -;;; The GNU General Public License can be found in the file -;;; LICENSE which should have been distributed with this -;;; code. It can also be found at -;;; -;;; http://www.opensource.org/licenses/gpl-license.php -;;; -;;; You should have received a copy of the GNU General -;;; Public License along with this program; if not, write -;;; to the Free Software Foundation, Inc., 59 Temple Place, -;;; Suite 330, Boston, MA 02111-1307 USA -;;; - (defpackage sleepycat (:documentation "A low-level UFFI-based interface to --- /project/elephant/cvsroot/elephant/src/sql-collections.lisp 2005/11/23 17:51:37 1.2 +++ /project/elephant/cvsroot/elephant/src/sql-collections.lisp 2006/02/04 22:25:09 1.3 @@ -10,33 +10,11 @@ ;;; Elephant: an object-oriented database for Common Lisp ;;; ;;; Copyright (c) 2005 by Robert L. Read +;;; <rread(a)common-lisp.net> ;;; -;;; This program is released under the following license -;;; ("GPL"). For differenct licensing terms, contact the -;;; copyright holders. -;;; -;;; This program is free software; you can redistribute it -;;; and/or modify it under the terms of the GNU General -;;; Public License as published by the Free Software -;;; Foundation; either version 2 of the License, or (at -;;; your option) any later version. -;;; -;;; This program is distributed in the hope that it will be -;;; useful, but WITHOUT ANY WARRANTY; without even the -;;; implied warranty of MERCHANTABILITY or FITNESS FOR A -;;; PARTICULAR PURPOSE. See the GNU General Public License -;;; for more details. -;;; -;;; The GNU General Public License can be found in the file -;;; LICENSE which should have been distributed with this -;;; code. It can also be found at -;;; -;;; http://www.opensource.org/licenses/gpl-license.php -;;; -;;; You should have received a copy of the GNU General -;;; Public License along with this program; if not, write -;;; to the Free Software Foundation, Inc., 59 Temple Place, -;;; Suite 330, Boston, MA 02111-1307 USA +;;; Elephant users are granted the rights to distribute and use this software +;;; as governed by the terms of the Lisp Lesser GNU Public License +;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;; (in-package "ELEPHANT") --- /project/elephant/cvsroot/elephant/src/sql-controller.lisp 2006/01/29 01:08:32 1.4 +++ /project/elephant/cvsroot/elephant/src/sql-controller.lisp 2006/02/04 22:25:09 1.5 @@ -11,32 +11,9 @@ ;;; ;;; Copyright (c) 2005 by Robert L. Read ;;; -;;; This program is released under the following license -;;; ("GPL"). For differenct licensing terms, contact the -;;; copyright holders. -;;; -;;; This program is free software; you can redistribute it -;;; and/or modify it under the terms of the GNU General -;;; Public License as published by the Free Software -;;; Foundation; either version 2 of the License, or (at -;;; your option) any later version. -;;; -;;; This program is distributed in the hope that it will be -;;; useful, but WITHOUT ANY WARRANTY; without even the -;;; implied warranty of MERCHANTABILITY or FITNESS FOR A -;;; PARTICULAR PURPOSE. See the GNU General Public License -;;; for more details. -;;; -;;; The GNU General Public License can be found in the file -;;; LICENSE which should have been distributed with this -;;; code. It can also be found at -;;; -;;; http://www.opensource.org/licenses/gpl-license.php -;;; -;;; You should have received a copy of the GNU General -;;; Public License along with this program; if not, write -;;; to the Free Software Foundation, Inc., 59 Temple Place, -;;; Suite 330, Boston, MA 02111-1307 USA +;;; Elephant users are granted the rights to distribute and use this software +;;; as governed by the terms of the Lisp Lesser GNU Public License +;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;; (in-package "ELEPHANT") --- /project/elephant/cvsroot/elephant/src/sql-tutorial.lisp 2005/11/23 17:51:38 1.2 +++ /project/elephant/cvsroot/elephant/src/sql-tutorial.lisp 2006/02/04 22:25:09 1.3 @@ -1,3 +1,16 @@ +;;; sql-tutorial.lisp +;;; +;;; part of +;;; +;;; Elephant: an object-oriented database for Common Lisp +;;; +;;; +;;; Elephant users are granted the rights to distribute and use this software +;;; as governed by the terms of the Lisp Lesser GNU Public License +;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. + + + (asdf:operate 'asdf:load-op :elephant) (asdf:operate 'asdf:load-op :ele-bdb) (asdf:operate 'asdf:load-op :elephant-tests) --- /project/elephant/cvsroot/elephant/src/utils.lisp 2005/11/23 17:51:38 1.9 +++ /project/elephant/cvsroot/elephant/src/utils.lisp 2006/02/04 22:25:09 1.10 @@ -12,32 +12,9 @@ ;;; Copyright (c) 2004 by Andrew Blumberg and Ben Lee ;;; <ablumberg(a)common-lisp.net> <blee(a)common-lisp.net> ;;; -;;; This program is released under the following license -;;; ("GPL"). For differenct licensing terms, contact the -;;; copyright holders. -;;; -;;; This program is free software; you can redistribute it -;;; and/or modify it under the terms of the GNU General -;;; Public License as published by the Free Software -;;; Foundation; either version 2 of the License, or (at -;;; your option) any later version. -;;; -;;; This program is distributed in the hope that it will be -;;; useful, but WITHOUT ANY WARRANTY; without even the -;;; implied warranty of MERCHANTABILITY or FITNESS FOR A -;;; PARTICULAR PURPOSE. See the GNU General Public License -;;; for more details. -;;; -;;; The GNU General Public License can be found in the file -;;; LICENSE which should have been distributed with this -;;; code. It can also be found at -;;; -;;; http://www.opensource.org/licenses/gpl-license.php -;;; -;;; You should have received a copy of the GNU General -;;; Public License along with this program; if not, write -;;; to the Free Software Foundation, Inc., 59 Temple Place, -;;; Suite 330, Boston, MA 02111-1307 USA +;;; Elephant users are granted the rights to distribute and use this software +;;; as governed by the terms of the Lisp Lesser GNU Public License +;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL. ;;;

1 0

[elephant-cvs] CVS elephant
by rread 04 Feb '06

04 Feb '06

Update of /project/elephant/cvsroot/elephant In directory common-lisp:/tmp/cvs-serv456 Modified Files: LICENSE TODO ele-bdb.asd ele-clsql.asd elephant.asd Log Message: Mostly changing to LLGPL --- /project/elephant/cvsroot/elephant/LICENSE 2004/09/19 17:37:25 1.3 +++ /project/elephant/cvsroot/elephant/LICENSE 2006/02/04 22:25:09 1.4 @@ -2,380 +2,21 @@ Copyright (c) 2004 by Andrew Blumberg and Ben Lee <ablumberg(a)common-lisp.net> <blee(a)common-lisp.net> +Some parts Copyright (c) 2005,2006 Robert L. Read +<rread(a)common-lisp.net>. -This program is released under the following license -("GPL"). For differenct licensing terms, contact the -copyright holders. +Elephant users are granted the rights to distribute and use this software +as governed by the terms of the Lisp Lesser GNU Public License +(http://opensource.franz.com/preamble.html), also known as the LLGPL. + +This preamble, (which I have not included here, as it is copyrighted +by Franz, Incorporated), references the GNU LESSER GENERAL PUBLIC LICENSE +although the preamble makes certain modifications to it that are often +thought of as particularly appropriate for LISP. + +Version of Elephant before version 0.5.0 where released under GPL. +With the permission of Andrew Blumberg, Ben Lee and Robert L. Read, +the primary contributors of elephant code up until this time, the +0.5.0 release is made under the LLGPL. -Portions of this program (namely the C unicode string -sorter) are derived from IBM's ICU: - -http://oss.software.ibm.com/icu/ - -whose copyright and license follows the GPL below. - -The GNU General Public License (GPL) -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc. -59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Everyone is permitted to copy and distribute verbatim copies -of this license document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away -your freedom to share and change it. By contrast, the GNU -General Public License is intended to guarantee your freedom -to share and change free software--to make sure the software -is free for all its users. This General Public License -applies to most of the Free Software Foundation's software -and to any other program whose authors commit to using -it. (Some other Free Software Foundation software is covered -by the GNU Library General Public License instead.) You can -apply it to your programs, too. - -When we speak of free software, we are referring to freedom, -not price. Our General Public Licenses are designed to make -sure that you have the freedom to distribute copies of free -software (and charge for this service if you wish), that you -receive source code or can get it if you want it, that you -can change the software or use pieces of it in new free -programs; and that you know you can do these things. - -To protect your rights, we need to make restrictions that -forbid anyone to deny you these rights or to ask you to -surrender the rights. These restrictions translate to -certain responsibilities for you if you distribute copies of -the software, or if you modify it. - -For example, if you distribute copies of such a program, -whether gratis or for a fee, you must give the recipients -all the rights that you have. You must make sure that they, -too, receive or can get the source code. And you must show -them these terms so they know their rights. - -We protect your rights with two steps: (1) copyright the -software, and (2) offer you this license which gives you -legal permission to copy, distribute and/or modify the -software. - -Also, for each author's protection and ours, we want to make -certain that everyone understands that there is no warranty -for this free software. If the software is modified by -someone else and passed on, we want its recipients to know -that what they have is not the original, so that any -problems introduced by others will not reflect on the -original authors' reputations. - -Finally, any free program is threatened constantly by -software patents. We wish to avoid the danger that -redistributors of a free program will individually obtain -patent licenses, in effect making the program -proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not -licensed at all. - -The precise terms and conditions for copying, distribution -and modification follow. - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which -contains a notice placed by the copyright holder saying it -may be distributed under the terms of this General Public -License. The "Program", below, refers to any such program or -work, and a "work based on the Program" means either the -Program or any derivative work under copyright law: that is -to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into -another language. (Hereinafter, translation is included -without limitation in the term "modification".) Each -licensee is addressed as "you". - -Activities other than copying, distribution and modification -are not covered by this License; they are outside its -scope. The act of running the Program is not restricted, and -the output from the Program is covered only if its contents -constitute a work based on the Program (independent of -having been made by running the Program). Whether that is -true depends on what the Program does. - -1. You may copy and distribute verbatim copies of the -Program's source code as you receive it, in any medium, -provided that you conspicuously and appropriately publish on -each copy an appropriate copyright notice and disclaimer of -warranty; keep intact all the notices that refer to this -License and to the absence of any warranty; and give any -other recipients of the Program a copy of this License along -with the Program. - -You may charge a fee for the physical act of transferring a -copy, and you may at your option offer warranty protection -in exchange for a fee. - -2. You may modify your copy or copies of the Program or any -portion of it, thus forming a work based on the Program, and -copy and distribute such modifications or work under the -terms of Section 1 above, provided that you also meet all of -these conditions: - - a) You must cause the modified files to carry prominent -notices stating that you changed the files and the date of -any change. - - b) You must cause any work that you distribute or -publish, that in whole or in part contains or is derived -from the Program or any part thereof, to be licensed as a -whole at no charge to all third parties under the terms of -this License. - - c) If the modified program normally reads commands -interactively when run, you must cause it, when started -running for such interactive use in the most ordinary way, -to print or display an announcement including an appropriate -copyright notice and a notice that there is no warranty (or -else, saying that you provide a warranty) and that users may -redistribute the program under these conditions, and telling -the user how to view a copy of this License. (Exception: if -the Program itself is interactive but does not normally -print such an announcement, your work based on the Program -is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the -Program, and can be reasonably considered independent and -separate works in themselves, then this License, and its -terms, do not apply to those sections when you distribute -them as separate works. But when you distribute the same -sections as part of a whole which is a work based on the -Program, the distribution of the whole must be on the terms -of this License, whose permissions for other licensees -extend to the entire whole, and thus to each and every part -regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights -or contest your rights to work written entirely by you; -rather, the intent is to exercise the right to control the -distribution of derivative or collective works based on the -Program. - -In addition, mere aggregation of another work not based on -the Program with the Program (or with a work based on the -Program) on a volume of a storage or distribution medium -does not bring the other work under the scope of this -License. - -3. You may copy and distribute the Program (or a work based -on it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you -also do one of the following: - - a) Accompany it with the complete corresponding -machine-readable source code, which must be distributed -under the terms of Sections 1 and 2 above on a medium -customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least -three years, to give any third party, for a charge no more -than your cost of physically performing source distribution, -a complete machine-readable copy of the corresponding source -code, to be distributed under the terms of Sections 1 and 2 -above on a medium customarily used for software interchange; -or, - - c) Accompany it with the information you received as to -the offer to distribute corresponding source code. (This -alternative is allowed only for noncommercial distribution -and only if you received the program in object code or -executable form with such an offer, in accord with -Subsection b above.) - -The source code for a work means the preferred form of the -work for making modifications to it. For an executable work, -complete source code means all the source code for all -modules it contains, plus any associated interface -definition files, plus the scripts used to control -compilation and installation of the executable. However, as -a special exception, the source code distributed need not -include anything that is normally distributed (in either -source or binary form) with the major components (compiler, -kernel, and so on) of the operating system on which the -executable runs, unless that component itself accompanies -the executable. - -If distribution of executable or object code is made by -offering access to copy from a designated place, then -offering equivalent access to copy the source code from the -same place counts as distribution of the source code, even -though third parties are not compelled to copy the source -along with the object code. - -4. You may not copy, modify, sublicense, or distribute the -Program except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense or distribute -the Program is void, and will automatically terminate your -rights under this License. However, parties who have -received copies, or rights, from you under this License will -not have their licenses terminated so long as such parties -remain in full compliance. - -5. You are not required to accept this License, since you -have not signed it. However, nothing else grants you -permission to modify or distribute the Program or its -derivative works. These actions are prohibited by law if you -do not accept this License. Therefore, by modifying or -distributing the Program (or any work based on the Program), -you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or -modifying the Program or works based on it. - -6. Each time you redistribute the Program (or any work based -on the Program), the recipient automatically receives a -license from the original licensor to copy, distribute or -modify the Program subject to these terms and -conditions. You may not impose any further restrictions on -the recipients' exercise of the rights granted herein. You -are not responsible for enforcing compliance by third -parties to this License. - -7. If, as a consequence of a court judgment or allegation of -patent infringement or for any other reason (not limited to -patent issues), conditions are imposed on you (whether by -court order, agreement or otherwise) that contradict the -conditions of this License, they do not excuse you from the -conditions of this License. If you cannot distribute so as -to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a -consequence you may not distribute the Program at all. For -example, if a patent license would not permit royalty-free -redistribution of the Program by all those who receive -copies directly or indirectly through you, then the only way -you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or -unenforceable under any particular circumstance, the balance -of the section is intended to apply and the section as a -whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to -infringe any patents or other property right claims or to -contest validity of any such claims; this section has the -sole purpose of protecting the integrity of the free -software distribution system, which is implemented by public -license practices. Many people have made generous -contributions to the wide range of software distributed -through that system in reliance on consistent application of -that system; it is up to the author/donor to decide if he or -she is willing to distribute software through any other -system and a licensee cannot impose that choice. - -This section is intended to make thoroughly clear what is -believed to be a consequence of the rest of this License. - -8. If the distribution and/or use of the Program is -restricted in certain countries either by patents or by -copyrighted interfaces, the original copyright holder who -places the Program under this License may add an explicit -geographical distribution limitation excluding those -countries, so that distribution is permitted only in or -among countries not thus excluded. In such case, this -License incorporates the limitation as if written in the -body of this License. - -9. The Free Software Foundation may publish revised and/or -new versions of the General Public License from time to -time. Such new versions will be similar in spirit to the -present version, but may differ in detail to address new -problems or concerns. - -Each version is given a distinguishing version number. If -the Program specifies a version number of this License which -applies to it and "any later version", you have the option -of following the terms and conditions either of that version -or of any later version published by the Free Software -Foundation. If the Program does not specify a version number -of this License, you may choose any version ever published -by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into -other free programs whose distribution conditions are -different, write to the author to ask for permission. For -software which is copyrighted by the Free Software -Foundation, write to the Free Software Foundation; we -sometimes make exceptions for this. Our decision will be -guided by the two goals of preserving the free status of all -derivatives of our free software and of promoting the -sharing and reuse of software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS -NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE -COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM -"AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR -IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE -OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE -DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED -TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY -WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED -ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, -SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF -THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT -LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR -LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE -PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH -HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - -END OF TERMS AND CONDITIONS - - - -ICU License - ICU 1.8.1 and later -COPYRIGHT AND PERMISSION NOTICE - -Copyright (c) 1995-2003 International Business Machines -Corporation and others All rights reserved. - -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated -documentation files (the "Software"), to deal in the -Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, -and/or sell copies of the Software, and to permit persons to -whom the Software is furnished to do so, provided that the -above copyright notice(s) and this permission notice appear -in all copies of the Software and that both the above -copyright notice(s) and this permission notice appear in -supporting documentation. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY -KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO -EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS -NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR -CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF -CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT -OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -SOFTWARE. - -Except as contained in this notice, the name of a copyright -holder shall not be used in advertising or otherwise to -promote the sale, use or other dealings in this Software -without prior written authorization of the copyright holder. - ------------------------------------------------------------- -All trademarks and registered trademarks mentioned herein -are the property of their respective owners. --- /project/elephant/cvsroot/elephant/TODO 2005/11/23 17:51:31 1.8 +++ /project/elephant/cvsroot/elephant/TODO 2006/02/04 22:25:09 1.9 @@ -1,3 +1,25 @@ +Feb. 4, 2006 + +As of 0.5.0, we have seem to have a stable suite on +ACL, SBCL, and OpenMCL. + +The things I would most like to see improved are: + +1) Robustness around error handling. +2) Ian Eslick has written some great indexing stuff in a branch +that I intend to merge in after this release. +3) The SQL serializer could be made more efficiently very +easily, greatly enhancing the speed of that as a back-end. + + +In general, Elephant is very usable and modestly robust, +but heavier use, better documentation, and a good example +application would help it a lot. + + + + + Merge in the todos from the source and the NOTES! October 19, 2005 --- /project/elephant/cvsroot/elephant/ele-bdb.asd 2006/01/25 22:18:03 1.3 +++ /project/elephant/cvsroot/elephant/ele-bdb.asd 2006/02/04 22:25:09 1.4 @@ -43,10 +43,10 @@ (defsystem ele-bdb :name "ele-bdb" - :author "Robert L. Read <read(a)robertlread.net>" + :author "Robert L. Read <rread(a)common-lisp.net>" :version "0.1" - :maintainer "Robert L. Read <read(a)robertlread.net>" - :licence "GPL" + :maintainer "Robert L. Read <rread(a)common-lisp.net>" + :licence "LLGPL" :description "Berkeley-DB based Object respository for Common Lisp" :long-description "Including this loads the Berkeley-DB code; you may have to edit the pathname!" :components --- /project/elephant/cvsroot/elephant/ele-clsql.asd 2005/11/23 17:51:31 1.2 +++ /project/elephant/cvsroot/elephant/ele-clsql.asd 2006/02/04 22:25:09 1.3 @@ -46,7 +46,7 @@ :author "Robert L. Read <read(a)robertlread.net>" :version "0.1" :maintainer "Robert L. Read <read(a)robertlread.net>" - :licence "GPL" + :licence "LLGPL" :description "SQL-based Object respository for Common Lisp" :long-description "An experimental CL-SQL based implementation of Elephant" --- /project/elephant/cvsroot/elephant/elephant.asd 2006/01/26 03:17:56 1.10 +++ /project/elephant/cvsroot/elephant/elephant.asd 2006/02/04 22:25:09 1.11 @@ -43,9 +43,9 @@ (defsystem elephant :name "elephant" :author "Ben Lee <blee(a)common-lisp.net>" - :version "0.1" + :version "0.5.0" :maintainer "Ben Lee <blee(a)common-lisp.net>" - :licence "GPL" + :licence "LLGPL" :description "Object database for Common Lisp" :long-description "An object-oriented database based on Berkeley DB, for CMUCL/SBCL, OpenMCL, and Allegro."

1 0

[elephant-cvs] CVS elephant/tests
by rread 04 Feb '06

04 Feb '06

Update of /project/elephant/cvsroot/elephant/tests In directory common-lisp:/tmp/cvs-serv18077 Modified Files: testcollections.lisp testmigration.lisp Log Message: This directory used for some initial tests. --- /project/elephant/cvsroot/elephant/tests/testcollections.lisp 2006/01/25 15:36:32 1.7 +++ /project/elephant/cvsroot/elephant/tests/testcollections.lisp 2006/02/04 20:34:02 1.8 @@ -713,3 +713,20 @@ ;; (equal (get-value 10 ibt) 4))) ;; ) ;; t) + + + +;; (deftest class-change-deletion +;; (progn +;; (defclass blob-tbc () +;; ((slot1 :accessor slot1 :initarg :slot1) +;; (slot2 :accessor slot2 :initarg :slot2))) +;; (add-to-root "blob" (make-instance 'blob-tbc)) +;; (defclass blob-tbc () +;; ((slot1 :accessor slot1 :initarg :slot1) +;; (slot3 :accessor slot3 :initarg :slot3))) +;; (remove-from-root "blob") +;; (get-from-root "blob") +;; ) +;; nil nil) + --- /project/elephant/cvsroot/elephant/tests/testmigration.lisp 2006/01/24 18:25:01 1.3 +++ /project/elephant/cvsroot/elephant/tests/testmigration.lisp 2006/02/04 20:34:02 1.4 @@ -156,46 +156,38 @@ (progn (format t "*test-path-secondary* and *test-path-primary* not both set, skipping this test.") t) - (finishes - (let ((old-store *store-controller*) - (*prev-commit* *auto-commit*) - (*auto-commit* t)) - (unwind-protect - (let ((osc (if (subtypep (type-of *store-controller*) 'sql-store-controller) - (open-store *test-path-primary*) - (open-store *test-path-secondary*) - ))) -;; really need to test the an error is thrown when attempting to migrate -;; non-persistent object! - (let* ((f1 (make-instance 'pfoo :sc *store-controller*)) - (f2 (make-instance 'pfoo :slot1 "this is a string" :sc *store-controller*)) - (b1 (make-instance 'pbar :slot2 "another string" :sc *store-controller*)) - ) - (let ((fm1 - (ele::migraten-pobj - osc f1 - #'(lambda (dst src) - (if (slot-boundp src 'slot1) - (setf (slot1 dst) (slot1 src)))))) - (fm2 - (ele::migraten-pobj - osc f2 - #'(lambda (dst src) - (if (slot-boundp src 'slot1) - (setf (slot1 dst) (slot1 src)))))) - (bm1 (ele::migraten-pobj - osc b1 - #'(lambda (dst src) - (if (slot-boundp src 'slot2) - (setf (slot2 dst) (slot2 src)))))) - ) - (and - (and (not (slot-boundp fm1 'slot1)) - (not (slot-boundp f1 'slot1))) - (equal (slot1 fm2) (slot1 f2)) - (equal (slot2 bm1) (slot2 b1)))))) - (progn - (setq *store-controller* old-store) + (let ((*prev-commit* *auto-commit*)) + (prog2 + (setq *auto-commit* t) + (let ( + (sc1 (open-store *test-path-primary*)) + (sc2 (open-store *test-path-secondary*))) + (let* ((f1 (make-instance 'pfoo :sc sc1)) + (f2 (make-instance 'pfoo :slot1 "this is a string" :sc sc1)) + (b1 (make-instance 'pbar :slot2 "another string" :sc sc1)) + ) + (let ((fm1 + (ele::migraten-pobj + sc2 f1 + #'(lambda (dst src) + (if (slot-boundp src 'slot1) + (setf (slot1 dst) (slot1 src)))))) + (fm2 + (ele::migraten-pobj + sc2 f2 + #'(lambda (dst src) + (if (slot-boundp src 'slot1) + (setf (slot1 dst) (slot1 src)))))) + (bm1 (ele::migraten-pobj + sc2 b1 + #'(lambda (dst src) + (if (slot-boundp src 'slot2) + (setf (slot2 dst) (slot2 src)))))) + ) + (and + (and (not (slot-boundp fm1 'slot1)) + (not (slot-boundp f1 'slot1))) + (equal (slot1 fm2) (slot1 f2)) + (equal (slot2 bm1) (slot2 b1)))))) (setq *auto-commit* *prev-commit*)))) - )) - t) + t)

1 0

[elephant-cvs] CVS elephant/tests/testsleepycat
by rread 04 Feb '06

04 Feb '06

Update of /project/elephant/cvsroot/elephant/tests/testsleepycat In directory common-lisp:/tmp/cvs-serv18077/testsleepycat Added Files: PLACEHOLDER.txt Log Message: This directory used for some initial tests. --- /project/elephant/cvsroot/elephant/tests/testsleepycat/PLACEHOLDER.txt 2006/02/04 20:34:04 NONE +++ /project/elephant/cvsroot/elephant/tests/testsleepycat/PLACEHOLDER.txt 2006/02/04 20:34:04 1.1

1 0

[elephant-cvs] CVS elephant/src
by ieslick 03 Feb '06

03 Feb '06

Update of /project/elephant/cvsroot/elephant/src In directory common-lisp:/tmp/cvs-serv4342/src Added Files: Tag: ELEPHANT-0-4-1-rc1-IAN index-tutorial.lisp Log Message: Simple persistent log tutorial template in src.

1 0

[elephant-cvs] CVS elephant/tests
by ieslick 02 Feb '06

02 Feb '06

Update of /project/elephant/cvsroot/elephant/tests In directory common-lisp:/tmp/cvs-serv6576/tests Modified Files: Tag: ELEPHANT-0-4-1-rc1-IAN elephant-tests.lisp testindexing.lisp Log Message: There may be a bug or two left, but the major locking problems have been resolved. Interactions due to reconnecting to databases can be problematic (i.e. indexing a new object when a cursor is walking the indices for that object leads to deadlock in the bdb code where the cursor has a read lock on an index that the persistent indexing wanted to write) More tests needed, but the system appears largely stable now. --- /project/elephant/cvsroot/elephant/tests/elephant-tests.lisp 2006/01/30 04:55:00 1.7.2.3 +++ /project/elephant/cvsroot/elephant/tests/elephant-tests.lisp 2006/02/02 21:48:39 1.7.2.4 @@ -127,10 +127,11 @@ (do-all-tests-spec *testsqlite3-path*) )) -(defun do-all-tests-spec(spec) +(defun do-all-tests-spec (spec) (when spec (with-open-store (spec) (let ((*auto-commit* nil)) + (declare (special *auto-commit*)) (do-tests))))) (defun do-test-spec (testname &optional (spec *testdb-path*)) @@ -141,14 +142,21 @@ (do-test testname))))) (defun do-indexing-tests () - (setf *old-store* *store-controller*) - (open-store *testdb-path*) - (print (do-test 'indexing-basic)) - (print (do-test 'indexing-inherit)) - (print (do-test 'indexing-range)) - (print (do-test 'indexing-reconnect-db)) - (close-store) - (setf *store-controller* *old-store*)) + (declare (special *old-store*)) + (setq *old-store* *store-controller*) + (unwind-protect + (progn + (open-store *testdb-path*) + (print (do-test 'indexing-basic)) + (print (do-test 'indexing-inherit)) + (print (do-test 'indexing-range)) + (print (do-test 'indexing-reconnect-db)) + (print (do-test 'indexing-change-class)) + (print (do-test 'indexing-redef-class)) + (print (do-test 'indexing-explicit-changes)) + (print (do-test 'indexing-timing)) + (close-store)) + (setq *store-controller* *old-store*))) (defun do-crazy-pg-tests() (open-store *testpg-path*)

1 0

[elephant-cvs] CVS elephant/src
by ieslick 02 Feb '06

02 Feb '06

Update of /project/elephant/cvsroot/elephant/src In directory common-lisp:/tmp/cvs-serv6576/src Modified Files: Tag: ELEPHANT-0-4-1-rc1-IAN IAN-TODO classes.lisp controller.lisp index-utils.lisp indexing.lisp Log Message: There may be a bug or two left, but the major locking problems have been resolved. Interactions due to reconnecting to databases can be problematic (i.e. indexing a new object when a cursor is walking the indices for that object leads to deadlock in the bdb code where the cursor has a read lock on an index that the persistent indexing wanted to write) More tests needed, but the system appears largely stable now. --- /project/elephant/cvsroot/elephant/src/classes.lisp 2006/01/30 04:55:00 1.16.2.5 +++ /project/elephant/cvsroot/elephant/src/classes.lisp 2006/02/02 21:48:38 1.16.2.6 @@ -79,20 +79,30 @@ metaclass.") (:metaclass persistent-metaclass)) -(defmethod initialize-instance ((instance persistent-object) &rest initargs) +;;(defmethod print-object ((obj persistent) stream) + +(defmethod initialize-instance ((instance persistent-object) &rest initargs &key from-oid &allow-other-keys) (declare (ignore initargs)) (if (indexed (class-of instance)) - (progn - (inhibit-indexing (oid instance)) - (unwind-protect - (progn - (call-next-method) - (uninhibit-indexing (oid instance)) - (let ((class-index (find-class-index (class-of instance)))) - (with-transaction () - (setf (get-value (oid instance) class-index) instance)))) - (uninhibit-indexing (oid instance)))) - (call-next-method))) + (progn + (let ((oid (oid instance))) + (declare (type fixnum oid)) + (inhibit-indexing oid) + (unwind-protect + (call-next-method) + (uninhibit-indexing oid)) + ;; Inhibit indexing if the object already was defined (ie being created from an oid) + ;; as it should be indexed already. This hack avoids a deadlock situation where we + ;; write the class or index page that we are currently reading via a cursor without + ;; going through the cursor abstraction. There has to be a better way to do this. + (when (not from-oid) + (let ((class-index (find-class-index (class-of instance)))) + (when class-index +;; (format t "Indexing initial instance: ~A :: ~A~%" oid instance) + (with-transaction () + (setf (get-value oid class-index) instance))))))) + ;; else + (call-next-method))) (defmethod shared-initialize :around ((class persistent-metaclass) slot-names &rest args &key direct-superclasses) "Ensures we inherit from persistent-object." --- /project/elephant/cvsroot/elephant/src/controller.lisp 2006/01/29 04:57:20 1.14.2.2 +++ /project/elephant/cvsroot/elephant/src/controller.lisp 2006/02/02 21:48:38 1.14.2.3 @@ -56,15 +56,17 @@ ) (defun get-controller (spec) - (let ((store-controllers nil)) - (dolist (s *strategies*) - (let ((sc (funcall s spec))) - (if sc - (push sc store-controllers)))) - (if (not (= (length store-controllers) 1)) - (error "Strategy resolution for this spec completely failed!") - (car store-controllers)) - )) + (let ((cached-sc (gethash spec *dbconnection-spec*))) + (if cached-sc cached-sc + (let ((store-controllers nil)) + (dolist (s *strategies*) + (let ((sc (funcall s spec))) + (if sc + (push sc store-controllers)))) + (if (not (= (length store-controllers) 1)) + (error "Strategy resolution for this spec completely failed!") + (car store-controllers)) + )))) (defclass store-controller () @@ -359,7 +361,7 @@ (setf (slot-value sc 'class-root) nil) (setf (slot-value sc 'root) nil) ;; clean instance cache - (setf (instance-cache sc) (make-cache-table :test 'eql)) + (reset-instance-cache sc) ;; close handles / environment (db-sequence-close (controller-oid-seq sc)) (setf (controller-oid-seq sc) nil) @@ -375,7 +377,10 @@ (setf (controller-db sc) nil) (db-env-close (controller-environment sc)) (setf (controller-environment sc) nil) - nil)) + nil) + ;; Delete connection spec so object ops on cached db info fail + (remhash (controller-path *store-controller*) *dbconnection-spec*)) + ;; Do these things need to take &rest arguments? (defmethod build-btree ((sc bdb-store-controller)) @@ -426,23 +431,25 @@ the controller unconditionally on exit." `(unwind-protect (progn - (let (*store-controller* (open-controller ,sc)) + (let ((*store-controller* (open-controller ,sc))) (declare (special *store-controller*)) ,@body)) (close-controller ,sc))) (defun close-store () "Conveniently close the store controller." + (declare (special *store-controller*)) (if *store-controller* - (close-controller *store-controller*))) + (progn + (close-controller *store-controller*) + (setf *store-controller* nil)))) (defmacro with-open-store ((spec) &body body) "Executes the body with an open controller, unconditionally closing the controller on exit." - `(let ((*store-controller* - (get-controller ,spec))) + `(let ((*store-controller* (get-controller ,spec))) (declare (special *store-controller*)) -;; (open-controller *store-controller*) + (open-controller *store-controller*) (unwind-protect (progn ,@body) (close-controller *store-controller*))))

1 0

[elephant-cvs] CVS elephant
by ieslick 02 Feb '06

02 Feb '06

Update of /project/elephant/cvsroot/elephant In directory common-lisp:/tmp/cvs-serv6576 Modified Files: Tag: ELEPHANT-0-4-1-rc1-IAN elephant-tests.asd Log Message: There may be a bug or two left, but the major locking problems have been resolved. Interactions due to reconnecting to databases can be problematic (i.e. indexing a new object when a cursor is walking the indices for that object leads to deadlock in the bdb code where the cursor has a read lock on an index that the persistent indexing wanted to write) More tests needed, but the system appears largely stable now. --- /project/elephant/cvsroot/elephant/elephant-tests.asd 2006/01/30 04:54:59 1.4.2.2 +++ /project/elephant/cvsroot/elephant/elephant-tests.asd 2006/02/02 21:48:38 1.4.2.3 @@ -55,9 +55,9 @@ :components ((:file "elephant-tests") (:file "testserializer") + (:file "testsleepycat") (:file "mop-tests") (:file "testcollections") - (:file "testsleepycat") (:file "testindexing") (:file "testmigration") )

1 0

[elephant-cvs] CVS elephant/tests
by ieslick 30 Jan '06

30 Jan '06

Update of /project/elephant/cvsroot/elephant/tests In directory common-lisp:/tmp/cvs-serv16833/tests Modified Files: Tag: ELEPHANT-0-4-1-rc1-IAN testindexing.lisp Log Message: Forgot to add a file of utilities for indexing...

1 0

[elephant-cvs] CVS elephant/src
by ieslick 30 Jan '06

30 Jan '06

Update of /project/elephant/cvsroot/elephant/src In directory common-lisp:/tmp/cvs-serv16833/src Modified Files: Tag: ELEPHANT-0-4-1-rc1-IAN indexing.lisp Added Files: Tag: ELEPHANT-0-4-1-rc1-IAN index-utils.lisp Log Message: Forgot to add a file of utilities for indexing...

1 0

← Newer
1
...
58
59
60
61
62
63
64
...
86
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

elephant-cvs