elephant-cvs January 2006

elephant-cvs@common-lisp.net

2 participants
36 discussions

[elephant-cvs] CVS elephant
by rread 25 Jan '06

25 Jan '06

Update of /project/elephant/cvsroot/elephant In directory common-lisp:/tmp/cvs-serv23860 Modified Files: INSTALL elephant.asd Log Message: Making Andrew's changes. --- /project/elephant/cvsroot/elephant/INSTALL 2005/11/23 17:51:31 1.12 +++ /project/elephant/cvsroot/elephant/INSTALL 2006/01/25 14:09:46 1.13 @@ -122,87 +122,13 @@ for in my code, but expect (use-package "ELE")'s to produce conflicting symbol warnings. ------------ -Quick Start ------------ -(These instructions were correct for Elephant 0.2. They -are now somewhat obsolete in Elephant 0.3; better information -can be found in the formal documentation.) +4) Make the documentation: -For more complete documentation see TUTORIAL and NOTES. But -a REPL session is worth a thousand words, so ... +Execute: --bash-2.05b$ pwd -/home/ben +make --bash-2.05b$ mkdir testdb - --bash-2.05b$ lisp - -CMU Common Lisp 19a, running on archer.uchicago.edu -With core: /usr/local/lib/cmucl/lib/lisp.core -Dumped on: Tue, 2004-08-03 11:19:33-05:00 on snapdragon.csl.sri.com -See <http://www.cons.org/cmucl/> for support information. -Loaded subsystems: - Python 1.1, target Intel x86 - CLOS based on Gerd's PCL 2004/04/14 03:32:47 - -CL-USER> (asdf:operate 'asdf:load-op :elephant) -; loading system definition from elephant.asd into #<The ASDF1841 package> -;... -NIL - -CL-USER> (use-package "ELE") -T - -CL-USER> (open-store "/home/ben/testdb") -#<STORE-CONTROLLER {489C1EDD}> - -CL-USER> (add-to-root "my key" "my string") -NIL - -CL-USER> (get-from-root "my key") -"my string" -T - -CL-USER> (get-from-root "my key2") -NIL -NIL - -CL-USER> (close-store) -NIL - -CL-USER> (quit) -; Evaluation aborted - --bash-2.05b$ lisp - -CMU Common Lisp 19a, running on archer.uchicago.edu -With core: /usr/local/lib/cmucl/lib/lisp.core -Dumped on: Tue, 2004-08-03 11:19:33-05:00 on snapdragon.csl.sri.com -See <http://www.cons.org/cmucl/> for support information. -Loaded subsystems: - Python 1.1, target Intel x86 - CLOS based on Gerd's PCL 2004/04/14 03:32:47 - -CL-USER> (asdf:operate 'asdf:load-op :elephant) -; loading system definition from elephant.asd into #<The ASDF1841 package> -; ... -NIL - -CL-USER> (use-package "ELE") -T - -CL-USER> (open-store "/home/ben/testdb") - -CL-USER> (get-from-root "my key") -"my string" -T - -CL-USER> (close-store) -NIL - -CL-USER> +In the doc directory should be build the HTML version of the texinfo files. ------- Testing --- /project/elephant/cvsroot/elephant/elephant.asd 2005/11/23 17:51:31 1.8 +++ /project/elephant/cvsroot/elephant/elephant.asd 2006/01/25 14:09:46 1.9 @@ -63,6 +63,8 @@ (:file "controller") (:file "collections") (:file "serializer")) + #+openmcl + (:file "openmcl-mop-patches") :serial t)) :depends-on (:uffi))

1 0

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

25 Jan '06

