[elephant-cvs] CVS elephant/src/db-bdb

[ieslick]

Update of /project/elephant/cvsroot/elephant/src/db-bdb
In directory clnet:/tmp/cvs-serv24934/src/db-bdb

Modified Files:
	bdb-collections.lisp 
Log Message:
Fixing collection comparison bugs

--- /project/elephant/cvsroot/elephant/src/db-bdb/bdb-collections.lisp	2007/04/25 02:27:58	1.23
+++ /project/elephant/cvsroot/elephant/src/db-bdb/bdb-collections.lisp	2007/10/19 16:06:00	1.24
@@ -419,10 +419,11 @@
     (multiple-value-bind (k v)
 	(db-cursor-get-both-buffered (cursor-handle cursor)
 				     key-buf value-buf :get-both t)
-      (declare (ignore v))
       (if k
 	  (progn (setf (cursor-initialized-p cursor) t)
-		 (values t key value))
+		 (values t 
+			 (progn (buffer-read-oid k) (deserialize k sc))
+			 (deserialize v sc)))
 	  (setf (cursor-initialized-p cursor) nil))))))
 
 (defmethod cursor-get-both-range ((cursor bdb-cursor) key value)
@@ -436,7 +437,9 @@
 				     key-buf value-buf :get-both-range t)
       (if k
 	  (progn (setf (cursor-initialized-p cursor) t)
-		 (values t key (deserialize v sc)))
+		 (values t 
+			 (progn (buffer-read-oid k) (deserialize k sc))
+			 (deserialize v sc)))
 	  (setf (cursor-initialized-p cursor) nil))))))
 
 (defmethod cursor-delete ((cursor bdb-cursor))
@@ -590,9 +593,10 @@
 	(if k
 	    (progn
 	      (setf (cursor-initialized-p cursor) t)
-	      (values t key (deserialize val sc)
-		      (progn (buffer-read-oid pkey) 
-			     (deserialize pkey sc))))
+	      (values t 
+		      (progn (buffer-read-oid k) (deserialize k sc))
+		      (deserialize val sc)
+		      (progn (buffer-read-oid pkey) (deserialize pkey sc))))
 	    (setf (cursor-initialized-p cursor) nil))))))
 
 (defmethod cursor-pset-range ((cursor bdb-secondary-cursor) key)
@@ -624,7 +628,10 @@
 	(declare (ignore p))
 	(if k
 	    (progn (setf (cursor-initialized-p cursor) t)
-		   (values t key (deserialize val sc) pkey))
+		   (values t 
+			   (progn (buffer-read-oid k) (deserialize k sc))
+			   (deserialize val sc) 
+			   pkey))
 	    (setf (cursor-initialized-p cursor) nil))))))
 
 (defmethod cursor-pget-both-range ((cursor bdb-secondary-cursor) key pkey)
@@ -640,7 +647,9 @@
 					pkey-buf value-buf :get-both-range t)
 	(if k
 	    (progn (setf (cursor-initialized-p cursor) t)
-		   (values t key (deserialize val sc)
+		   (values t 
+			   (progn (buffer-read-oid k) (deserialize k sc))
+			   (deserialize val sc)
 			   (progn (buffer-read-oid p) (deserialize p sc))))
 	    (setf (cursor-initialized-p cursor) nil))))))
 
@@ -688,7 +697,8 @@
 	  (db-cursor-move-buffered (cursor-handle cursor)
 				   key-buf value-buf :next-dup t)
 	(if (and key (= (buffer-read-oid key) (cursor-oid cursor)))
-	    (values t (deserialize key (get-con (cursor-btree cursor))) 
+	    (values t 
+		    (deserialize key (get-con (cursor-btree cursor))) 
 		    (deserialize val (get-con (cursor-btree cursor))))
 	    (setf (cursor-initialized-p cursor) nil))))))