@@ -66,17 +66,16 @@ proc runtest {title} {
6666 set delay 10
6767
6868 exec sync; after $delay ;
69- set t [time " exec . /sqlite3 s2k .db < $sqlfile " 1]
69+ set t [time " exec cat perftest0.sql $sqlfile | . /sqlite3 perftest0 .db 2>&1 " 1]
7070 set t [expr {[lindex $t 0]/1000000.0}]
71- puts [format $format {SQLite :} $t ]
71+ puts [format $format {Config0 :} $t ]
7272 exec sync; after $delay ;
7373
7474 set t0 $t ;
7575
76- # set t [time "exec cat enc.sql $sqlfile | ./sqlite3 s2k-codec.db 2>&1 > $logfile" 1]
77- set t [time " exec cat enc.sql $sqlfile | ./sqlite3 s2k-codec.db 2>&1" 1]
76+ set t [time " exec cat perftest1.sql $sqlfile | ./sqlite3 perftest1.db 2>&1" 1]
7877 set t [expr {[lindex $t 0]/1000000.0}]
79- puts [format $format {SQLite Secure :} $t ]
78+ puts [format $format {Config1 :} $t ]
8079 exec sync; after $delay ;
8180
8281 set slowdown [expr {(($t - $t0 )/$t0 )*100.0}]
@@ -88,28 +87,27 @@ proc runtest {title} {
8887# Initialize the environment
8988#
9089
91- file delete s2k-codec .db
92- file delete s2k .db
90+ file delete perftest0 .db
91+ file delete perftest1 .db
9392
9493expr srand(1)
95- catch {exec /bin/sh -c {rm -f s*.db}}
96- set fd [open enc.sql w]
94+ catch {exec /bin/sh -c {rm -f perftest*.db}}
95+
96+ set fd [open perftest0.sql w]
9797puts $fd {
9898PRAGMA key='xyzzy';
99+ PRAGMA cipher_use_hmac=OFF;
99100}
100101close $fd
101102
102- set fd [open clear.sql w]
103- # puts $fd {
104- # PRAGMA synchronous = OFF;
105- # PRAGMA cache_size = 200000;
106- # drop table if exists t1;
107- # drop table if exists t2;
108- # }
103+ set fd [open perftest1.sql w]
104+ puts $fd {
105+ PRAGMA key='xyzzy';
106+ }
109107close $fd
110108
111- exec . /sqlite3 s2k .db < clear.sql
112- exec cat enc .sql clear.sql | ./sqlite3 codec-s2k .db
109+ exec cat perftest0.sql | . /sqlite3 perftest0 .db
110+ exec cat perftest1 .sql | ./sqlite3 perftest1 .db
113111
114112set ones {zero one two three four five six seven eight nine
115113 ten eleven twelve thirteen fourteen fifteen sixteen seventeen
0 commit comments