Update of /project/elephant/cvsroot/elephant/src In directory common-lisp:/tmp/cvs-serv23860/src Modified Files: classes.lisp elephant.lisp Log Message: Making Andrew's changes. --- /project/elephant/cvsroot/elephant/src/classes.lisp 2006/01/24 15:42:30 1.15 +++ /project/elephant/cvsroot/elephant/src/classes.lisp 2006/01/25 14:09:46 1.16 @@ -124,7 +124,7 @@ do (initialize-accessors slot-def instance)) (make-instances-obsolete instance)))) -#+(or cmu sbcl) +#+(or cmu sbcl openmcl) (defmethod reinitialize-instance :around ((instance persistent-metaclass) &rest initargs &key &allow-other-keys) (prog1 (call-next-method) @@ -132,7 +132,7 @@ (update-persistent-slots instance (persistent-slot-names instance)) (make-instances-obsolete instance)))) -#+allegro +;; #+allegro (defmethod finalize-inheritance :around ((instance persistent-metaclass)) (prog1 (call-next-method) @@ -140,13 +140,13 @@ (setf (%persistent-slots instance) (cons (persistent-slot-names instance) nil))))) -#+(or cmu sbcl) -(defmethod finalize-inheritance :around ((instance persistent-metaclass)) - (prog1 - (call-next-method) - (if (not (slot-boundp instance '%persistent-slots)) - (setf (%persistent-slots instance) - (cons (persistent-slot-names instance) nil))))) +;; #+(or cmu sbcl) +;; (defmethod finalize-inheritance :around ((instance persistent-metaclass)) +;; (prog1 +;; (call-next-method) +;; (if (not (slot-boundp instance '%persistent-slots)) +;; (setf (%persistent-slots instance) +;; (cons (persistent-slot-names instance) nil))))) (defmethod shared-initialize :around ((instance persistent-object) slot-names &rest initargs &key &allow-other-keys) "Initializes the persistent slots via initargs or forms. --- /project/elephant/cvsroot/elephant/src/elephant.lisp 2006/01/24 15:42:30 1.16 +++ /project/elephant/cvsroot/elephant/src/elephant.lisp 2006/01/25 14:09:46 1.17 @@ -226,6 +226,7 @@ compute-effective-slot-definition-initargs) #+openmcl (:import-from :ccl + class-finalized-p compute-class-precedence-list validate-superclass standard-slot-definition

1 0

