- elephant-cvs@lists.common-lisp.net - mailman3.common-lisp.net

[elephant-cvs] CVS elephant
by rread 01 Jun '06

01 Jun '06

Update of /project/elephant/cvsroot/elephant In directory clnet:/tmp/cvs-serv23768 Modified Files: ele-bdb.asd elephant.asd Log Message: A patch submitted by Julian Stecklina for freebsd --- /project/elephant/cvsroot/elephant/ele-bdb.asd 2006/04/30 01:03:48 1.9 +++ /project/elephant/cvsroot/elephant/ele-bdb.asd 2006/06/01 12:55:43 1.10 @@ -52,7 +52,7 @@ (unless (zerop (uffi:run-shell-command (format nil #-freebsd "cd ~A; make bdb" - #+freebds "cd ~A; gmake bdb" + #+freebsd "cd ~A; gmake bdb" (make-pathname :directory *root-dir*)))) (format t "Couldn't build library from libsleepycat.c via 'make bdb'~%") (error 'operation-error :component c :operation o)))) @@ -73,8 +73,9 @@ "Operation is done when the foreign library is loaded which should happen when we compile the interface lisp file" (and (and (find-package '#:sleepycat) - (symbol-function (intern (symbol-name '#:%db-strerror) - (find-package '#:sleepycat)))) + (ignore-errors + (symbol-function (intern (symbol-name '#:%db-strerror) + (find-package '#:sleepycat))))) t)) --- /project/elephant/cvsroot/elephant/elephant.asd 2006/04/26 17:53:43 1.17 +++ /project/elephant/cvsroot/elephant/elephant.asd 2006/06/01 12:55:43 1.18 @@ -52,7 +52,7 @@ (unless (zerop (uffi:run-shell-command (format nil #-freebsd "cd ~A; make" - #+freebds "cd ~A; gmake" + #+freebsd "cd ~A; gmake" (make-pathname :directory *root-dir*)))) (error 'operation-error :component c :operation o)))) @@ -72,8 +72,9 @@ "Operation is done when the foreign library is loaded which should happen when we compile the interface lisp file" (and (find-package "ELEPHANT-MEMUTIL") - (symbol-function (intern "COPY-BUFS" - (find-package "ELEPHANT-MEMUTIL"))) + (ignore-errors + (symbol-function (intern "COPY-BUFS" + (find-package "ELEPHANT-MEMUTIL")))) t)) (defsystem elephant

1 0

[elephant-cvs] CVS elephant/doc
by rread 15 May '06

15 May '06

Update of /project/elephant/cvsroot/elephant/doc In directory clnet:/tmp/cvs-serv19928 Modified Files: installation.texinfo reference.texinfo Log Message: Fixing a misspelling --- /project/elephant/cvsroot/elephant/doc/installation.texinfo 2006/04/26 17:53:43 1.2 +++ /project/elephant/cvsroot/elephant/doc/installation.texinfo 2006/05/15 13:02:26 1.3 @@ -9,7 +9,7 @@ * 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. +* Extension Status:: The current status of the SQL back-end extention. * Multi-repository Operation:: Specifying repositories * Setting up PostGres:: An example @end menu --- /project/elephant/cvsroot/elephant/doc/reference.texinfo 2006/05/15 00:33:39 1.4 +++ /project/elephant/cvsroot/elephant/doc/reference.texinfo 2006/05/15 13:02:26 1.5 @@ -10,6 +10,7 @@ * Controller:: The connection to Sleepycat. * Transactions:: Transactions. * Persistent Objects:: CLOS persistence. +* Persistent Slot Indexing:: Convenient indexing. * Collections:: BTrees and indices. * Cursors:: Traversing BTrees. * Sleepycat:: Some functions from the low-level Sleepycat interface.

1 0

[elephant-cvs] CVS elephant/doc
by ieslick 15 May '06

15 May '06

Update of /project/elephant/cvsroot/elephant/doc In directory clnet:/tmp/cvs-serv17492 Modified Files: reference.texinfo Log Message: Fix for missing reference documentation --- /project/elephant/cvsroot/elephant/doc/reference.texinfo 2006/04/26 17:53:43 1.3 +++ /project/elephant/cvsroot/elephant/doc/reference.texinfo 2006/05/15 00:33:39 1.4 @@ -61,17 +61,17 @@ @section Persistent Slot Indexing @cindex Persistent Slot Indexing -@include includes/get-instances-by-class -@include includes/get-instance-by-value -@include includes/get-instances-by-value -@include includes/get-instances-by-range - -@include includes/fun-elephant-enable-class-indexing -@include includes/fun-elephant-disable-class-indexing -@include includes/fun-add-class-slot-index -@include includes/fun-remove-class-slot-index -@include includes/fun-add-class-derived-index -@include includes/fun-remove-class-derived-index +@include includes/fun-get-instances-by-class.texinfo +@include includes/fun-get-instance-by-value.texinfo +@include includes/fun-get-instances-by-value.texinfo +@include includes/fun-get-instances-by-range.texinfo + +@include includes/fun-elephant-enable-class-indexing.texinfo +@include includes/fun-elephant-disable-class-indexing.texinfo +@include includes/fun-add-class-slot-index.texinfo +@include includes/fun-remove-class-slot-index.texinfo +@include includes/fun-add-class-derived-index.texinfo +@include includes/fun-remove-class-derived-index.texinfo @node Collections @comment node-name, next, previous, up

1 0

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

06 May '06

Update of /project/elephant/cvsroot/elephant/src/elephant In directory clnet:/tmp/cvs-serv6439 Modified Files: serializer.lisp Log Message: Retract allegro ucs1 hack from last checking. Confirm performance enhancement for large serialized structures with self-references --- /project/elephant/cvsroot/elephant/src/elephant/serializer.lisp 2006/05/06 19:19:26 1.5 +++ /project/elephant/cvsroot/elephant/src/elephant/serializer.lisp 2006/05/06 19:21:23 1.6 @@ -90,7 +90,7 @@ (buffer-write-byte #+(and allegro ics) (etypecase s - (base-string +ucs1-symbol+) ;; +ucs1-symbol+ + (base-string +ucs2-symbol+) ;; +ucs1-symbol+ (string +ucs2-symbol+)) #+(or (and sbcl sb-unicode) lispworks) (etypecase s @@ -110,7 +110,7 @@ (buffer-write-byte #+(and allegro ics) (etypecase frob - (base-string +ucs1-string+) ;; +ucs1-string+ + (base-string +ucs2-string+) ;; +ucs1-string+ (string +ucs2-string+)) #+(or (and sbcl sb-unicode) lispworks) (etypecase frob @@ -152,7 +152,7 @@ (buffer-write-byte #+(and allegro ics) (etypecase s - (base-string +ucs1-pathname+) ;; +ucs1-pathname+ + (base-string +ucs2-pathname+) ;; +ucs1-pathname+ (string +ucs2-pathname+)) #+(or (and sbcl sb-unicode) lispworks) (etypecase s

1 0

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

06 May '06

Update of /project/elephant/cvsroot/elephant/src/elephant In directory clnet:/tmp/cvs-serv6314 Modified Files: controller.lisp serializer.lisp Log Message: Bugfix in with-open-store --- /project/elephant/cvsroot/elephant/src/elephant/controller.lisp 2006/04/26 17:53:44 1.9 +++ /project/elephant/cvsroot/elephant/src/elephant/controller.lisp 2006/05/06 19:19:26 1.10 @@ -134,7 +134,7 @@ unconditionally closing the controller on exit." `(let ((*store-controller* nil)) (declare (special *store-controller*)) - (open-store spec) + (open-store ,spec) (unwind-protect (progn ,@body) (close-store *store-controller*)))) --- /project/elephant/cvsroot/elephant/src/elephant/serializer.lisp 2006/04/26 21:41:24 1.4 +++ /project/elephant/cvsroot/elephant/src/elephant/serializer.lisp 2006/05/06 19:19:26 1.5 @@ -59,12 +59,22 @@ (defconstant +fill-pointer-p+ #x40) (defconstant +adjustable-p+ #x80) +(defun clear-circularity-hash () + "This handles the case where we store an object with lots + of object references. CLRHASH then starts to dominate + performance as it has to visit ever spot in the table so + we're better off GCing the old table than clearing it" + (declare (optimize (speed 3) (safety 0))) + (if (> (hash-table-size *circularity-hash*) 100) + (setf *circularity-hash* (make-hash-table :test 'eq :size 50)) + (clrhash *circularity-hash*))) + (defun serialize (frob bs) "Serialize a lisp value into a buffer-stream." (declare (optimize (speed 3) (safety 0)) (type buffer-stream bs)) (setq *lisp-obj-id* 0) - (clrhash *circularity-hash*) + (clear-circularity-hash) (labels ((%serialize (frob) (declare (optimize (speed 3) (safety 0))) @@ -80,7 +90,7 @@ (buffer-write-byte #+(and allegro ics) (etypecase s - (base-string +ucs2-symbol+) ;; +ucs1-symbol+ + (base-string +ucs1-symbol+) ;; +ucs1-symbol+ (string +ucs2-symbol+)) #+(or (and sbcl sb-unicode) lispworks) (etypecase s @@ -100,7 +110,7 @@ (buffer-write-byte #+(and allegro ics) (etypecase frob - (base-string +ucs2-string+) ;; +ucs1-string+ + (base-string +ucs1-string+) ;; +ucs1-string+ (string +ucs2-string+)) #+(or (and sbcl sb-unicode) lispworks) (etypecase frob @@ -142,7 +152,7 @@ (buffer-write-byte #+(and allegro ics) (etypecase s - (base-string +ucs2-pathname+) ;; +ucs1-pathname+ + (base-string +ucs1-pathname+) ;; +ucs1-pathname+ (string +ucs2-pathname+)) #+(or (and sbcl sb-unicode) lispworks) (etypecase s @@ -302,9 +312,9 @@ (get-cached-instance sc (buffer-read-fixnum bs) (%deserialize bs))) - ((= tag +single-float+) + ((= tag +single-float+) (buffer-read-float bs)) - ((= tag +double-float+) + ((= tag +double-float+) (buffer-read-double bs)) ((= tag +char+) (code-char (buffer-read-uint bs))) @@ -407,7 +417,7 @@ (null (return-from deserialize nil)) (buffer-stream (setq *lisp-obj-id* 0) - (clrhash *circularity-hash*) + (clear-circularity-hash) (%deserialize buf-str))))) (defun deserialize-bignum (bs length positive)

1 0

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

06 May '06

Update of /project/elephant/cvsroot/elephant/tests In directory clnet:/tmp/cvs-serv6244 Modified Files: testindexing.lisp Log Message: Syntax tweak in test --- /project/elephant/cvsroot/elephant/tests/testindexing.lisp 2006/04/26 21:41:25 1.17 +++ /project/elephant/cvsroot/elephant/tests/testindexing.lisp 2006/05/06 19:18:01 1.18 @@ -34,12 +34,11 @@ ((slot1 :initarg :slot1 :initform 1 :accessor slot1 :index t)) (:metaclass persistent-metaclass)) - (disable-class-indexing 'idx-one :errorp nil) (disable-class-indexing 'idx-one :errorp nil) (setf (find-class 'idx-one) nil) t) -t) + t) (deftest indexing-basic-trivial (progn

1 0

[elephant-cvs] CVS elephant
by ieslick 30 Apr '06

30 Apr '06

Update of /project/elephant/cvsroot/elephant In directory clnet:/tmp/cvs-serv29682 Modified Files: config.lisp ele-bdb.asd Log Message: FEATURE: Allow linux users to configure pthreads location in config.lisp (NEEDS TESTING!) --- /project/elephant/cvsroot/elephant/config.lisp 2006/02/22 21:03:47 1.2 +++ /project/elephant/cvsroot/elephant/config.lisp 2006/04/30 01:03:48 1.3 @@ -1,3 +1,14 @@ +;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*- +;;; +;;; config.lisp -- Site specific library references for Elephant +;;; +;;; Initial version 8/26/2004 by Ian Eslick +;;; <ieslick(a)common-lisp.net> +;;; +;;; part of +;;; +;;; Elephant: an object-oriented database for Common Lisp +;;; (in-package :elephant) @@ -5,12 +16,14 @@ ;; Make sure the libraries that CLSQL needs for a particular system ;; are pointed to by these libraries. ;; These values will be irrelevant if you don't use a CLSQL-based backend. + (defparameter *clsql-foreign-lib-path* #p"/usr/local/share/common-lisp/elephant/") ;; BerkeleyDB ;; Make sure the libraries that CLSQL needs for a particular system ;; are pointed to by these libraries. + (defparameter *sleepycat-foreign-library-path* ;; Sleepycat: this works on linux #+linux @@ -24,3 +37,8 @@ ;; "/sw/lib/libdb-4.3.dylib" ;; a possible manual install "/usr/local/BerkeleyDB.4.3/lib/libdb.dylib") + +(defparameter *sleepycat-pthreads-path* + #-linux nil ;; don't open on non-linux environments + #+linux "/lib/tls/libpthread.so.0" ;; most linux distros + ) \ No newline at end of file --- /project/elephant/cvsroot/elephant/ele-bdb.asd 2006/02/19 20:06:03 1.8 +++ /project/elephant/cvsroot/elephant/ele-bdb.asd 2006/04/30 01:03:48 1.9 @@ -28,28 +28,6 @@ (unless (find-package 'uffi) (asdf:operate 'asdf:load-op 'uffi))) -;; -;; EDIT ME FOR YOUR SYSTEM -;; -;; An attempt at good defaults is here. We should -;; later add a search function that users can add to -;; so they don't have to edit source -;; - -(defparameter *sleepycat-foreign-library-path* - ;; Sleepycat: this works on linux - #+linux -;; "/db/ben/lisp/db43/lib/libdb.so" - "/usr/local/BerkeleyDB.4.3/lib/libdb-4.3.so" - ;; this works on FreeBSD - #+(and (or bsd freebsd) (not (or darwin macosx))) - "/usr/local/lib/db43/libdb.so" - #+(or darwin macosx) - ;; for Fink (OS X) -- but I will assume Linux more common... -;; "/sw/lib/libdb-4.3.dylib" - ;; a possible manual install - "/usr/local/BerkeleyDB.4.3/lib/libdb.dylib") - (defclass bdb-c-source (c-source-file) ())

1 0

[elephant-cvs] CVS elephant/src/db-bdb
by ieslick 30 Apr '06

30 Apr '06

Update of /project/elephant/cvsroot/elephant/src/db-bdb In directory clnet:/tmp/cvs-serv29682/src/db-bdb Modified Files: sleepycat.lisp Log Message: FEATURE: Allow linux users to configure pthreads location in config.lisp (NEEDS TESTING!) --- /project/elephant/cvsroot/elephant/src/db-bdb/sleepycat.lisp 2006/04/26 17:53:44 1.4 +++ /project/elephant/cvsroot/elephant/src/db-bdb/sleepycat.lisp 2006/04/30 01:03:49 1.5 @@ -57,7 +57,9 @@ #+linux (unless - (uffi:load-foreign-library "/lib/tls/libpthread.so.0" :module "pthread") + (uffi:load-foreign-library + elephant::*sleepycat-pthreads-path* + :module "pthread") (error "Couldn't load libpthread!")) ;; @@ -66,7 +68,7 @@ (unless (uffi:load-foreign-library - ele-bdb-system::*sleepycat-foreign-library-path* + elephant::*sleepycat-foreign-library-path* :module "sleepycat") (error "Couldn't load libdb (Sleepycat)!"))

1 0

[elephant-cvs] CVS elephant/src/db-bdb
by ieslick 30 Apr '06

30 Apr '06

Update of /project/elephant/cvsroot/elephant/src/db-bdb In directory clnet:/tmp/cvs-serv29635 Modified Files: bdb-controller.lisp Log Message: BUGFIX: specs with pathnames instead of strings fail in open-store --- /project/elephant/cvsroot/elephant/src/db-bdb/bdb-controller.lisp 2006/04/26 17:53:44 1.7 +++ /project/elephant/cvsroot/elephant/src/db-bdb/bdb-controller.lisp 2006/04/30 01:02:22 1.8 @@ -59,7 +59,7 @@ (let ((env (db-env-create))) ;; thread stuff? (setf (controller-environment sc) env) - (db-env-open env (second (controller-spec sc)) + (db-env-open env (namestring (second (controller-spec sc))) :create t :init-txn t :init-lock t :init-mpool t :init-log t :thread thread :recover recover :recover-fatal recover-fatal)

1 0

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

30 Apr '06

Update of /project/elephant/cvsroot/elephant/src/elephant In directory clnet:/tmp/cvs-serv28175 Modified Files: classindex.lisp Log Message: BUGFIX: Allow enable-class-indexing to connect to existing database index when class definition is out of synch with actual db indexing. --- /project/elephant/cvsroot/elephant/src/elephant/classindex.lisp 2006/04/26 21:41:24 1.11 +++ /project/elephant/cvsroot/elephant/src/elephant/classindex.lisp 2006/04/30 01:01:05 1.12 @@ -182,22 +182,30 @@ (let ((croot (controller-class-root sc))) (multiple-value-bind (btree found) (get-value (class-name class) croot) - (declare (ignore btree)) - (when found (error "Class is already enabled for indexing! Run disable class indexing to clean up."))) - ;; Put class instance index into the class root & cache it in the class object - (update-indexed-record class indexed-slot-names :class-indexed t) - (with-transaction (:store-controller sc) - (let ((class-idx (build-indexed-btree sc))) - (setf (get-value (class-name class) croot) class-idx) - (setf (%index-cache class) class-idx) + (when found + (if (indexed class) + (error "Class is already enabled for indexing! Run disable class indexing to clean up.") + (progn + (let ((slots nil)) + (map-indices (lambda (k v) (declare (ignore v)) (push k slots)) btree) + (warn "Class has pre-existing database index, enabling indexing for slots: ~A" + (setf indexed-slot-names (union slots indexed-slot-names))))))) + ;; Put class instance index into the class root & cache it in the class object + (update-indexed-record class indexed-slot-names :class-indexed t) + (with-transaction (:store-controller sc) + (when (not found) + (let ((class-idx (build-indexed-btree sc))) + (setf (get-value (class-name class) croot) class-idx) + (setf (%index-cache class) class-idx))) ;; Add all the indexes (loop for slot in indexed-slot-names do - (add-class-slot-index class slot :populate nil :sc sc)) + (unless (find-inverted-index class slot :null-on-fail t) + (add-class-slot-index class slot :populate nil :sc sc)))) ;; Sanity check - (let ((record (indexed-record class))) - (declare (ignorable record)) - (assert (indexed class))) - class-idx)))) + (let ((record (indexed-record class))) + (declare (ignorable record)) + (assert (indexed class))) + (find-class-index class :sc sc :errorp t)))) (defmethod disable-class-indexing ((class-name symbol) &key (errorp t) (sc *store-controller*)) (let ((class (find-class class-name errorp)))

1 0