elephant-cvs November 2005

elephant-cvs@common-lisp.net

1 participants
21 discussions

[elephant-cvs] CVS update: elephant/ele-sqlite3.asd
by rread＠common-lisp.net 23 Nov '05

23 Nov '05

Update of /project/elephant/cvsroot/elephant In directory common-lisp.net:/tmp/cvs-serv26581 Modified Files: Tag: SQL-BACK-END ele-sqlite3.asd Log Message: This is an almost empty thing; it is needed because so that one won't have to have the sqlite shared library installed Date: Wed Nov 23 18:03:02 2005 Author: rread Index: elephant/ele-sqlite3.asd diff -u elephant/ele-sqlite3.asd:1.1.2.1 elephant/ele-sqlite3.asd:1.1.2.2 --- elephant/ele-sqlite3.asd:1.1.2.1 Wed Nov 23 04:42:11 2005 +++ elephant/ele-sqlite3.asd Wed Nov 23 18:03:02 2005 @@ -53,7 +53,7 @@ :components ((:module :src :components - ((:file "sqlite3-enable") + ( ) :serial t)) :depends-on (:elephant :clsql :cl-base64 :clsql-sqlite3))

1 0

[elephant-cvs] CVS update: elephant/src/bdb-enable.lisp
by rread＠common-lisp.net 23 Nov '05

23 Nov '05

Update of /project/elephant/cvsroot/elephant/src In directory common-lisp.net:/tmp/cvs-serv26373 Modified Files: Tag: SQL-BACK-END bdb-enable.lisp Log Message: Removing erroneous line Date: Wed Nov 23 18:01:54 2005 Author: rread Index: elephant/src/bdb-enable.lisp diff -u elephant/src/bdb-enable.lisp:1.1.2.3 elephant/src/bdb-enable.lisp:1.1.2.4 --- elephant/src/bdb-enable.lisp:1.1.2.3 Wed Nov 23 18:00:33 2005 +++ elephant/src/bdb-enable.lisp Wed Nov 23 18:01:54 2005 @@ -87,7 +87,7 @@ "/usr/local/lib/db43/libdb.so" #+darwin ;; for Fink (OS X) -- but I will assume Linux more common... - "/sw/lib/libdb-4.3.dylib" +;; "/sw/lib/libdb-4.3.dylib" ;; a possible manual install "/usr/local/BerkeleyDB.4.3/lib/libdb.dylib" :module "sleepycat")

1 0

[elephant-cvs] CVS update: elephant/src/bdb-enable.lisp
by rread＠common-lisp.net 23 Nov '05

23 Nov '05

Update of /project/elephant/cvsroot/elephant/src In directory common-lisp.net:/tmp/cvs-serv25607 Modified Files: Tag: SQL-BACK-END bdb-enable.lisp Log Message: Removing something I fouled up Date: Wed Nov 23 18:00:34 2005 Author: rread Index: elephant/src/bdb-enable.lisp diff -u elephant/src/bdb-enable.lisp:1.1.2.2 elephant/src/bdb-enable.lisp:1.1.2.3 --- elephant/src/bdb-enable.lisp:1.1.2.2 Wed Nov 23 04:42:15 2005 +++ elephant/src/bdb-enable.lisp Wed Nov 23 18:00:33 2005 @@ -89,7 +89,6 @@ ;; for Fink (OS X) -- but I will assume Linux more common... "/sw/lib/libdb-4.3.dylib" ;; a possible manual install - #+linux "/usr/local/BerkeleyDB.4.3/lib/libdb.dylib" :module "sleepycat") (error "Couldn't load libdb (Sleepycat)!"))

1 0

[elephant-cvs] CVS update: elephant/tests/testdb/README
by rread＠common-lisp.net 23 Nov '05

23 Nov '05

Update of /project/elephant/cvsroot/elephant/tests/testdb In directory common-lisp.net:/tmp/cvs-serv24006/testdb Added Files: Tag: SQL-BACK-END README Log Message: Making sure the directory exists for testing. Date: Wed Nov 23 17:31:15 2005 Author: rread

1 0

[elephant-cvs] CVS update: elephant/tests/elephant-tests.lisp elephant/tests/testcollections.lisp elephant/tests/testmigration.lisp
by rread＠common-lisp.net 23 Nov '05

23 Nov '05

