diff options
Diffstat (limited to 'bdb/test/test025.tcl')
| -rw-r--r-- | bdb/test/test025.tcl | 63 |
1 files changed, 52 insertions, 11 deletions
diff --git a/bdb/test/test025.tcl b/bdb/test/test025.tcl index 9f8deecb488..180a1aa2939 100644 --- a/bdb/test/test025.tcl +++ b/bdb/test/test025.tcl @@ -1,12 +1,12 @@ # See the file LICENSE for redistribution information. # -# Copyright (c) 1996, 1997, 1998, 1999, 2000 +# Copyright (c) 1996-2002 # Sleepycat Software. All rights reserved. # -# $Id: test025.tcl,v 11.11 2000/11/16 23:56:18 ubell Exp $ +# $Id: test025.tcl,v 11.19 2002/05/24 15:24:54 sue Exp $ # -# DB Test 25 {method nentries} -# Test the DB_APPEND flag. +# TEST test025 +# TEST DB_APPEND flag test. proc test025 { method {nentries 10000} {start 0 } {tnum "25" } args} { global kvals source ./include.tcl @@ -25,6 +25,7 @@ proc test025 { method {nentries 10000} {start 0 } {tnum "25" } args} { } # Create the database and open the dictionary + set txnenv 0 set eindex [lsearch -exact $args "-env"] # # If we are using an env, then testfile should just be the db name. @@ -36,12 +37,24 @@ proc test025 { method {nentries 10000} {start 0 } {tnum "25" } args} { set testfile test0$tnum.db incr eindex set env [lindex $args $eindex] + set txnenv [is_txnenv $env] + if { $txnenv == 1 } { + append args " -auto_commit " + # + # If we are using txns and running with the + # default, set the default down a bit. + # + if { $nentries == 10000 } { + set nentries 100 + } + } + set testdir [get_home $env] } set t1 $testdir/t1 cleanup $testdir $env set db [eval {berkdb_open \ - -create -truncate -mode 0644} $args {$omethod $testfile}] + -create -mode 0644} $args {$omethod $testfile}] error_check_good dbopen [is_valid_db $db] TRUE set did [open $dict] @@ -58,22 +71,42 @@ proc test025 { method {nentries 10000} {start 0 } {tnum "25" } args} { gets $did str set k [expr $count + 1] set kvals($k) [pad_data $method $str] - set ret [eval {$db put} $txn $k {[chop_data $method $str]}] + 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 {$k [chop_data $method $str]}] error_check_good db_put $ret 0 + if { $txnenv == 1 } { + error_check_good txn [$t commit] 0 + } incr count } - + while { [gets $did str] != -1 && $count < $nentries } { set k [expr $count + 1] set kvals($k) [pad_data $method $str] + 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 $pflags {[chop_data $method $str]}] error_check_good db_put $ret $k set ret [eval {$db get} $txn $gflags {$k}] error_check_good \ get $ret [list [list $k [pad_data $method $str]]] - incr count - if { [expr $count + 1] == 0 } { + if { $txnenv == 1 } { + error_check_good txn [$t commit] 0 + } + + # The recno key will be count + 1, so when we hit + # UINT32_MAX - 1, reset to 0. + if { $count == [expr 0xfffffffe] } { + set count 0 + } else { incr count } } @@ -82,18 +115,26 @@ proc test025 { method {nentries 10000} {start 0 } {tnum "25" } args} { # Now we will get each key from the DB and compare the results # to the original. puts "\tTest0$tnum.b: dump file" + if { $txnenv == 1 } { + set t [$env txn] + error_check_good txn [is_valid_txn $t $env] TRUE + set txn "-txn $t" + } dump_file $db $txn $t1 $checkfunc + if { $txnenv == 1 } { + error_check_good txn [$t commit] 0 + } error_check_good db_close [$db close] 0 puts "\tTest0$tnum.c: close, open, and dump file" # Now, reopen the file and run the last test again. - open_and_dump_file $testfile $env $txn $t1 $checkfunc \ + open_and_dump_file $testfile $env $t1 $checkfunc \ dump_file_direction -first -next # Now, reopen the file and run the last test again in the # reverse direction. puts "\tTest0$tnum.d: close, open, and dump file in reverse direction" - open_and_dump_file $testfile $env $txn $t1 $checkfunc \ + open_and_dump_file $testfile $env $t1 $checkfunc \ dump_file_direction -last -prev } |