Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | More test-case changes so that everything works when the reserved_bytes value in the header is non-zero. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
2fd095b14b03a508169bba710d2e8e2a |
| User & Date: | drh 2016-03-15 12:37:08 |
Context
|
2016-03-15
| ||
| 17:52 | Implement FROM-clause subqueries as co-routines whenever they are guaranteed to be the outer-most loop of the join. check-in: c7bae50b user: drh tags: trunk | |
| 12:45 | Merge updates from trunk - FTS5 fixes and enhancemenets to the tests scripts so that they work with SEE. check-in: f41a7361 user: drh tags: apple-osx | |
| 12:37 | More test-case changes so that everything works when the reserved_bytes value in the header is non-zero. check-in: 2fd095b1 user: drh tags: trunk | |
| 09:55 | Fix the shellN.test test scripts so that they work with the --testdir option. check-in: 051c61eb user: dan tags: trunk | |
Changes
Changes to test/corrupt2.test.
342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 |
hexio_write corrupt.db [expr 1024 + ($nPage-3)*5] 010000000
} -test {
do_test corrupt2-6.3 {
catchsql " $::presql pragma incremental_vacuum = 1 "
} {1 {database disk image is malformed}}
}
corruption_test -sqlprep {
PRAGMA auto_vacuum = 1;
PRAGMA page_size = 1024;
CREATE TABLE t1(a INTEGER PRIMARY KEY, b);
INSERT INTO t1 VALUES(1, randomblob(2500));
DELETE FROM t1 WHERE a = 1;
} -corrupt {
set nAppend [expr 1024*207 - [file size corrupt.db]]
set fd [open corrupt.db r+]
seek $fd 0 end
puts -nonewline $fd [string repeat x $nAppend]
close $fd
hexio_write corrupt.db 28 00000000
} -test {
do_test corrupt2-6.4 {
catchsql "
$::presql
BEGIN EXCLUSIVE;
COMMIT;
"
} {1 {database disk image is malformed}}
}
}
set sqlprep {
PRAGMA auto_vacuum = 0;
PRAGMA page_size = 1024;
|
> | | | | | | | | | | | | | | | | | | | | | > |
342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 |
hexio_write corrupt.db [expr 1024 + ($nPage-3)*5] 010000000
} -test {
do_test corrupt2-6.3 {
catchsql " $::presql pragma incremental_vacuum = 1 "
} {1 {database disk image is malformed}}
}
if {![nonzero_reserved_bytes]} {
corruption_test -sqlprep {
PRAGMA auto_vacuum = 1;
PRAGMA page_size = 1024;
CREATE TABLE t1(a INTEGER PRIMARY KEY, b);
INSERT INTO t1 VALUES(1, randomblob(2500));
DELETE FROM t1 WHERE a = 1;
} -corrupt {
set nAppend [expr 1024*207 - [file size corrupt.db]]
set fd [open corrupt.db r+]
seek $fd 0 end
puts -nonewline $fd [string repeat x $nAppend]
close $fd
hexio_write corrupt.db 28 00000000
} -test {
do_test corrupt2-6.4 {
catchsql "
$::presql
BEGIN EXCLUSIVE;
COMMIT;
"
} {1 {database disk image is malformed}}
}
}
}
set sqlprep {
PRAGMA auto_vacuum = 0;
PRAGMA page_size = 1024;
|
Changes to test/filefmt.test.
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
...
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
|
PRAGMA auto_vacuum = 0;
CREATE TABLE t1(a);
CREATE INDEX i1 ON t1(a);
INSERT INTO t1 VALUES(a_string(3000));
CREATE TABLE t2(a);
INSERT INTO t2 VALUES(1);
} {}
do_test filefmt-2.1.2 {
hexio_read test.db 28 4
} {00000009}
do_test filefmt-2.1.3 {
sql36231 { INSERT INTO t1 VALUES(a_string(3000)) }
} {}
do_execsql_test filefmt-2.1.4 { INSERT INTO t2 VALUES(2) } {}
integrity_check filefmt-2.1.5
................................................................................
PRAGMA auto_vacuum = 0;
CREATE TABLE t1(a);
CREATE INDEX i1 ON t1(a);
INSERT INTO t1 VALUES(a_string(3000));
CREATE TABLE t2(a);
INSERT INTO t2 VALUES(1);
} {}
do_test filefmt-2.2.2 {
hexio_read test.db 28 4
} {00000009}
do_test filefmt-2.2.3 {
sql36231 { INSERT INTO t1 VALUES(a_string(3000)) }
} {}
do_execsql_test filefmt-2.2.4 {
PRAGMA integrity_check;
|
>
|
|
|
>
>
|
|
|
>
|
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
...
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
|
PRAGMA auto_vacuum = 0;
CREATE TABLE t1(a);
CREATE INDEX i1 ON t1(a);
INSERT INTO t1 VALUES(a_string(3000));
CREATE TABLE t2(a);
INSERT INTO t2 VALUES(1);
} {}
if {![nonzero_reserved_bytes]} {
do_test filefmt-2.1.2 {
hexio_read test.db 28 4
} {00000009}
}
do_test filefmt-2.1.3 {
sql36231 { INSERT INTO t1 VALUES(a_string(3000)) }
} {}
do_execsql_test filefmt-2.1.4 { INSERT INTO t2 VALUES(2) } {}
integrity_check filefmt-2.1.5
................................................................................
PRAGMA auto_vacuum = 0;
CREATE TABLE t1(a);
CREATE INDEX i1 ON t1(a);
INSERT INTO t1 VALUES(a_string(3000));
CREATE TABLE t2(a);
INSERT INTO t2 VALUES(1);
} {}
if {![nonzero_reserved_bytes]} {
do_test filefmt-2.2.2 {
hexio_read test.db 28 4
} {00000009}
}
do_test filefmt-2.2.3 {
sql36231 { INSERT INTO t1 VALUES(a_string(3000)) }
} {}
do_execsql_test filefmt-2.2.4 {
PRAGMA integrity_check;
|
Changes to test/pageropt.test.
18 19 20 21 22 23 24 25 26 27 28 29 30 31 |
source $testdir/tester.tcl
do_not_use_codec
ifcapable {!pager_pragmas||secure_delete||direct_read} {
finish_test
return
}
# Run the SQL statement supplied by the argument and return
# the results. Prepend four integers to the beginning of the
# result which are
#
# (1) The number of page reads from the database
# (2) The number of page writes to the database
|
> > > > |
18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 |
source $testdir/tester.tcl
do_not_use_codec
ifcapable {!pager_pragmas||secure_delete||direct_read} {
finish_test
return
}
# A non-zero reserved_bytes value changes the number of pages in the
# database file, which messes up the results in this test.
if {[nonzero_reserved_bytes]} {finish_test; return;}
# Run the SQL statement supplied by the argument and return
# the results. Prepend four integers to the beginning of the
# result which are
#
# (1) The number of page reads from the database
# (2) The number of page writes to the database
|
Changes to test/wal5.test.
137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 |
sql1 { INSERT INTO t1 VALUES(5, zeroblob(1200)) }
list [db_page_count] [wal_page_count] $::nBusyHandler
} {6 12 0}
do_test 1.$tn.7 {
reopen_all
list [db_page_count] [wal_page_count] $::nBusyHandler
} {7 0 0}
do_test 1.$tn.8 { sql2 { BEGIN ; SELECT x FROM t1 } } {1 2 3 4 5}
do_test 1.$tn.9 {
sql1 { INSERT INTO t1 VALUES(6, zeroblob(1200)) }
list [db_page_count] [wal_page_count] $::nBusyHandler
} {7 5 0}
do_test 1.$tn.10 { sql3 { BEGIN ; SELECT x FROM t1 } } {1 2 3 4 5 6}
set ::busy_handler_script {
if {$n==5} { sql2 COMMIT }
if {$n==6} { set ::db_file_size [db_page_count] }
if {$n==7} { sql3 COMMIT }
}
do_test 1.$tn.11 {
code1 { do_wal_checkpoint db -mode restart }
list [db_page_count] [wal_page_count] $::nBusyHandler
} {10 5 8}
do_test 1.$tn.12 { set ::db_file_size } 10
}
#-------------------------------------------------------------------------
# This block of tests explores checkpoint operations on more than one
# database file.
#
|
| | | |
137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 |
sql1 { INSERT INTO t1 VALUES(5, zeroblob(1200)) }
list [db_page_count] [wal_page_count] $::nBusyHandler
} {6 12 0}
do_test 1.$tn.7 {
reopen_all
list [db_page_count] [wal_page_count] $::nBusyHandler
} [expr {[nonzero_reserved_bytes]?"/# # 0/":"7 0 0"}]
do_test 1.$tn.8 { sql2 { BEGIN ; SELECT x FROM t1 } } {1 2 3 4 5}
do_test 1.$tn.9 {
sql1 { INSERT INTO t1 VALUES(6, zeroblob(1200)) }
list [db_page_count] [wal_page_count] $::nBusyHandler
} [expr {[nonzero_reserved_bytes]?"/# # #/":"7 5 0"}]
do_test 1.$tn.10 { sql3 { BEGIN ; SELECT x FROM t1 } } {1 2 3 4 5 6}
set ::busy_handler_script {
if {$n==5} { sql2 COMMIT }
if {$n==6} { set ::db_file_size [db_page_count] }
if {$n==7} { sql3 COMMIT }
}
do_test 1.$tn.11 {
code1 { do_wal_checkpoint db -mode restart }
list [db_page_count] [wal_page_count] $::nBusyHandler
} [expr {[nonzero_reserved_bytes]?"/# # #/":"10 5 8"}]
do_test 1.$tn.12 { set ::db_file_size } 10
}
#-------------------------------------------------------------------------
# This block of tests explores checkpoint operations on more than one
# database file.
#
|