r11859: Canonicalize whitespace

[clsql.git] / tests / benchmarks.lisp

diff --git a/tests/benchmarks.lisp b/tests/benchmarks.lisp
index eb218b6791441299881ae95bca36e7a06934a931..a39f49b036f45d7e92ceaceef462aa0977195430 100644 (file)
--- a/tests/benchmarks.lisp
+++ b/tests/benchmarks.lisp
@@ -3,7 +3,7 @@
 ;;;; File:    benchmarks.lisp
 ;;;; Authors: Kevin Rosenberg
 ;;;; Created: 03/05/2004
-;;;; Updated: $Id: test-init.lisp 9212 2004-05-03 18:44:03Z kevin $
+;;;; Updated: $Id$
 ;;;;
 ;;;; Benchmark suite
 ;;;;
@@ -26,22 +26,23 @@
       :type (string 100))
    (c :initarg :c
       :type float)))
-   
+
 (defun run-benchmarks (&key (report-stream *standard-output*) (sexp-report-stream nil) (count 10000))
   (let ((specs (read-specs))
-       (*report-stream* report-stream)
-       (*sexp-report-stream* sexp-report-stream))
+        (*report-stream* report-stream)
+        (*sexp-report-stream* sexp-report-stream))
     (unless specs
       (warn "Not running benchmarks because test configuration file is missing")
       (return-from run-benchmarks :skipped))
     (load-necessary-systems specs)
     (dolist (db-type +all-db-types+)
       (dolist (spec (db-type-spec db-type specs))
-       (do-benchmarks-for-backend db-type spec count))))
+        (do-benchmarks-for-backend db-type spec count))))
   (values))
 
 (defun do-benchmarks-for-backend (db-type spec count)
   (test-connect-to-database db-type spec)
+  (test-initialise-database)
   (write-report-banner "Benchmarks" db-type *report-stream*)
 
   (create-view-from-class 'bench)
@@ -67,8 +68,17 @@
     (time
      (dotimes (i n)
        (query "SELECT * FROM BENCH" :field-names nil)))
-    ))
-
-
-
+    (format *report-stream* "~&~%*** JOINED OBJECT QUERY RETRIEVAL IMMEDIATE ***~%")
+    (time
+     (dotimes (i (truncate n 10))
+       (mapcar #'(lambda (ea) (slot-value ea 'address)) (select 'employee-address :flatp t))))
 
+    (format *report-stream* "~&~%*** JOINED OBJECT QUERY RETRIEVAL DEFERRED ***~%")
+    (let* ((slotdef (find 'address (clsql-sys::class-slots (find-class 'employee-address))
+                          :key #'clsql-sys::slot-definition-name))
+           (dbi (when slotdef (clsql-sys::view-class-slot-db-info slotdef))))
+      (setf (gethash :retrieval dbi) :deferred)
+      (time
+       (dotimes (i (truncate n 10))
+         (mapcar #'(lambda (ea) (slot-value ea 'address)) (select 'employee-address :flatp t))))
+      (setf (gethash :retrieval dbi) :immediate))))