[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-serv874 Modified Files: elephant.texinfo tutorial.texinfo Added Files: installation.texinfo Log Message: Improving the documentation with some stuff about the tests, I hope. --- /project/elephant/cvsroot/elephant/doc/elephant.texinfo 2005/11/23 17:51:34 1.2 +++ /project/elephant/cvsroot/elephant/doc/elephant.texinfo 2006/01/24 20:37:43 1.3 @@ -43,7 +43,7 @@ * Introduction:: Introducing Elephant! * Tutorial:: A leisurely walk-through. * Reference:: API documentation. -* SQL back-end:: CL-SQL based implementation +* Installation:: Installation and test-suite procedures and issues * Design Notes:: Internals. * Copying:: Your rights and freedoms. * Concept Index:: @@ -57,7 +57,7 @@ @include tutorial.texinfo @include reference.texinfo @include notes.texinfo -@include sql-backend.texinfo +@include installation.texinfo @include copying.texinfo @node Concept Index --- /project/elephant/cvsroot/elephant/doc/tutorial.texinfo 2006/01/24 18:25:00 1.3 +++ /project/elephant/cvsroot/elephant/doc/tutorial.texinfo 2006/01/24 20:37:43 1.4 @@ -49,10 +49,12 @@ your store! We'll assume in this tutorial you created a folder @code{testdb} in the current directory. -Assuming you've managed to install Elephant properly, +Assuming you've managed to install Elephant properly, and +are using a BerkeleyDB installation. @lisp * (asdf:operate 'asdf:load-op :elephant) +* (asdf:operate 'asdf:load-op :ele-bdb) @end lisp will load the relevant files. --- /project/elephant/cvsroot/elephant/doc/installation.texinfo 2006/01/24 20:37:43 NONE +++ /project/elephant/cvsroot/elephant/doc/installation.texinfo 2006/01/24 20:37:43 1.1 @c -*-texinfo-*- @node Installation @comment node-name, next, previous, up @chapter Installation @cindex Installation @menu * Installation Basics:: Basic installation * Test-Suites:: Running the test suites * SQL-Introduction:: The design and status of the SQL back-end extention. * Extention Status:: The current status of the SQL back-end extention. * Multi-repository Operation:: Specifying repositories * Setting up PostGres:: An example * Repository Migration:: How to move objects from one repository to another @end menu @node Installation Basics @comment node-name, next, previous, up @section Installation Please see the file ``INSTALL'' in the source distribution for more precise information; this is an overview. Installation of Elephant itself is easy because of the asdf system. Just execute: @lisp (asdf:operate 'asdf:load-op :elephant) @end lisp However, Elephant cannot function without a back-end repository. Elephant presents exactly the same API no matter what you choose as a repository. However, you have to use asdf to load the code that interfaces to particular repository system. The basic choices are to use the BerkeleyDB system or a SQL based system. You must perform one of these: @lisp (asdf:operate 'asdf:load-op :ele-clsql) (asdf:operate 'asdf:load-op :ele-bdb) @end lisp If you choose a SQL based system, you may have to load a specific package for that system, such as: @lisp (asdf:operate 'asdf:load-op :ele-sqlite3) @end lisp or, for Postgres, @lisp (asdf:oos 'asdf:load-op :clsql-postgresql-socket) @end lisp You will have to have the CL-SQL package installed. Following the documentation for CL-SQL under the section ``How CLSQL finds and loads foreign libraries'' you may need to do something like: @lisp (clsql:push-library-path "/usr/lib/") @end lisp before doing @lisp (asdf:oos 'asdf:load-op :clsql-postgresql-socket) @end lisp in order for clsql to find the PostGres library libpq.so, for example. Without modifcation, Elephant uses this as it's lib path: @lisp /usr/local/share/common-lisp/elephant-0.3/ @end lisp So you could put a symbolic link to libpq.so there, where libmemutil.so and libsleepycat.so will also reside. Elephant is designed to allow multi-repository operation; so you could concievably use two or more repositories at the same time. More particularly, you can seamlessly migrate your data from one repository to a different one at a later date. In a long duration project, this might occur because of a licensing or performance issue with a particular respository. @node Test-Suites @comment node-name, next, previous, up @section Test-Suites Elephant is moderately mature. Hopefully, it will work out-of-the-box for you. However, if you are using an LISP implementation different than the ones on which it is developed and maintained (currently OpenMCL, SBCL, and ACL), or as the repositories evolve, or just because of mistakes, you may need to run the test suites. If you report a bug, we will ask you to run these tests and report the output. Running them when you first install things may give you a sense of confidence and understanding that makes it worth the trouble. There are three files that execute the tests. You should choose one as a starting point based on what backend(s) you are using. If using BerekleyDB, use @lisp BerkeleyDB-tests.lisp @end lisp If using both, use both of the above and also use: @lisp MigrationTests.lisp @end lisp The text of this file is included here to give the casual reader an idea of how elepant test can be run in general: @lisp ;; 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... ;; You can test migration even between two BDB respositories if you wish (asdf:operate 'asdf:load-op :elephant) (asdf:operate 'asdf:load-op :ele-clsql) (asdf:operate 'asdf:load-op :clsql-postgresql-socket) (asdf:operate 'asdf:load-op :ele-bdb) (asdf:operate 'asdf:load-op :elephant-tests) ;; For sqlite-3.. ;; (asdf:operate 'asdf:load-op :ele-sqlite3) (in-package "ELEPHANT-TESTS") ;; The primary and secondary test-paths are ;; use for the migration tests. ;; This this configuration for testing between BDB and SQL.... (setq *test-path-primary* *testpg-path*) ;; (setq *test-path-primary* *testsqlite3-path*) (setq *test-path-secondary* *testdb-path*) ;; This this configuration for testing from one BDB repository to another... (setq *test-path-primary* *testdb-path*) ;; (setq *test-path-primary* *testsqlite3-path*) (setq *test-path-secondary* *testdb-path2*) (do-migrate-test-spec *test-path-primary*) @end lisp The appropriate test should execute for you with no errors. If you get errors, you may wish to report it the @code{ elephant-devel at common-lisp.net} email list. @node SQL-Introduction @comment node-name, next, previous, up @section SQL-Introduction Although originally designed as an interface to the BerkeleyDB system, the original Elephant system has been experimenetally extended to support the use of relational database management systems as the implementation of the persistent store. This relies on Kevin Rosenberg's CL-SQL interface to relational systems. Although the BerkeleyDB system is an ideal object store for LISP objects, one might prefer the licensing of a different system. For example, at the time of this writing, it is my interpretation that one cannot use the BerkeleyDB system behind a public website http://www.sleepycat.com/download/licensinginfo.shtml#redistribute unless one releases the entire web application as open source. Neither the PostGres DBMS nor SQLite 3 has any such restriction. Elephant itself is released under the GPL. It is somewhat debatable if the GPL allows one to construct to construct a non-open-source web application but the preponderance of opinion appears to be that it does. Thefore using Elephant and the other GPLed software that it depends upon allows one to host a a non open-source web application. This might be a reason to use Elephant on PostGres of SQLite rather than Elephant on BerkeleyDB. Other reasons to use a relational database system might include: familiarity with those systems, the fact that some part of your application needs to use the truly relational aspects of those systems, preference for the tools associated with those systems, etc. The SQL back-end extention of Elephant provides a function for migrating data seamlessly between repositories. That is, one can quite easily move data from a BerkeleyDB repository to a PostGres repository, and vice versa. In fact, one of the most important aspects of the extention is that it makes Elephant a multi-repository system, rather than a single repository system, as addition to allowing different implementation strategies for those repositories. This offers at least the possiblity than once can develop using one backend, for example BerkeleyDB, and then later move to MySQL. At the time of this writing, the basic strategy for the SQL implementation is quite simple. The same serializer used for the Sleepycat implementation is employed, the byte-string is base64 encoded, and placed in a single table which is managed by Elephant. As of Elephant 0.3, Elephant has been tested to work with both Postgres, and SQLite 3, thanks do Dan Knapp. @node Extention Status @comment node-name, next, previous, up @section Extention Status As far as is known at this writing, all functionality except nested transaction support and cursor-put's that is supported by the BerkeleyDB backend is supported by the CL-SQL based back-end. Concurrency and transaction atomicity has not been tested well for the CL-SQL based system. Additionally, it is NOT the case that the Elephant system currently provides transaction support across multiple repositories; it provides the transaction support provided by the underlying repository to the user in a per-repository basis. The PostGres backend is as currently employed is about 5 times slower than the BerkeleyDB backend. This could probably change with continued development. CL-SQL supports a lot of DBMS systems, but only PostGres has been tested. The SQL back-end extention has only been tested under SBCL 0.8.18. The SQL back-end is as easy to use as the BerkeleyDB back-end. However, the multi-repository version somewhat complicates the underlying persistent object management. At the time of this writing, the community has not decided if this extention will be a part of Elephant proper or a separate branch; if it is not made a part of Elephant proper, a user might prefer the simpler (and better maintained?) system if they only want to use the BerkeleyDB back-end. @node Multi-repository Operation @comment node-name, next, previous, up @section Multi-repository Operation Elephant now keeps a small hashtables that maps ``database specifications'' into actual database connections. If a database spec is a string, it is assumed to be a BerkeleyDB path. If it is a list, it is a assumed to be a CL-SQL connection specification. For example: @lisp ELE-TESTS> *testdb-path* "/home/read/projects/elephant/elephant/tests/testdb/" ELE-TESTS> *testpg-path* (:postgresql "localhost.localdomain" "test" "postgres" "") ELE-TESTS> @end lisp The tests now have a function @code{do-all-tests-spec} that take a spec and based on its type attempt to open the correct kind of store controller and perform the tests. The routine @code{get-controller} takes this specifiation. The basic strategy is that the ``database specification'' object is stored in every persistent object and collection so that the repository can be found. In this way, objects that reside in different repositories can coexist within the LISP object space, allowing data migration. @node Setting up PostGres @comment node-name, next, previous, up @section Setting up PostGres To set up a PostGres based back end, you should: @enumerate @item Install postgres and make sure postmaster is running. @item Create a database called ``test'' and set its permissions to be reached by whatever connection specification you intend to use. The tests use: @lisp (defvar *testpg-path* '(:postgreql "localhost.localdomain" "test" "postgres" "")) @end lisp meaning that connections must be allowed to the database test, user ``postgres'', no password, connected from the same machine ``localhost.localdomain''. (This would be changed to something more secure in a real application.) Typically you edit the file : pg_hba.conf to enable various kinds of connections in postgres. @item Be sure to enable socket connection to postgres when you invoke the postmaster. @item Test that you can connect to the database with these credentials by running: @code{ psql -h 127.0.0.1 -U postgres test} Before you attempt to connect with Elephant. @end enumerate meaning that connections must be allowed to the database test, user ``postgres'', no password, connected from the same machine ``localhost.localdomain''. (This would be changed to something more secure in a real application.) Furthermore, you must grant practically all creation/read/write privileges to the user postgres on this schema, so that it can construct the tables it needs. Upon first opening a CL-SQL based store controller, the tables, indexes, sequences, and so on needed by the Elephant system will be created in the schema named ``test'' automatically. To run the tests, execute: @lisp (asdf:operate 'asdf:load-op :elephant) (asdf:operate 'asdf:load-op :ele-clsql) (asdf:oos 'asdf:load-op :clsql-postgresql-socket) (in-package "ELEPHANT-TESTS") (do-all-tests-spec *testpg-path*) @end lisp This should produce a small number of errors (about 7) for those test having to do with migration and the BerkeleyDB system specifically. If you execute: @lisp (asdf:operate 'asdf:load-op :ele-bdb) @end lisp Then connection to the BerkeleyDB system will be enabled, and you should be able to execute both @lisp (do-all-tests-spec *testpg-path*) (do-all-tests-spec *testdb-path*) @end lisp with no errors in either case. At present the system has only been tested under PostGres. Some code parametrization would be required to work with other databases. Setting up SQLite3 is even easier. Install SQLite3 (I had to use the source rather than the binary install, in order to get the dynamic libraries constructed.) An example use of SQLLite3 would be: @lisp (asdf:operate 'asdf:load-op :elephant) (asdf:operate 'asdf:load-op :ele-clsql) (asdf:operate 'asdf:load-op :ele-sqlite3) (in-package "ELEPHANT-TESTS") (setq *test-path-primary* '(:sqlite3 "testdb")) (do-all-tests-spec *test-path-primary*) @end lisp The file RUNTESTS.lisp, although possibly not exactly what you want, contains useful example code. You can of course migrate between the three currently supported repository strategies in any combination: BDB, Postgresql, and SQLite3. In all probability, other relational datbases would be very easy to support but have not yet been tested. The basic pattern of the ``path'' specifiers is (cons clsqal-database-type-symbol (normal-clsql-connection-specifier)). @node Repository Migration @comment node-name, next, previous, up @section Repository Migration This version of Elephant supports migration betwen store controllers, whether of the same implementation strategy or not. The tests @code{migrate1} - @code{migrate5} are demonstrations of this techinque. The functions for performing these migrations are: @code{migraten-pobj} The name of this function is meant to imply that it is destructive of the object in question, mutating it to [23 lines skipped]

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-serv22618/src Modified Files: RUNTEST.lisp Added Files: BerkeleyDB-tests.lisp MigrationTests.lisp SQLDB-tests.lisp Log Message: Clearer test usage and system-specific test invocation patterns --- /project/elephant/cvsroot/elephant/src/RUNTEST.lisp 2006/01/24 15:42:30 1.3 +++ /project/elephant/cvsroot/elephant/src/RUNTEST.lisp 2006/01/24 18:25:00 1.4 @@ -1,3 +1,6 @@ +;; This file is now obsolete... +;; Please use SQLDB-test.lisp or BerkeleyDB-tests.lisp + (asdf:operate 'asdf:load-op :elephant) (asdf:operate 'asdf:load-op :ele-clsql) (asdf:oos 'asdf:load-op :clsql-postgresql-socket) --- /project/elephant/cvsroot/elephant/src/BerkeleyDB-tests.lisp 2006/01/24 18:25:01 NONE +++ /project/elephant/cvsroot/elephant/src/BerkeleyDB-tests.lisp 2006/01/24 18:25:01 1.1 (asdf:operate 'asdf:load-op :elephant) (asdf:operate 'asdf:load-op :ele-bdb) (asdf:operate 'asdf:load-op :elephant-tests) (in-package "ELEPHANT-TESTS") ;; The primary and secondary test-paths are ;; use for the migration tests. ;; (setq *test-path-primary* *testdb-path*) (setq *test-path-secondary* nil) (do-all-tests-spec *test-path-primary*) --- /project/elephant/cvsroot/elephant/src/MigrationTests.lisp 2006/01/24 18:25:01 NONE +++ /project/elephant/cvsroot/elephant/src/MigrationTests.lisp 2006/01/24 18:25:01 1.1 ;; 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... ;; You can test migration even between two BDB respositories if you wish (asdf:operate 'asdf:load-op :elephant) (asdf:operate 'asdf:load-op :ele-clsql) (asdf:operate 'asdf:load-op :clsql-postgresql-socket) (asdf:operate 'asdf:load-op :ele-bdb) (asdf:operate 'asdf:load-op :elephant-tests) ;; For sqlite-3.. ;; (asdf:operate 'asdf:load-op :ele-sqlite3) (in-package "ELEPHANT-TESTS") ;; The primary and secondary test-paths are ;; use for the migration tests. ;; This this configuration for testing between BDB and SQL.... (setq *test-path-primary* *testpg-path*) ;; (setq *test-path-primary* *testsqlite3-path*) (setq *test-path-secondary* *testdb-path*) ;; This this configuration for testing from one BDB repository to another... (setq *test-path-primary* *testdb-path*) ;; (setq *test-path-primary* *testsqlite3-path*) (setq *test-path-secondary* *testdb-path2*) (do-migrate-test-spec *test-path-primary*) --- /project/elephant/cvsroot/elephant/src/SQLDB-tests.lisp 2006/01/24 18:25:01 NONE +++ /project/elephant/cvsroot/elephant/src/SQLDB-tests.lisp 2006/01/24 18:25:01 1.1 (asdf:operate 'asdf:load-op :elephant) (asdf:operate 'asdf:load-op :ele-clsql) (asdf:operate 'asdf:load-op :elephant-tests) ;; For postgres use this... (asdf:oos 'asdf:load-op :clsql-postgresql-socket) ;; For sqllite3... use this... ;; (asdf:operate 'asdf:load-op :ele-sqlite3) (in-package "ELEPHANT-TESTS") ;; The primary and secondary test-paths are ;; use for the migration tests. ;; You may have to change these from the defaults set in ;; elephant-tests.lisp to point to your database. (setq *test-path-primary* *testpg-path*) ;; This is an alternative ;; (setq *test-path-primary* *testsqlite3-path*) (setq *test-path-secondary* nil) (do-all-tests-spec *test-path-primary*)

1 0

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

24 Jan '06

Update of /project/elephant/cvsroot/elephant/tests In directory common-lisp:/tmp/cvs-serv22618/tests Modified Files: elephant-tests.lisp testcollections.lisp testmigration.lisp testsleepycat.lisp Log Message: Clearer test usage and system-specific test invocation patterns --- /project/elephant/cvsroot/elephant/tests/elephant-tests.lisp 2005/11/23 17:51:59 1.6 +++ /project/elephant/cvsroot/elephant/tests/elephant-tests.lisp 2006/01/24 18:25:01 1.7 @@ -86,14 +86,18 @@ (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))))) +(defvar *testdb-path2* + (namestring + (merge-pathnames + #p"tests/testdb2/" + (asdf:component-pathname (asdf:find-system 'elephant-tests))))) + (defvar *sleepycatdb-path* - ;;"/usr/local/share/common-lisp/elephant-0.2/tests/testdb" (namestring (merge-pathnames #p"tests/testsleepycat/" @@ -136,7 +140,15 @@ (defun do-migrate-test-spec(spud) (with-open-store(spud) (let ((*auto-commit* nil)) - (do-test 'migrate1)))) + (assert (equal (do-test 'remove-element) 'remove-element)) + (assert (equal (do-test 'migrate1) 'migrate1)) + (assert (equal (do-test 'migrate2) 'migrate2)) + (assert (equal (do-test 'migrate3) 'migrate3)) + (assert (equal (do-test 'migrate4) 'migrate4)) + (assert (equal (do-test 'migrate5) 'migrate5)) + t + ) + )) (defun do-all-tests-spec(spec) (with-open-store (spec) --- /project/elephant/cvsroot/elephant/tests/testcollections.lisp 2005/12/05 15:08:36 1.5 +++ /project/elephant/cvsroot/elephant/tests/testcollections.lisp 2006/01/24 18:25:01 1.6 @@ -11,7 +11,9 @@ (add-to-root "x" x) (let ((sc1 (open-store *test-path-primary*))) (setf rv (equal (format nil "~A" x) - (format nil "~A" (get-from-root "x")))))) + (format nil "~A" (get-from-root "x")))) + (close-store sc1) + )) (progn (setq *store-controller* old-store) (setq *auto-commit* *prev-commit*))) --- /project/elephant/cvsroot/elephant/tests/testmigration.lisp 2005/11/23 17:51:59 1.2 +++ /project/elephant/cvsroot/elephant/tests/testmigration.lisp 2006/01/24 18:25:01 1.3 @@ -7,16 +7,26 @@ (in-package :ele-tests) (deftest remove-element + (if (or (null *test-path-secondary*) + (null *test-path-primary*)) + (progn + (format t "*test-path-secondary* and *test-path-primary* not both set, skipping this test.") + t) (let ((a (vector 'a 'b 'c)) (ans (vector 'a 'c))) (setf a (ele::remove-indexed-element-and-adjust 1 a)) (and (equal (aref a 0) (aref ans 0)) (equal (aref a 1) (aref ans 1)) - (equal (length a) (length ans)))) + (equal (length a) (length ans))))) t) (deftest migrate1 + (if (or (null *test-path-secondary*) + (null *test-path-primary*)) + (progn + (format t "*test-path-secondary* and *test-path-primary* not both set, skipping this test.") + t) (let ((old-store *store-controller*) (*prev-commit* *auto-commit*) (*auto-commit* t) @@ -32,11 +42,16 @@ (progn (setq *store-controller* old-store) (setq *auto-commit* *prev-commit*))) - rv) + rv)) t) (deftest migrate2 + (if (or (null *test-path-secondary*) + (null *test-path-primary*)) + (progn + (format t "*test-path-secondary* and *test-path-primary* not both set, skipping this test.") + nil) (let ((old-store *store-controller*) (*prev-commit* *auto-commit*) (*auto-commit* t) @@ -53,11 +68,16 @@ (btree-differ ibt mig)))) (progn (setq *store-controller* old-store) - (setq *auto-commit* *prev-commit*)))) + (setq *auto-commit* *prev-commit*))))) nil) (deftest migrate3 + (if (or (null *test-path-secondary*) + (null *test-path-primary*)) + (progn + (format t "*test-path-secondary* and *test-path-primary* not both set, skipping this test.") + t) (let ((old-store *store-controller*) (*prev-commit* *auto-commit*) (*auto-commit* t) @@ -92,11 +112,17 @@ (progn (setq *store-controller* old-store) (setq *auto-commit* *prev-commit*))) - rv) + rv + )) t) (deftest migrate4 + (if (or (null *test-path-secondary*) + (null *test-path-primary*)) + (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*) @@ -121,10 +147,15 @@ (progn (setq *store-controller* old-store) (setq *auto-commit* *prev-commit*))) - )) + ))) t) (deftest migrate5 + (if (or (null *test-path-secondary*) + (null *test-path-primary*)) + (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*) @@ -166,5 +197,5 @@ (progn (setq *store-controller* old-store) (setq *auto-commit* *prev-commit*)))) - ) + )) t) --- /project/elephant/cvsroot/elephant/tests/testsleepycat.lisp 2005/02/24 01:06:05 1.3 +++ /project/elephant/cvsroot/elephant/tests/testsleepycat.lisp 2006/01/24 18:25:01 1.4 @@ -17,7 +17,12 @@ :auto-commit t :create t :thread t)) (deftest prepares-sleepycat - (finishes (prepare-sleepycat)) t) + (if (not (find-package "ele-bdb")) + (progn + (format t "package ele-bdb not found, so not runnning test prepares-sleepycat~%") + t) + (finishes (prepare-sleepycat))) + t) #| (deftest put-alot @@ -60,7 +65,11 @@ finally (sleepycat::db-sequence-remove seq :auto-commit t)))) (deftest test-seq1 - (finishes (test-sequence1)) + (if (not (find-package "ele-bdb")) + (progn + (format t "package ele-bdb not found, so not runnning test prepares-sleepycat~%") + t) + (finishes (test-sequence1))) t) (defun test-sequence2 () @@ -79,7 +88,11 @@ finally (sleepycat::db-sequence-remove seq :auto-commit t)))) (deftest test-seq2 - (finishes (test-sequence2)) + (if (not (find-package "ele-bdb")) + (progn + (format t "package ele-bdb not found, so not runnning test prepares-sleepycat~%") + t) + (finishes (test-sequence2))) t) (defun cleanup-sleepycat () @@ -90,7 +103,11 @@ (sleepycat::db-env-remove env "test")) (deftest cleansup-sleepycat - (finishes (cleanup-sleepycat)) + (if (not (find-package "ele-bdb")) + (progn + (format t "package ele-bdb not found, so not runnning test prepares-sleepycat~%") + t) + (finishes (cleanup-sleepycat))) t) ;;(unuse-package "SLEEPYCAT")

1 0

[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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

elephant-cvs January 2006