Improvements to the new performance tests. (CVS 3526)

FossilOrigin-Name: 27f56c20514030e009fc3aa7e060d2e6276ddb83

diff --git a/manifest b/manifest
index 22ac55c5cd5f707aed17a4506cd489c42fc73aa1..1289ddd3f310638a6ec1b39b64a3b682b3588b77 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sindentation\stypo\sin\sbtree.c.\s(CVS\s3525)
-D 2006-11-30T13:05:29
+C Improvements\sto\sthe\snew\sperformance\stests.\s(CVS\s3526)
+D 2006-11-30T13:06:00
 F Makefile.in 8e14898d41a53033ecb687d93c9cd5d109fb9ae3
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -283,7 +283,7 @@ F test/select2.test f3c2678c3a9f3cf08ec4988a3845bda64be6d9e3
 F test/select3.test 33c78663e6b1b41220dcec4eb6affb1a05001ffe
 F test/select4.test 305ba0a6e97efc5544def5e5cb49b54e1bf87fd9
 F test/select5.test 0b47058d3e916c1fc9fe81f44b438e02bade21ce
-F test/select6.test 3607be760b1d4bfd337f43c13b5f3532ca5f09d9
+F test/select6.test 399f14b9ba37b768afe5d2cd8c12e4f340a69db8
 F test/select7.test 95697d8e8355ef7538e2fe768da16838bbd0fcde
 F test/server1.test e328b8e641ba8fe9273132cfef497383185dc1f5
 F test/shared.test 0ed247941236788c255b3b29b5a82d5ca71b6432
@@ -291,7 +291,7 @@ F test/shared2.test 8b48f8d33494413ef4cf250110d89403e2bf6b23
 F test/shared3.test 01e3e124dbb3859788aabc7cfb82f7ea04421749
 F test/shared_err.test 299a9180a6376b2089e8e0d469f383fe91bfa4ff
 F test/sort.test 0e4456e729e5a92a625907c63dcdedfbe72c5dc5
-F test/speed1.test 40d80b115273c82200e96359180adb727ae76d68
+F test/speed1.test 4d6719b252fe90dc52f663a6b2a24cf6472ceac9
 F test/subquery.test ae324ee928c5fb463a3ce08a8860d6e7f1ca5797
 F test/subselect.test 2d13fb7f450db3595adcdd24079a0dd1d2d6abc2
 F test/sync.test d05397b8f89f423dd6dba528692019ab036bc1c3
@@ -423,7 +423,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 08c2cc0e0782cfaca89947a01b7ea4474dbe71aa
-R afc8b7dd4d57d424eccd4ab2bb82865b
+P 5d61486f0fbd21ef992879b39d4e563fbfe46596
+R 9dfc065daf8f6f83ef4ffb10f47e6804
 U drh
-Z 2c13b99e686a504487123dde383f6e5f
+Z 8559dad0de29b5c166fe60f2d278f899

diff --git a/manifest.uuid b/manifest.uuid
index df345d97c6e1d5b00c4f749a0aa690317e25ff65..3c4a46d719c365348dad31c1bf2284d632d4feca 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5d61486f0fbd21ef992879b39d4e563fbfe46596
\ No newline at end of file
+27f56c20514030e009fc3aa7e060d2e6276ddb83
\ No newline at end of file

diff --git a/test/select6.test b/test/select6.test
index d89a99d197fbe09e4e0afa4ff6143089f1e43dd3..d90414b0bc351d1418679e37b61cae385506ed80 100644 (file)
--- a/test/select6.test
+++ b/test/select6.test
@@ -12,7 +12,7 @@
 # focus of this file is testing SELECT statements that contain
 # subqueries in their FROM clause.
 #
-# $Id: select6.test,v 1.25 2006/11/23 09:39:16 drh Exp $
+# $Id: select6.test,v 1.26 2006/11/30 13:06:00 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -101,7 +101,7 @@ do_test select6-1.9 {
   }
 } {1 1 1 2 2 2 3 4 3 4 7 7 4 8 15 12 5 5 20 21}
 
-do_speed_test select6-2.0 {
+do_test select6-2.0 {
   execsql {
     CREATE TABLE t2(a INTEGER PRIMARY KEY, b);
     INSERT INTO t2 SELECT * FROM t1;

diff --git a/test/speed1.test b/test/speed1.test
index 6334227f7a8ee50583d885636f5948785601678d..53921cff62f466c0f1fcc0379ca23a9cccfb17d0 100644 (file)
--- a/test/speed1.test
+++ b/test/speed1.test
@@ -11,12 +11,18 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script is measuring executing speed.
 #
-# $Id: speed1.test,v 1.1 2006/11/29 20:53:00 drh Exp $
+# $Id: speed1.test,v 1.2 2006/11/30 13:06:00 drh Exp $
 #
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+set sqlout [open speed1.txt w]
+proc tracesql {sql} {
+  puts $::sqlout $sql\;
+}
+db trace tracesql
+
 # The number_name procedure below converts its argment (an integer)
 # into a string which is the English-language name for that number.
 #
@@ -55,6 +61,7 @@ proc number_name {n} {
 #
 do_test speed1-1.0 {
   execsql {
+pragma page_size=4096;
     CREATE TABLE t1(a INTEGER, b INTEGER, c TEXT);
     CREATE TABLE t2(a INTEGER, b INTEGER, c TEXT);
     CREATE INDEX i2a ON t2(a);
@@ -136,36 +143,36 @@ db eval BEGIN
 speed_trial speed1-select3 5000 stmt $sql
 db eval COMMIT
 
-# 20000 random SELECTs against rowid.
+# 100000 random SELECTs against rowid.
 #
 set sql {}
-for {set i 1} {$i<=20000} {incr i} {
+for {set i 1} {$i<=100000} {incr i} {
   set id [expr {int(rand()*50000)+1}]
   append sql "SELECT c FROM t1 WHERE rowid=$id;"
 }
 db eval BEGIN
-speed_trial speed1-select4 20000 row $sql
+speed_trial speed1-select4 100000 row $sql
 db eval COMMIT
 
-# 20000 random SELECTs against a unique indexed column.
+# 100000 random SELECTs against a unique indexed column.
 #
 set sql {}
-for {set i 1} {$i<=20000} {incr i} {
+for {set i 1} {$i<=100000} {incr i} {
   set id [expr {int(rand()*50000)+1}]
   append sql "SELECT c FROM t1 WHERE a=$id;"
 }
 db eval BEGIN
-speed_trial speed1-select5 20000 row $sql
+speed_trial speed1-select5 100000 row $sql
 db eval COMMIT
 
-# 20000 random SELECTs against an indexed column text column
+# 50000 random SELECTs against an indexed column text column
 #
 set sql {}
-db eval {SELECT c FROM t1 ORDER BY random() LIMIT 20000} {
+db eval {SELECT c FROM t1 ORDER BY random() LIMIT 50000} {
   append sql "SELECT c FROM t1 WHERE c='$c';"
 }
 db eval BEGIN
-speed_trial speed1-select6 20000 row $sql
+speed_trial speed1-select6 50000 row $sql
 db eval COMMIT