paulhorn/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not incorrectly detect corruption when an auto-vacuum database is converted to a non-auto-vacuum database within a vacuum. Ticket #3332. (CVS 5603)

Browse Source 
FossilOrigin-Name: cb869946d68f2abbd1322fababbe4aa74a4e08aa
This commit is contained in:
danielk1977
2008-08-23 16:17:55 +00:00
parent f54b1b341b
commit 06249db141
6 changed files with 80 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/vacuum2.test
+35 -1
View File
@@ -11,7 +11,7 @@
# This file implements regression tests for SQLite library. The
# focus of this file is testing the VACUUM statement.
#
# $Id: vacuum2.test,v 1.7 2008/01/17 02:36:28 drh Exp $
# $Id: vacuum2.test,v 1.8 2008/08/23 16:17:56 danielk1977 Exp $
set testdir [file dirname $argv0]
source $testdir/tester.tcl
@@ -125,4 +125,38 @@ do_test vacuum2-3.17 {
db2 close
ifcapable autovacuum {
do_test vacuum2-4.1 {
db close
file delete -force test.db
sqlite3 db test.db
execsql {
pragma auto_vacuum=1;
create table t(a, b);
insert into t values(1, 2);
insert into t values(1, 2);
pragma auto_vacuum=0;
vacuum;
pragma auto_vacuum;
}
} {0}
do_test vacuum2-4.2 {
execsql {
pragma auto_vacuum=1;
vacuum;
pragma auto_vacuum;
}
} {1}
do_test vacuum2-4.3 {
execsql {
pragma integrity_check
}
} {ok}
do_test vacuum2-4.4 {
execsql {
pragma auto_vacuum;
}
} {1}
}
finish_test
test/vacuum3.test
+28 -21
View File
@@ -12,7 +12,7 @@
# focus of this file is changing the database page size using a
# VACUUM statement.
#
# $Id: vacuum3.test,v 1.7 2008/08/02 03:50:40 drh Exp $
# $Id: vacuum3.test,v 1.8 2008/08/23 16:17:56 danielk1977 Exp $
set testdir [file dirname $argv0]
source $testdir/tester.tcl
@@ -237,8 +237,7 @@ do_test vacuum3-4.6 {
db2 close
do_ioerr_test vacuum3-ioerr-1 -cksum true -sqlprep {
PRAGMA page_size = 1024;
set create_database_sql {
BEGIN;
CREATE TABLE t1(a, b, c);
INSERT INTO t1 VALUES(1, randstr(50,50), randstr(50,50));
@@ -254,32 +253,40 @@ do_ioerr_test vacuum3-ioerr-1 -cksum true -sqlprep {
CREATE TABLE t3 AS SELECT * FROM t1;
COMMIT;
DROP TABLE t2;
} -sqlbody {
}
do_ioerr_test vacuum3-ioerr-1 -cksum true -sqlprep "
PRAGMA page_size = 1024;
$create_database_sql
" -sqlbody {
PRAGMA page_size = 4096;
VACUUM;
}
do_ioerr_test vacuum3-ioerr-2 -cksum true -sqlprep {
do_ioerr_test vacuum3-ioerr-2 -cksum true -sqlprep "
PRAGMA page_size = 2048;
BEGIN;
CREATE TABLE t1(a, b, c);
INSERT INTO t1 VALUES(1, randstr(50,50), randstr(50,50));
INSERT INTO t1 SELECT a+2, b||'-'||rowid, c||'-'||rowid FROM t1;
INSERT INTO t1 SELECT a+4, b||'-'||rowid, c||'-'||rowid FROM t1;
INSERT INTO t1 SELECT a+8, b||'-'||rowid, c||'-'||rowid FROM t1;
INSERT INTO t1 SELECT a+16, b||'-'||rowid, c||'-'||rowid FROM t1;
INSERT INTO t1 SELECT a+32, b||'-'||rowid, c||'-'||rowid FROM t1;
INSERT INTO t1 SELECT a+64, b||'-'||rowid, c||'-'||rowid FROM t1;
INSERT INTO t1 SELECT a+128, b||'-'||rowid, c||'-'||rowid FROM t1;
INSERT INTO t1 VALUES(1, randstr(600,600), randstr(600,600));
CREATE TABLE t2 AS SELECT * FROM t1;
CREATE TABLE t3 AS SELECT * FROM t1;
COMMIT;
DROP TABLE t2;
} -sqlbody {
$create_database_sql
" -sqlbody {
PRAGMA page_size = 512;
VACUUM;
}
ifcapable autovacuum {
do_ioerr_test vacuum3-ioerr-3 -cksum true -sqlprep "
PRAGMA auto_vacuum = 0;
$create_database_sql
" -sqlbody {
PRAGMA auto_vacuum = 1;
VACUUM;
}
do_ioerr_test vacuum3-ioerr-4 -cksum true -sqlprep "
PRAGMA auto_vacuum = 1;
$create_database_sql
" -sqlbody {
PRAGMA auto_vacuum = 0;
VACUUM;
}
}
source $testdir/malloc_common.tcl
if {$MEMDEBUG} {
do_malloc_test vacuum3-malloc-1 -sqlprep {