Update of /project/elephant/cvsroot/elephant/tests In directory common-lisp.net:/tmp/cvs-serv32717/tests Modified Files: Tag: SQL-BACK-END elephant-tests.lisp testcollections.lisp testmigration.lisp Log Message: Dan Knapp's patch applied, and other changes in preparation for 0.3 release. Date: Wed Nov 23 04:42:21 2005 Author: rread Index: elephant/tests/elephant-tests.lisp diff -u elephant/tests/elephant-tests.lisp:1.5.2.1 elephant/tests/elephant-tests.lisp:1.5.2.2 --- elephant/tests/elephant-tests.lisp:1.5.2.1 Tue Oct 18 22:41:32 2005 +++ elephant/tests/elephant-tests.lisp Wed Nov 23 04:42:19 2005 @@ -100,7 +100,22 @@ (asdf:component-pathname (asdf:find-system 'elephant-tests))))) (defvar *testpg-path* -'("localhost.localdomain" "test" "postgres" "")) +'(:postgresql "localhost.localdomain" "test" "postgres" "")) + +(defvar *testsqlite3-path* +;; This is of the form '(filename &optional init-function), +;; and using :memory: as a file name will get you an completely in-memory system... +;; '(":memory:") + '(:sqlite3 "sqlite3-test.db") +) + +(defvar *test-path-primary* + *testpg-path* +) +(defvar *test-path-secondary* + *testdb-path* +) + (defun do-all-tests() (progn Index: elephant/tests/testcollections.lisp diff -u elephant/tests/testcollections.lisp:1.3.2.1 elephant/tests/testcollections.lisp:1.3.2.2 --- elephant/tests/testcollections.lisp:1.3.2.1 Tue Oct 18 22:41:32 2005 +++ elephant/tests/testcollections.lisp Wed Nov 23 04:42:20 2005 @@ -9,10 +9,7 @@ (unwind-protect (let ((x (gensym))) (add-to-root "x" x) - (let ((sc1 (open-store - (if (typep *store-controller* 'sql-store-controller) - *testpg-path* - *testdb-path*)))) + (let ((sc1 (open-store *test-path-primary*))) (setf rv (equal (format nil "~A" x) (format nil "~A" (get-from-root "x")))))) (progn @@ -74,6 +71,10 @@ (defvar first-key (first keys)) + +;; For some unkown reason, this fails on my server unless +;; I put the variable "first-key" here rather than use the string +;; "key-1". I need to understand this, but don't at present.... (deftest remove-kv (finishes (with-transaction (:store-controller *store-controller*) (remove-kv "key-1" bt))) Index: elephant/tests/testmigration.lisp diff -u elephant/tests/testmigration.lisp:1.1.2.1 elephant/tests/testmigration.lisp:1.1.2.2 --- elephant/tests/testmigration.lisp:1.1.2.1 Tue Oct 18 22:35:54 2005 +++ elephant/tests/testmigration.lisp Wed Nov 23 04:42:20 2005 @@ -23,8 +23,8 @@ (rv nil)) (unwind-protect (let ( - (sc1 (open-store-bdb *testdb-path*)) - (sc2 (open-store-sql *testpg-path*))) + (sc1 (open-store *test-path-primary*)) + (sc2 (open-store *test-path-secondary*))) (add-to-root "x" "y" :store-controller sc1) (copy-from-key "x" sc1 sc2) (setf rv (equal (get-from-root "x" :store-controller sc1) @@ -43,8 +43,8 @@ (rv nil)) (unwind-protect (let - ((sc1 (open-store-bdb *testdb-path*)) - (sc2 (open-store-sql *testpg-path*))) + ((sc1 (open-store *test-path-primary*)) + (sc2 (open-store *test-path-secondary*))) (let ((ibt (build-btree sc1))) (loop for i from 0 to 10 do @@ -63,8 +63,8 @@ (*auto-commit* t) (rv nil)) (unwind-protect - (let ((sc1 (open-store-bdb *testdb-path*)) - (sc2 (open-store-sql *testpg-path*)) + (let ((sc1 (open-store *test-path-primary*)) + (sc2 (open-store *test-path-secondary*)) ) (let* ((ibt (build-indexed-btree sc1))) (let ( @@ -104,8 +104,8 @@ (rv nil)) (unwind-protect (let* ( - (sc1 (open-store-bdb *testdb-path*)) - (sc2 (open-store-sql *testpg-path*)) + (sc1 (open-store *test-path-primary*)) + (sc2 (open-store *test-path-secondary*)) ) (let* ((ibt (build-indexed-btree sc1))) (let ( @@ -131,8 +131,8 @@ (*auto-commit* t)) (unwind-protect (let ((osc (if (subtypep (type-of *store-controller*) 'sql-store-controller) - (open-store-bdb *testdb-path*) - (open-store-sql *testpg-path*) + (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!

1 0

[elephant-cvs] CVS update: elephant/src/RUNTEST.lisp elephant/src/bdb-enable.lisp elephant/src/controller.lisp elephant/src/metaclasses.lisp elephant/src/serializer.lisp elephant/src/sql-collections.lisp elephant/src/sql-controller.lisp
by rread＠common-lisp.net 23 Nov '05

23 Nov '05

Update of /project/elephant/cvsroot/elephant/src In directory common-lisp.net:/tmp/cvs-serv32717/src Modified Files: Tag: SQL-BACK-END RUNTEST.lisp bdb-enable.lisp controller.lisp metaclasses.lisp serializer.lisp sql-collections.lisp sql-controller.lisp Log Message: Dan Knapp's patch applied, and other changes in preparation for 0.3 release. Date: Wed Nov 23 04:42:15 2005 Author: rread Index: elephant/src/RUNTEST.lisp diff -u elephant/src/RUNTEST.lisp:1.1.2.1 elephant/src/RUNTEST.lisp:1.1.2.2 --- elephant/src/RUNTEST.lisp:1.1.2.1 Tue Oct 18 22:35:49 2005 +++ elephant/src/RUNTEST.lisp Wed Nov 23 04:42:15 2005 @@ -4,12 +4,22 @@ (asdf:operate 'asdf:load-op :ele-bdb) (asdf:operate 'asdf:load-op :elephant-tests) +(asdf:operate 'asdf:load-op :ele-sqlite3) + (in-package "ELEPHANT-TESTS") (do-all-tests) (do-all-tests-spec *testpg-path*) (do-migrate-test-spec *testpg-path*) (do-all-tests-spec *testdb-path*) +(do-all-tests-spec *testsqlite3-path*) + +;; The primary and secondary test-paths are +;; use for the migration tests. +(setq *test-path-primary* *testpg-path*) +(setq *test-path-primary* *testsqlite3-path*) +(setq *test-path-secondary* *testdb-path*) +(do-all-tests-spec *test-path-primary*) (use-package :sb-profile) Index: elephant/src/bdb-enable.lisp diff -u elephant/src/bdb-enable.lisp:1.1.2.1 elephant/src/bdb-enable.lisp:1.1.2.2 --- elephant/src/bdb-enable.lisp:1.1.2.1 Tue Oct 18 22:35:49 2005 +++ elephant/src/bdb-enable.lisp Wed Nov 23 04:42:15 2005 @@ -68,7 +68,7 @@ (merge-pathnames #p"libmemutil.so" (asdf:component-pathname (asdf:find-system 'elephant))) - "/usr/local/share/common-lisp/elephant-0.2/libmemutil.so") + "/usr/local/share/common-lisp/elephant-0.3/libmemutil.so") :module "libmemutil") (error "Couldn't load libmemutil.so!")) @@ -86,6 +86,10 @@ #+(and (or bsd freebsd) (not darwin)) "/usr/local/lib/db43/libdb.so" #+darwin + ;; for Fink (OS X) -- but I will assume Linux more common... + "/sw/lib/libdb-4.3.dylib" + ;; a possible manual install + #+linux "/usr/local/BerkeleyDB.4.3/lib/libdb.dylib" :module "sleepycat") (error "Couldn't load libdb (Sleepycat)!")) @@ -97,7 +101,7 @@ (merge-pathnames #p"libsleepycat.so" (asdf:component-pathname (asdf:find-system 'elephant))) - "/usr/local/share/common-lisp/elephant-0.2/libsleepycat.so") + "/usr/local/share/common-lisp/elephant-0.3/libsleepycat.so") :module "libsleepycat") (error "Couldn't load libsleepycat!")) Index: elephant/src/controller.lisp diff -u elephant/src/controller.lisp:1.12.2.1 elephant/src/controller.lisp:1.12.2.2 --- elephant/src/controller.lisp:1.12.2.1 Tue Oct 18 22:41:27 2005 +++ elephant/src/controller.lisp Wed Nov 23 04:42:15 2005 @@ -48,7 +48,7 @@ ;; controller from it. (defvar *strategies* '()) -(defvar *elephant-lib-path* "/usr/local/share/common-lisp/elephant-0.2/") +(defvar *elephant-lib-path* "/usr/local/share/common-lisp/elephant-0.3/") (defun register-strategy (spec-to-controller) (setq *strategies* (delete spec-to-controller *strategies*)) Index: elephant/src/metaclasses.lisp diff -u elephant/src/metaclasses.lisp:1.7.2.1 elephant/src/metaclasses.lisp:1.7.2.2 --- elephant/src/metaclasses.lisp:1.7.2.1 Tue Oct 18 22:41:27 2005 +++ elephant/src/metaclasses.lisp Wed Nov 23 04:42:15 2005 @@ -58,7 +58,7 @@ (progn (error "We can't default to *store-controller* in a multi-use enviroment.")) ;; (setf (gethash spec *dbconnection-spec*) - ;; (clsql:connect (:dbcn-spc sc) + ;; (clsql:connect (cdr (:dbcn-spc sc)) ;; :database-type :postgresql-socket ;; :if-exists :old))) (error "We don't know how to open a bdb-connection here!") @@ -76,7 +76,7 @@ ;; the connection spec (since the connection might be broken?) ;; It probably would be better to put a string in here in the case ;; of sleepycat... - (dbonnection-spec-pst :type list :accessor :dbcn-spc-pst :initarg :dbconnection-spec-pst + (dbonnection-spec-pst :type (or list string) :accessor :dbcn-spc-pst :initarg :dbconnection-spec-pst :initform '()) ) (:documentation Index: elephant/src/serializer.lisp diff -u elephant/src/serializer.lisp:1.10.2.1 elephant/src/serializer.lisp:1.10.2.2 --- elephant/src/serializer.lisp:1.10.2.1 Tue Oct 18 22:41:27 2005 +++ elephant/src/serializer.lisp Wed Nov 23 04:42:15 2005 @@ -365,18 +365,30 @@ (let ((typedesig (%deserialize bs))) ;; now, depending on what typedesig is, we might ;; or might not need to specify the store controller here.. - (let ((o - (if (subtypep typedesig 'persistent) - (make-instance typedesig :sc sc) - (make-instance typedesig) - ) - )) - (setf (gethash id *circularity-hash*) o) - (loop for i fixnum from 0 below (%deserialize bs) - do - (setf (slot-value o (%deserialize bs)) - (%deserialize bs))) - o))))) + (let ((o + (or (ignore-errors + (if (subtypep typedesig 'persistent) + (make-instance typedesig :sc sc) + ;; if the this type doesn't exist in our object + ;; space, we can't reconstitute it, but we don't want + ;; to abort completely, we will return a special object... + ;; This behavior could be configurable; the user might + ;; prefer an abort here, but I prefer surviving... + (make-instance typedesig) + ) + ) + (list 'uninstantiable-object-of-type typedesig) + ) + )) + (if (listp o) + o + (progn + (setf (gethash id *circularity-hash*) o) + (loop for i fixnum from 0 below (%deserialize bs) + do + (setf (slot-value o (%deserialize bs)) + (%deserialize bs))) + o))))))) ((= tag +array+) (let* ((id (buffer-read-fixnum bs)) (maybe-array (gethash id *circularity-hash*))) Index: elephant/src/sql-collections.lisp diff -u elephant/src/sql-collections.lisp:1.1.2.2 elephant/src/sql-collections.lisp:1.1.2.3 --- elephant/src/sql-collections.lisp:1.1.2.2 Wed Nov 2 20:58:11 2005 +++ elephant/src/sql-collections.lisp Wed Nov 23 04:42:15 2005 @@ -60,10 +60,7 @@ (con (controller-db sc))) (let ((pk (sql-get-from-clcn (oid bt) key sc con))) (if pk -;; Can this be right? - (let ((v (sql-get-from-clcn (oid (primary bt)) pk sc con))) - (values v T)) - (values nil nil)) + (sql-get-from-clcn (oid (primary bt)) pk sc con)) ))) (defmethod get-primary-key (key (bt sql-btree-index)) @@ -71,11 +68,7 @@ (let* ((sc (check-con (:dbcn-spc-pst bt))) (con (controller-db sc)) ) - (let ((pk (sql-get-from-clcn (oid bt) key sc con))) - (if pk - (values pk T) - (values nil nil)) - ))) + (sql-get-from-clcn (oid bt) key sc con))) ;; My basic strategy is to keep track of a current key Index: elephant/src/sql-controller.lisp diff -u elephant/src/sql-controller.lisp:1.1.2.1 elephant/src/sql-controller.lisp:1.1.2.2 --- elephant/src/sql-controller.lisp:1.1.2.1 Tue Oct 18 22:35:50 2005 +++ elephant/src/sql-controller.lisp Wed Nov 23 04:42:15 2005 @@ -144,11 +144,8 @@ (defmethod get-value (key (bt sql-btree)) (let* ((sc (check-con (:dbcn-spc-pst bt))) - (con (controller-db sc)) - (v (sql-get-from-clcn (oid bt) key sc con))) - (if v - (values v t) - (values nil nil)))) + (con (controller-db sc))) + (sql-get-from-clcn (oid bt) key sc con))) (defmethod existsp (key (bt sql-btree)) @@ -374,15 +371,14 @@ (recover-fatal nil) (thread t)) (the sql-store-controller - - - - - (let ((con (clsql:connect (:dbcn-spc sc) + (let* ((dbtype (car (:dbcn-spc sc))) + (con (clsql:connect (cdr (:dbcn-spc sc)) ;; WARNING: This line of code forces us to use postgresql. ;; If this were parametrized upwards we could concievably try ;; other backends. - :database-type :postgresql + :database-type dbtype +;; DNK :postgresql +;; :database-type :postgresql :if-exists :old))) (setf (gethash (:dbcn-spc sc) *dbconnection-spec*) sc) (setf (slot-value sc 'db) con) @@ -449,7 +445,7 @@ (kbs (serialize-to-base64-string key)) ) - (if (and (not insert-only) (sql-get-from-clcn clcn key sc con)) + (if (and (not insert-only) (sql-from-clcn-existsp clcn key con)) (clsql::update-records [keyvalue] :av-pairs `((key ,kbs) (clctn_id ,clcn) @@ -468,11 +464,7 @@ (defmethod sql-get-from-root (key sc con) - (let ((v (sql-get-from-clcn 0 key sc con))) - (if v - (values v t) - (values nil nil))) - ) + (sql-get-from-clcn 0 key sc con)) ;; This is a major difference betwen SQL and BDB: ;; BDB plans to give you one value and let you iterate, but @@ -512,14 +504,15 @@ ;; that efficiently without changing the database structure; ;; but that's OK, I could add a column to support that ;; relatively easily later on. - (if (< (length tuples) n) - nil - (nth n (sort - (mapcar - #'(lambda (x) - (deserialize-from-base64-string (car x) :sc sc)) - tuples) - #'my-generic-less-than))))) + (if (< n (length tuples)) + (values (nth n (sort + (mapcar + #'(lambda (x) + (deserialize-from-base64-string (car x) :sc sc)) + tuples) + #'my-generic-less-than)) + t) + (values nil nil)))) (defmethod sql-get-from-clcn-cnt ((clcn integer) key con) (let* ( @@ -544,7 +537,7 @@ tuples))) (defmethod sql-from-root-existsp (key con) - (sql-get-from-clcn 0 key con) + (sql-from-clcn-existsp 0 key con) ) (defmethod sql-from-clcn-existsp ((clcn integer) key con) @@ -637,21 +630,20 @@ ;; to change, so I am implementing it only here. (defmethod persistent-slot-reader-aux ((sc sql-store-controller) instance name) (let* ((con (controller-db sc))) - (let ((v - (sql-get-from-root - (form-slot-key (oid instance) name) - sc con - ))) - (if v + (multiple-value-bind (v existsp) + (sql-get-from-root + (form-slot-key (oid instance) name) + sc con) + (if existsp v (error 'unbound-slot :instance instance :name name)))) ) (defmethod persistent-slot-boundp-aux ((sc sql-store-controller) instance name) (let* ((con (controller-db sc))) - (if (sql-get-from-root + (if (sql-from-root-existsp (form-slot-key (oid instance) name) - sc con ) + con ) t nil)))

1 0

[elephant-cvs] CVS update: elephant/doc/sql-backend.texinfo
by rread＠common-lisp.net 23 Nov '05

23 Nov '05

Update of /project/elephant/cvsroot/elephant/doc In directory common-lisp.net:/tmp/cvs-serv32717/doc Modified Files: Tag: SQL-BACK-END sql-backend.texinfo Log Message: Dan Knapp's patch applied, and other changes in preparation for 0.3 release. Date: Wed Nov 23 04:42:14 2005 Author: rread Index: elephant/doc/sql-backend.texinfo diff -u elephant/doc/sql-backend.texinfo:1.1.2.1 elephant/doc/sql-backend.texinfo:1.1.2.2 --- elephant/doc/sql-backend.texinfo:1.1.2.1 Tue Oct 18 22:35:48 2005 +++ elephant/doc/sql-backend.texinfo Wed Nov 23 04:42:14 2005 @@ -31,12 +31,12 @@ http://www.sleepycat.com/download/licensinginfo.shtml#redistribute unless one releases the entire web application as open source. -The PostGres DBMS has no such restriction. Elephant itself is released +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 rather +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: @@ -59,6 +59,9 @@ 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 @@ -108,12 +111,17 @@ @lisp (asdf:operate 'asdf:load-op :elephant) @end lisp -to load elephant, one must execute either or both of: +to load elephant, one must at least one of: @lisp (asdf:operate 'asdf:load-op :ele-clsql) (asdf:operate 'asdf:load-op :ele-bdb) @end lisp +To use SQLLite3, you must execute: +@lisp +(asdf:operate 'asdf:load-op :ele-sqlite3) +@end lisp + depending on whether or not you wish to use the clsql backend or the BerkeleyDB backend, or both. @@ -133,7 +141,7 @@ Without modifcation, Elephant uses this as it's lib path: @lisp -/usr/local/share/common-lisp/elephant-0.2/ +/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 @@ -155,7 +163,7 @@ ELE-TESTS> *testdb-path* "/home/read/projects/elephant/elephant/tests/testdb/" ELE-TESTS> *testpg-path* -("localhost.localdomain" "test" "postgres" "") +(:postgresql "localhost.localdomain" "test" "postgres" "") ELE-TESTS> @end lisp @@ -191,7 +199,7 @@ @lisp (defvar *testpg-path* -'("localhost.localdomain" "test" "postgres" "")) +'(:postgreql "localhost.localdomain" "test" "postgres" "")) @end lisp meaning that connections must be allowed to the database test, user ``postgres'', @@ -254,7 +262,29 @@ 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

1 0

[elephant-cvs] CVS update: elephant/ele-sqlite3.asd elephant/CREDITS elephant/INSTALL elephant/Makefile elephant/NEWS
by rread＠common-lisp.net 23 Nov '05

23 Nov '05

Update of /project/elephant/cvsroot/elephant In directory common-lisp.net:/tmp/cvs-serv32717 Modified Files: Tag: SQL-BACK-END CREDITS INSTALL Makefile NEWS Added Files: Tag: SQL-BACK-END ele-sqlite3.asd Log Message: Dan Knapp's patch applied, and other changes in preparation for 0.3 release. Date: Wed Nov 23 04:42:12 2005 Author: rread Index: elephant/CREDITS diff -u elephant/CREDITS:1.4.2.2 elephant/CREDITS:1.4.2.3 --- elephant/CREDITS:1.4.2.2 Wed Oct 19 17:24:50 2005 +++ elephant/CREDITS Wed Nov 23 04:42:11 2005 @@ -45,3 +45,6 @@ many idiotic questions Just a test addition on the SQL-BACK-END branch. + +Dan Knapp fixed the fact that nil's were indistinguishable from +unbound slots, and proved the system works with SQLite3. Index: elephant/INSTALL diff -u elephant/INSTALL:1.11 elephant/INSTALL:1.11.2.1 --- elephant/INSTALL:1.11 Fri Oct 8 04:32:36 2004 +++ elephant/INSTALL Wed Nov 23 04:42:11 2005 @@ -3,8 +3,9 @@ Requirements ------------ -CMUCL 19a, SBCL 0.8.14, OpemMCL 0.14.2, or Allegro CL 6.2. -I've tested under x86 FreeBSD, Linux and PPC Darwin. I +CMUCL 19a, SBCL 0.9.5, OpemMCL 0.14.2, or Allegro CL 6.2. +This version ahs been tested under Linux and SBCL 0.9.5, but +Dan Knapp has also run something very closed under Darwin. can't personally test Win32 but I've compiled under Visual Studio .NET and a user has gotten it to work with Visual Studio 6. A Lispworks version will come if requested. @@ -12,6 +13,7 @@ ASDF - http://www.cliki.net/asdf UFFI 1.4.24+ - http://uffi.b9.com +(I have been testing with UFFI 1.5.4 and I recommend you use that.) I've patched src/functions.lisp to support some kinds of :out arguments. it is backwards-compatible so shouldn't @@ -19,11 +21,7 @@ 1.4.25+, but just in case you have 1.4.24 I have included it. -Sleepycat Berkeley DB 4.2 - http://www.sleepycat.com - -The version number is important -- the headers have changed -siginificantly. When 4.3 comes out, I'll have to reroll my -constants..... +Sleepycat Berkeley DB 4.3 - http://www.sleepycat.com A C compiler, probably gcc or Visual Studio. Presumably you have this if you installed Sleepycat. @@ -36,7 +34,7 @@ 0) Unpack Elephant. I put mine in the directory -/usr/local/share/common-lisp/elephant-0.1/ +/usr/local/share/common-lisp/elephant-0.3/ 1) Install UFFI. If you're using 1.4.24 replace @@ -44,18 +42,24 @@ with the provided file. -2) Install Berkeley DB 4.2. Under Un*x, you may actually +2) Install a backend: Either Berkeley DB 4.3, PostGresql, or SQLite 3. + +For relational database systems, refering the formal documentation +other the heading "SQL-BACK-END". + +For Berkeley 4.3: +Under Un*x, you may actually already have this installed, though it may be compiled with funny options, so if things don't work you may want to try to start from scratch. FreeBSD has a port for this, as I'm sure do other BSDs (including Darwin/Fink.) Take note of where libdb.so and db.h are installed (usually -/usr/local/BerekleyDB.4.2/lib/libdb.so and -/usr/local/BerekleyDB.4.2/include/db.h, or +/usr/local/BerekleyDB.4.3/lib/libdb.so and +/usr/local/BerekleyDB.4.3/include/db.h, or /usr/local/lib/db42/libdb.so and /usr/local/include/db42/db.h.) -3) Compile and install the libsleepycat shared library. +Compile and install the libsleepycat shared library. Under Un*x, edit Makefile and run (using GNU make, gmake on BSD) @@ -64,15 +68,26 @@ This compiles src/libsleepycat.c and installs it into -/usr/local/share/common-lisp/elephant-0.2/ +/usr/local/share/common-lisp/elephant-0.3/ + +You probably have to make sure this directory exists before running +make install. + +If you need to change this path, you will change it in the Makefile +and also in controller.lisp on the line: + +(defvar *elephant-lib-path* "/usr/local/share/common-lisp/elephant-0.3/") or where you specified. On Darwin / OS X you need to have -the developer tools installed. +the developer tools installed. In the Makefile and other places +there are commented-out lines showing settings that some users have used for +OS X; if you are using that I assume you will have to comment out the +appropriate lines and uncomment those examples. For Win32 (directions courtesy of Bill Clementson): Create an MSVC dll project and add src/libsleepycat.c, -src/libsleepycat.def and the Berkeley DB libdb42.lib files +src/libsleepycat.def and the Berkeley DB libdb43.lib files to the project (should be in the build_win32/release folder) Add the Berkeley DB dbinc include files directory and the @@ -82,11 +97,11 @@ Build the Elephant DLL file -Since you've statically included libdb42.lib inside +Since you've statically included libdb43.lib inside libsleepycat.c, it may or may not be necessary to load -libdb42.dll into Lisp (see below.) +libdb43.dll into Lisp (see below.) -4) Compile and load Elephant: +3) Compile and load Elephant: First, edit src/sleepycat.lisp so that it points to the correct libraries. If you're using Un*x and ASDF, this is @@ -110,6 +125,9 @@ ----------- 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.) For more complete documentation see TUTORIAL and NOTES. But a REPL session is worth a thousand words, so ... Index: elephant/Makefile diff -u elephant/Makefile:1.6.2.1 elephant/Makefile:1.6.2.2 --- elephant/Makefile:1.6.2.1 Tue Oct 18 22:41:24 2005 +++ elephant/Makefile Wed Nov 23 04:42:11 2005 @@ -8,9 +8,15 @@ UNAME:=$(shell uname -s) # DB43DIR=/db/ben/lisp/db43 +# Dan Knapp contributed this line, which came form OS X? +#DB43DIR=/sw +# But I will assume that Linux is more common? DB43DIR=/usr/local/BerkeleyDB.4.3/ + DBLIBDIR=$(DB43DIR)/lib/ DBINCDIR=$(DB43DIR)/include/ +# Dan Knapp contributed this line; for fink/OS X? +#DBINCDIR=$(DB43DIR)/include/db4/ # *BSD users will probably want #DBLIBDIR=/usr/local/lib/db43 Index: elephant/NEWS diff -u elephant/NEWS:1.6 elephant/NEWS:1.6.2.1 --- elephant/NEWS:1.6 Fri Oct 8 02:53:04 2004 +++ elephant/NEWS Wed Nov 23 04:42:11 2005 @@ -1,3 +1,8 @@ +November 30, 2005 - Elephant 0.3.0 released by +the new maintainer, Robert L. Read, providing +support for relational database backends, repository +migration, and multi-repository operation. + October 7, 2004 - Elephant 0.2.1 released. Thanks to Bill Clementson,

1 0

[elephant-cvs] CVS update: elephant/src/sleepycat.lisp
by rread＠common-lisp.net 03 Nov '05

03 Nov '05

Update of /project/elephant/cvsroot/elephant/src In directory common-lisp.net:/tmp/cvs-serv21687/src Modified Files: Tag: SQL-BACK-END sleepycat.lisp Log Message: This function must be available at compile-time Date: Thu Nov 3 18:54:33 2005 Author: rread Index: elephant/src/sleepycat.lisp diff -u elephant/src/sleepycat.lisp:1.13.2.2 elephant/src/sleepycat.lisp:1.13.2.3 --- elephant/src/sleepycat.lisp:1.13.2.2 Wed Nov 2 20:56:39 2005 +++ elephant/src/sleepycat.lisp Thu Nov 3 18:54:33 2005 @@ -831,10 +831,12 @@ ;; in that the function copy-from-system-area disappeared. ;; This code is an attempt to allow compilation under bothe SBCL 8 and SBCL 9. ;; Thanks to Juho Snellman for this idiom. -(defun new-style-copy-p () - (if (find-symbol "COPY-UB8-FROM-SYSTEM-AREA" "SB-KERNEL") - '(:and) - '(:or))) +(eval-when (:compile-toplevel) + (defun new-style-copy-p () + (if (find-symbol "COPY-UB8-FROM-SYSTEM-AREA" "SB-KERNEL") + '(:and) + '(:or))) + ) (defun buffer-read-ucs1-string (bs byte-length) "Read a UCS1 string."

1 0

[elephant-cvs] CVS update: elephant/src/sql-collections.lisp
by rread＠common-lisp.net 02 Nov '05

02 Nov '05

Update of /project/elephant/cvsroot/elephant/src In directory common-lisp.net:/tmp/cvs-serv21971/src Modified Files: Tag: SQL-BACK-END sql-collections.lisp Log Message: Properly wrapping a SQL call Date: Wed Nov 2 20:58:11 2005 Author: rread Index: elephant/src/sql-collections.lisp diff -u elephant/src/sql-collections.lisp:1.1.2.1 elephant/src/sql-collections.lisp:1.1.2.2 --- elephant/src/sql-collections.lisp:1.1.2.1 Tue Oct 18 22:35:50 2005 +++ elephant/src/sql-collections.lisp Wed Nov 2 20:58:11 2005 @@ -140,6 +140,8 @@ (values nil nil nil nil) (values nil nil nil))) +(clsql::locally-enable-sql-reader-syntax) + (defmethod cursor-init ((cursor sql-cursor)) (let* ((sc (check-con (:dbcn-spc-pst (cursor-btree cursor)))) (con (controller-db sc)) @@ -162,6 +164,8 @@ (setf (:sql-crsr-ck cursor) 0) (setf (cursor-initialized-p cursor) t) )) + +(clsql::restore-sql-reader-syntax-state) ;; we're assuming here that nil is not a legitimate key. (defmethod get-current-key ((cursor sql-cursor))

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 November 2005