diff options
Diffstat (limited to 'bdb/test/test048.tcl')
| -rw-r--r-- | bdb/test/test048.tcl | 71 |
1 files changed, 51 insertions, 20 deletions
diff --git a/bdb/test/test048.tcl b/bdb/test/test048.tcl index 84c7c47b721..2131f6f553c 100644 --- a/bdb/test/test048.tcl +++ b/bdb/test/test048.tcl @@ -1,16 +1,18 @@ # See the file LICENSE for redistribution information. # -# Copyright (c) 1999, 2000 +# Copyright (c) 1999-2002 # Sleepycat Software. All rights reserved. # -# $Id: test048.tcl,v 11.11 2000/12/11 17:42:18 sue Exp $ +# $Id: test048.tcl,v 11.18 2002/07/29 20:27:49 sandstro Exp $ # -# Test048: Cursor stability across btree splits. +# TEST test048 +# TEST Cursor stability across Btree splits. proc test048 { method args } { global errorCode source ./include.tcl set tstn 048 + set args [convert_args $method $args] if { [is_btree $method] != 1 } { puts "Test$tstn skipping for method $method." @@ -35,6 +37,7 @@ proc test048 { method args } { set flags "" puts "\tTest$tstn.a: Create $method database." + set txnenv 0 set eindex [lsearch -exact $args "-env"] # # If we are using an env, then testfile should just be the db name. @@ -46,11 +49,16 @@ proc test048 { method args } { set testfile test0$tstn.db incr eindex set env [lindex $args $eindex] + set txnenv [is_txnenv $env] + if { $txnenv == 1 } { + append args " -auto_commit " + } + set testdir [get_home $env] } set t1 $testdir/t1 cleanup $testdir $env - set oflags "-create -truncate -mode 0644 $args $method" + set oflags "-create -mode 0644 $args $method" set db [eval {berkdb_open} $oflags $testfile] error_check_good dbopen [is_valid_db $db] TRUE @@ -59,20 +67,34 @@ proc test048 { method args } { # puts "\tTest$tstn.b: Fill page with $nkeys small key/data pairs." for { set i 0 } { $i < $nkeys } { incr i } { - set ret [$db put key000$i $data$i] + if { $txnenv == 1 } { + set t [$env txn] + error_check_good txn [is_valid_txn $t $env] TRUE + set txn "-txn $t" + } + set ret [eval {$db put} $txn {key000$i $data$i}] error_check_good dbput $ret 0 + if { $txnenv == 1 } { + error_check_good txn [$t commit] 0 + } } # get db ordering, set cursors puts "\tTest$tstn.c: Set cursors on each of $nkeys pairs." + if { $txnenv == 1 } { + set t [$env txn] + error_check_good txn [is_valid_txn $t $env] TRUE + set txn "-txn $t" + } for {set i 0; set ret [$db get key000$i]} {\ $i < $nkeys && [llength $ret] != 0} {\ incr i; set ret [$db get key000$i]} { set key_set($i) [lindex [lindex $ret 0] 0] set data_set($i) [lindex [lindex $ret 0] 1] - set dbc [$db cursor] + set dbc [eval {$db cursor} $txn] set dbc_set($i) $dbc - error_check_good db_cursor:$i [is_substr $dbc_set($i) $db] 1 + error_check_good db_cursor:$i \ + [is_valid_cursor $dbc_set($i) $db] TRUE set ret [$dbc_set($i) get -set $key_set($i)] error_check_bad dbc_set($i)_get:set [llength $ret] 0 } @@ -82,18 +104,21 @@ proc test048 { method args } { puts "\tTest$tstn.d: Add $mkeys pairs to force split." for {set i $nkeys} { $i < $mkeys } { incr i } { if { $i >= 100 } { - set ret [$db put key0$i $data$i] + set ret [eval {$db put} $txn {key0$i $data$i}] } elseif { $i >= 10 } { - set ret [$db put key00$i $data$i] + set ret [eval {$db put} $txn {key00$i $data$i}] } else { - set ret [$db put key000$i $data$i] + set ret [eval {$db put} $txn {key000$i $data$i}] } error_check_good dbput:more $ret 0 } puts "\tTest$tstn.e: Make sure split happened." - error_check_bad stat:check-split [is_substr [$db stat] \ + # XXX We cannot call stat with active txns or we deadlock. + if { $txnenv != 1 } { + error_check_bad stat:check-split [is_substr [$db stat] \ "{{Internal pages} 0}"] 1 + } puts "\tTest$tstn.f: Check to see that cursors maintained reference." for {set i 0} { $i < $nkeys } {incr i} { @@ -107,19 +132,18 @@ proc test048 { method args } { puts "\tTest$tstn.g: Delete added keys to force reverse split." for {set i $nkeys} { $i < $mkeys } { incr i } { if { $i >= 100 } { - error_check_good db_del:$i [$db del key0$i] 0 + error_check_good db_del:$i \ + [eval {$db del} $txn {key0$i}] 0 } elseif { $i >= 10 } { - error_check_good db_del:$i [$db del key00$i] 0 + error_check_good db_del:$i \ + [eval {$db del} $txn {key00$i}] 0 } else { - error_check_good db_del:$i [$db del key000$i] 0 + error_check_good db_del:$i \ + [eval {$db del} $txn {key000$i}] 0 } } - puts "\tTest$tstn.h: Verify reverse split." - error_check_good stat:check-reverse_split [is_substr [$db stat] \ - "{{Internal pages} 0}"] 1 - - puts "\tTest$tstn.i: Verify cursor reference." + puts "\tTest$tstn.h: Verify cursor reference." for {set i 0} { $i < $nkeys } {incr i} { set ret [$dbc_set($i) get -current] error_check_bad dbc$i:get:current [llength $ret] 0 @@ -128,11 +152,18 @@ proc test048 { method args } { error_check_good dbc$i:get(match) $ret $ret2 } - puts "\tTest$tstn.j: Cleanup." + puts "\tTest$tstn.i: Cleanup." # close cursors for {set i 0} { $i < $nkeys } {incr i} { error_check_good dbc_close:$i [$dbc_set($i) close] 0 } + if { $txnenv == 1 } { + error_check_good txn [$t commit] 0 + } + puts "\tTest$tstn.j: Verify reverse split." + error_check_good stat:check-reverse_split [is_substr [$db stat] \ + "{{Internal pages} 0}"] 1 + error_check_good dbclose [$db close] 0 puts "\tTest$tstn complete." |