1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-29 08:01:23 +03:00

Fixes to the locking and rollback behavior. (CVS 261)

FossilOrigin-Name: 337b3d3b2a903328d9744c111979909a284b8348
This commit is contained in:
drh
2001-09-23 02:35:53 +00:00
parent beae319476
commit ecdc7530dd
18 changed files with 504 additions and 339 deletions

View File

@ -11,7 +11,7 @@
# This file implements regression tests for SQLite library. The
# focus of this script is btree database backend
#
# $Id: btree.test,v 1.9 2001/09/16 00:13:28 drh Exp $
# $Id: btree.test,v 1.10 2001/09/23 02:35:53 drh Exp $
set testdir [file dirname $argv0]
@ -54,7 +54,7 @@ do_test btree-1.4.1 {
lindex [btree_pager_stats $::b1] 1
} {1}
do_test btree-1.5 {
set rc [catch {btree_cursor $::b1 2} ::c1]
set rc [catch {btree_cursor $::b1 2 1} ::c1]
if {$rc} {lappend rc $::c1}
set rc
} {0}
@ -86,7 +86,7 @@ do_test btree-1.12 {
# Reopen the database and attempt to read the record that we wrote.
#
do_test btree-2.1 {
set rc [catch {btree_cursor $::b1 2} ::c1]
set rc [catch {btree_cursor $::b1 2 1} ::c1]
if {$rc} {lappend rc $::c1}
set rc
} {0}
@ -209,7 +209,7 @@ do_test btree-3.24 {
file size test1.bt
} {2048}
do_test btree-3.25 {
set rc [catch {btree_cursor $::b1 2} ::c1]
set rc [catch {btree_cursor $::b1 2 1} ::c1]
if {$rc} {lappend rc $::c1}
set rc
} {0}
@ -339,7 +339,7 @@ do_test btree-4.7 {
do_test btree-4.8 {
btree_close $::b1
set ::b1 [btree_open test1.bt]
set ::c1 [btree_cursor $::b1 2]
set ::c1 [btree_cursor $::b1 2 1]
lindex [btree_pager_stats $::b1] 1
} {2}
do_test btree-4.9 {
@ -421,7 +421,7 @@ do_test btree-6.2.1 {
lindex [btree_pager_stats $::b1] 1
} {1}
do_test btree-6.2.2 {
set ::c2 [btree_cursor $::b1 $::t2]
set ::c2 [btree_cursor $::b1 $::t2 1]
lindex [btree_pager_stats $::b1] 1
} {2}
do_test btree-6.2.3 {
@ -430,7 +430,7 @@ do_test btree-6.2.3 {
} {ten}
do_test btree-6.3 {
btree_commit $::b1
set ::c1 [btree_cursor $::b1 2]
set ::c1 [btree_cursor $::b1 2 1]
lindex [btree_pager_stats $::b1] 1
} {3}
do_test btree-6.3.1 {
@ -465,7 +465,7 @@ do_test btree-6.8.1 {
lindex [btree_get_meta $::b1] 0
} {0}
do_test btree-6.9 {
set ::c2 [btree_cursor $::b1 $::t2]
set ::c2 [btree_cursor $::b1 $::t2 1]
lindex [btree_pager_stats $::b1] 1
} {3}
@ -479,7 +479,7 @@ do_test btree-6.9.1 {
do_test btree-6.10 {
btree_close_cursor $::c1
btree_drop_table $::b1 2
set ::c1 [btree_cursor $::b1 2]
set ::c1 [btree_cursor $::b1 2 1]
btree_move_to $::c1 {}
btree_key $::c1
} {}
@ -631,7 +631,7 @@ do_test btree-8.9 {
btree_close_cursor $::c1
btree_close $::b1
set ::b1 [btree_open test1.bt]
set ::c1 [btree_cursor $::b1 2]
set ::c1 [btree_cursor $::b1 2 1]
btree_move_to $::c1 020
btree_data $::c1
} $::data
@ -653,7 +653,7 @@ do_test btree-8.12 {
lindex [btree_get_meta $::b1] 0
} {4}
do_test btree-8.12.1 {
set ::c1 [btree_cursor $::b1 2]
set ::c1 [btree_cursor $::b1 2 1]
btree_insert $::c1 ${::keyprefix}1 1
btree_data $::c1
} {1}
@ -700,7 +700,7 @@ do_test btree-8.22 {
do_test btree-8.23 {
btree_close_cursor $::c1
btree_drop_table $::b1 2
set ::c1 [btree_cursor $::b1 2]
set ::c1 [btree_cursor $::b1 2 1]
lindex [btree_get_meta $::b1] 0
} {4}
do_test btree-8.24 {
@ -790,7 +790,7 @@ do_test btree-10.1 {
lindex [btree_pager_stats $::b1] 1
} {1}
do_test btree-10.2 {
set ::c1 [btree_cursor $::b1 2]
set ::c1 [btree_cursor $::b1 2 1]
lindex [btree_pager_stats $::b1] 1
} {2}
do_test btree-10.3 {
@ -851,7 +851,7 @@ do_test btree-11.2 {
lindex [btree_pager_stats $::b1] 1
} {1}
do_test btree-11.3 {
set ::c1 [btree_cursor $::b1 2]
set ::c1 [btree_cursor $::b1 2 1]
lindex [btree_pager_stats $::b1] 1
} {2}
#btree_page_dump $::b1 2

View File

@ -11,7 +11,7 @@
# This file implements regression tests for SQLite library. The
# focus of this script is btree database backend
#
# $Id: btree2.test,v 1.7 2001/09/16 00:13:28 drh Exp $
# $Id: btree2.test,v 1.8 2001/09/23 02:35:53 drh Exp $
set testdir [file dirname $argv0]
@ -48,7 +48,7 @@ do_test btree2-1.4 {
btree_create_table $::b
} {6}
do_test btree2-1.5 {
set ::c2 [btree_cursor $::b 2]
set ::c2 [btree_cursor $::b 2 1]
btree_insert $::c2 {one} {1}
btree_delete $::c2
btree_close_cursor $::c2
@ -95,7 +95,7 @@ proc build_db {N L} {
for {set i 2} {$i<=6} {incr i} {
catch {btree_close_cursor [set ::c$i]}
btree_clear_table $::b $i
set ::c$i [btree_cursor $::b $i]
set ::c$i [btree_cursor $::b $i 1]
}
btree_insert $::c2 N $N
btree_insert $::c2 L $L
@ -281,11 +281,11 @@ foreach {N L} {
puts "**** N=$N L=$L ****"
set hash [md5file test2.bt]
do_test btree2-$testno.1 [subst -nocommands {
set ::c2 [btree_cursor $::b 2]
set ::c3 [btree_cursor $::b 3]
set ::c4 [btree_cursor $::b 4]
set ::c5 [btree_cursor $::b 5]
set ::c6 [btree_cursor $::b 6]
set ::c2 [btree_cursor $::b 2 1]
set ::c3 [btree_cursor $::b 3 1]
set ::c4 [btree_cursor $::b 4 1]
set ::c5 [btree_cursor $::b 5 1]
set ::c6 [btree_cursor $::b 6 1]
btree_begin_transaction $::b
build_db $N $L
check_invariants
@ -301,11 +301,11 @@ foreach {N L} {
} $hash
do_test btree2-$testno.3 [subst -nocommands {
btree_begin_transaction $::b
set ::c2 [btree_cursor $::b 2]
set ::c3 [btree_cursor $::b 3]
set ::c4 [btree_cursor $::b 4]
set ::c5 [btree_cursor $::b 5]
set ::c6 [btree_cursor $::b 6]
set ::c2 [btree_cursor $::b 2 1]
set ::c3 [btree_cursor $::b 3 1]
set ::c4 [btree_cursor $::b 4 1]
set ::c5 [btree_cursor $::b 5 1]
set ::c6 [btree_cursor $::b 6 1]
build_db $N $L
check_invariants
}] {}
@ -327,11 +327,11 @@ foreach {N L} {
do_test btree2-$testno.7 {
btree_close $::b
set ::b [btree_open test2.bt]
set ::c2 [btree_cursor $::b 2]
set ::c3 [btree_cursor $::b 3]
set ::c4 [btree_cursor $::b 4]
set ::c5 [btree_cursor $::b 5]
set ::c6 [btree_cursor $::b 6]
set ::c2 [btree_cursor $::b 2 1]
set ::c3 [btree_cursor $::b 3 1]
set ::c4 [btree_cursor $::b 4 1]
set ::c5 [btree_cursor $::b 5 1]
set ::c6 [btree_cursor $::b 6 1]
check_invariants
} {}
@ -375,11 +375,11 @@ foreach {N L} {
} $hash
# exec cp test2.bt test2.bt.bu2
btree_begin_transaction $::b
set ::c2 [btree_cursor $::b 2]
set ::c3 [btree_cursor $::b 3]
set ::c4 [btree_cursor $::b 4]
set ::c5 [btree_cursor $::b 5]
set ::c6 [btree_cursor $::b 6]
set ::c2 [btree_cursor $::b 2 1]
set ::c3 [btree_cursor $::b 3 1]
set ::c4 [btree_cursor $::b 4 1]
set ::c5 [btree_cursor $::b 5 1]
set ::c6 [btree_cursor $::b 6 1]
do_test $testid.5 [subst {
random_changes $n $I $K $D
}] {}
@ -402,11 +402,11 @@ foreach {N L} {
do_test $testid.9 {
btree_close $::b
set ::b [btree_open test2.bt]
set ::c2 [btree_cursor $::b 2]
set ::c3 [btree_cursor $::b 3]
set ::c4 [btree_cursor $::b 4]
set ::c5 [btree_cursor $::b 5]
set ::c6 [btree_cursor $::b 6]
set ::c2 [btree_cursor $::b 2 1]
set ::c3 [btree_cursor $::b 3 1]
set ::c4 [btree_cursor $::b 4 1]
set ::c5 [btree_cursor $::b 5 1]
set ::c6 [btree_cursor $::b 6 1]
check_invariants
} {}
incr num2

View File

@ -11,82 +11,150 @@
# This file implements regression tests for SQLite library. The
# focus of this script is database locks.
#
# $Id: lock.test,v 1.10 2001/09/16 00:13:28 drh Exp $
# $Id: lock.test,v 1.11 2001/09/23 02:35:53 drh Exp $
if {0} {
set testdir [file dirname $argv0]
source $testdir/tester.tcl
# Create a largish table
# Create an alternative connection to the database
#
do_test lock-1.0 {
execsql {CREATE TABLE big(f1 int, f2 int, f3 int)}
set f [open ./testdata1.txt w]
for {set i 1} {$i<=500} {incr i} {
puts $f "$i\t[expr {$i*2}]\t[expr {$i*3}]"
}
close $f
execsql {COPY big FROM './testdata1.txt'}
file delete -force ./testdata1.txt
sqlite db2 ./test.db
} {}
do_test lock-1.1 {
# Create a background query that gives us a read lock on the big table
#
set f [open slow.sql w]
puts $f "SELECT a.f1, b.f1 FROM big AS a, big AS B"
puts $f "WHERE a.f1+b.f1==0.5;"
close $f
set ::lock_pid [exec ./sqlite testdb <slow.sql &]
after 250
set v {}
execsql {SELECT name FROM sqlite_master WHERE type='table' ORDER BY name}
} {}
do_test lock-1.2 {
execsql {SELECT name FROM sqlite_master WHERE type='table' ORDER BY name} db2
} {}
do_test lock-1.3 {
execsql {CREATE TABLE t1(a int, b int)}
execsql {SELECT name FROM sqlite_master WHERE type='table' ORDER BY name}
} {t1}
do_test lock-1.4 {
set r [catch {execsql {
SELECT name FROM sqlite_master WHERE type='table' ORDER BY name
} db2} msg]
lappend r $msg
} {1 {database schema has changed}}
do_test lock-1.5 {
set r [catch {execsql {
SELECT name FROM sqlite_master WHERE type='table' ORDER BY name
} db2} msg]
lappend r $msg
} {0 t1}
do_probtest lock-1.2 {
# Now try to update the database
#
set v [catch {execsql {UPDATE big SET f2='xyz' WHERE f1=11}} msg]
lappend v $msg
} {1 {table big is locked}}
do_test lock-1.6 {
execsql {INSERT INTO t1 VALUES(1,2)}
execsql {SELECT * FROM t1}
} {1 2}
do_test lock-1.7 {
execsql {SELECT * FROM t1} db2
} {1 2}
do_test lock-1.8 {
execsql {UPDATE t1 SET a=b, b=a} db2
execsql {SELECT * FROM t1} db2
} {2 1}
do_test lock-1.9 {
execsql {SELECT * FROM t1}
} {2 1}
do_probtest lock-1.3 {
# Try to update the database in a separate process
#
set f [open update.sql w]
puts $f ".timeout 0"
puts $f "UPDATE big SET f2='xyz' WHERE f1=11;"
puts $f "SELECT f2 FROM big WHERE f1=11;"
close $f
exec ./sqlite testdb <update.sql
} "UPDATE big SET f2='xyz' WHERE f1=11;\nSQL error: table big is locked\n22"
do_test lock-1.10 {
execsql {BEGIN TRANSACTION}
execsql {SELECT * FROM t1}
} {2 1}
do_test lock-1.11 {
set r [catch {execsql {SELECT * FROM t1} db2} msg]
lappend r $msg
} {1 {database is locked}}
do_test lock-1.12 {
execsql {ROLLBACK}
set r [catch {execsql {SELECT * FROM t1} db2} msg]
lappend r $msg
} {0 {2 1}}
do_probtest lock-1.4 {
# Try to update the database using a timeout
#
set f [open update.sql w]
puts $f ".timeout 1000"
puts $f "UPDATE big SET f2='xyz' WHERE f1=11;"
puts $f "SELECT f2 FROM big WHERE f1=11;"
close $f
exec ./sqlite testdb <update.sql
} "UPDATE big SET f2='xyz' WHERE f1=11;\nSQL error: table big is locked\n22"
do_test lock-1.13 {
execsql {CREATE TABLE t2(x int, y int)}
execsql {INSERT INTO t2 VALUES(8,9)}
execsql {SELECT * FROM t2}
} {8 9}
do_test lock-1.14 {
set r [catch {execsql {SELECT * FROM t1} db2} msg]
lappend r $msg
} {1 {database schema has changed}}
do_test lock-1.15 {
set r [catch {execsql {SELECT * FROM t2} db2} msg]
lappend r $msg
} {0 {8 9}}
do_probtest lock-1.5 {
# Try to update the database using a timeout
#
set f [open update.sql w]
puts $f ".timeout 10000"
puts $f "UPDATE big SET f2='xyz' WHERE f1=11;"
puts $f "SELECT f2 FROM big WHERE f1=11;"
close $f
exec ./sqlite testdb <update.sql
} {xyz}
do_test lock-1.16 {
db eval {SELECT * FROM t1} qv {
set x [db eval {SELECT * FROM t1}]
}
set x
} {2 1}
do_test lock-1.17 {
db eval {SELECT * FROM t1} qv {
set x [db eval {SELECT * FROM t2}]
}
set x
} {8 9}
catch {exec ps -uax | grep $::lock_pid}
catch {exec kill -HUP $::lock_pid}
catch {exec kill -9 $::lock_pid}
# You cannot UPDATE a table from within the callback of a SELECT
# on that same table because the SELECT has the table locked.
#
do_test lock-1.18 {
db eval {SELECT * FROM t1} qv {
set r [catch {db eval {UPDATE t1 SET a=b, b=a}} msg]
lappend r $msg
}
set r
} {1 {database table is locked}}
# But you can UPDATE a different table from the one that is used in
# the SELECT.
#
do_test lock-1.19 {
db eval {SELECT * FROM t1} qv {
set r [catch {db eval {UPDATE t2 SET x=y, y=x}} msg]
lappend r $msg
}
set r
} {0 {}}
do_test lock-1.20 {
execsql {SELECT * FROM t2}
} {9 8}
# It is possible to do a SELECT of the same table within the
# callback of another SELECT on that same table because two
# or more read-only cursors can be open at once.
#
do_test lock-1.21 {
db eval {SELECT * FROM t1} qv {
set r [catch {db eval {SELECT a FROM t1}} msg]
lappend r $msg
}
set r
} {0 2}
# Under UNIX you can do two SELECTs at once with different database
# connections, because UNIX supports reader/writer locks. Under windows,
# this is not possible.
#
if {$::tcl_platform(platform)=="unix"} {
do_test lock-1.22 {
db eval {SELECT * FROM t1} qv {
set r [catch {db2 eval {SELECT a FROM t1}} msg]
lappend r $msg
}
set r
} {0 2}
}
do_test lock-999.1 {
rename db2 {}
} {}
finish_test
}

View File

@ -11,7 +11,7 @@
# This file implements regression tests for SQLite library. The
# focus of this script is database locks.
#
# $Id: trans.test,v 1.5 2001/09/17 20:48:30 drh Exp $
# $Id: trans.test,v 1.6 2001/09/23 02:35:53 drh Exp $
set testdir [file dirname $argv0]
@ -94,13 +94,13 @@ do_test trans-3.2 {
SELECT a FROM two ORDER BY a;
} altdb} msg]
lappend v $msg
} {1 {database in use by another process}}
} {1 {database is locked}}
do_test trans-3.3 {
set v [catch {execsql {
SELECT a FROM one ORDER BY a;
} altdb} msg]
lappend v $msg
} {1 {database in use by another process}}
} {1 {database is locked}}
do_test trans-3.4 {
set v [catch {execsql {
INSERT INTO one VALUES(4,'four');
@ -112,13 +112,13 @@ do_test trans-3.5 {
SELECT a FROM two ORDER BY a;
} altdb} msg]
lappend v $msg
} {1 {database in use by another process}}
} {1 {database is locked}}
do_test trans-3.6 {
set v [catch {execsql {
SELECT a FROM one ORDER BY a;
} altdb} msg]
lappend v $msg
} {1 {database in use by another process}}
} {1 {database is locked}}
do_test trans-3.7 {
set v [catch {execsql {
INSERT INTO two VALUES(4,'IV');
@ -130,13 +130,13 @@ do_test trans-3.8 {
SELECT a FROM two ORDER BY a;
} altdb} msg]
lappend v $msg
} {1 {database in use by another process}}
} {1 {database is locked}}
do_test trans-3.9 {
set v [catch {execsql {
SELECT a FROM one ORDER BY a;
} altdb} msg]
lappend v $msg
} {1 {database in use by another process}}
} {1 {database is locked}}
do_test trans-3.10 {
execsql {END TRANSACTION}
} {}
@ -189,13 +189,13 @@ do_test trans-4.4 {
SELECT a FROM two ORDER BY a;
} altdb} msg]
lappend v $msg
} {1 {database in use by another process}}
} {1 {database is locked}}
do_test trans-4.5 {
set v [catch {execsql {
SELECT a FROM one ORDER BY a;
} altdb} msg]
lappend v $msg
} {1 {database in use by another process}}
} {1 {database is locked}}
do_test trans-4.6 {
set v [catch {execsql {
BEGIN TRANSACTION;
@ -208,13 +208,13 @@ do_test trans-4.7 {
SELECT a FROM two ORDER BY a;
} altdb} msg]
lappend v $msg
} {1 {database in use by another process}}
} {1 {database is locked}}
do_test trans-4.8 {
set v [catch {execsql {
SELECT a FROM one ORDER BY a;
} altdb} msg]
lappend v $msg
} {1 {database in use by another process}}
} {1 {database is locked}}
do_test trans-4.9 {
set v [catch {execsql {
END TRANSACTION;