diff options
Diffstat (limited to 'bdb/test/test002.tcl')
| -rw-r--r-- | bdb/test/test002.tcl | 61 |
1 files changed, 47 insertions, 14 deletions
diff --git a/bdb/test/test002.tcl b/bdb/test/test002.tcl index 882240b77bb..bc28994d6a7 100644 --- a/bdb/test/test002.tcl +++ b/bdb/test/test002.tcl @@ -1,17 +1,21 @@ # See the file LICENSE for redistribution information. # -# Copyright (c) 1996, 1997, 1998, 1999, 2000 +# Copyright (c) 1996-2002 # Sleepycat Software. All rights reserved. # -# $Id: test002.tcl,v 11.13 2000/08/25 14:21:53 sue Exp $ +# $Id: test002.tcl,v 11.19 2002/05/22 15:42:43 sue Exp $ # -# DB Test 2 {access method} -# Use the first 10,000 entries from the dictionary. -# Insert each with self as key and a fixed, medium length data string; -# retrieve each. After all are entered, retrieve all; compare output -# to original. Close file, reopen, do retrieve and re-verify. - -set datastr abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz +# TEST test002 +# TEST Small keys/medium data +# TEST Put/get per key +# TEST Dump file +# TEST Close, reopen +# TEST Dump file +# TEST +# TEST Use the first 10,000 entries from the dictionary. +# TEST Insert each with self as key and a fixed, medium length data string; +# TEST retrieve each. After all are entered, retrieve all; compare output +# TEST to original. Close file, reopen, do retrieve and re-verify. proc test002 { method {nentries 10000} args } { global datastr @@ -21,8 +25,7 @@ proc test002 { method {nentries 10000} args } { set args [convert_args $method $args] set omethod [convert_method $method] - puts "Test002: $method ($args) $nentries key <fixed data> pairs" - + set txnenv 0 set eindex [lsearch -exact $args "-env"] # # If we are using an env, then testfile should just be the db name. @@ -34,14 +37,28 @@ proc test002 { method {nentries 10000} args } { set testfile test002.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] } # Create the database and open the dictionary + puts "Test002: $method ($args) $nentries key <fixed data> pairs" + set t1 $testdir/t1 set t2 $testdir/t2 set t3 $testdir/t3 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] @@ -63,8 +80,16 @@ proc test002 { method {nentries 10000} args } { } else { set key $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 {$key [chop_data $method $datastr]}] error_check_good put $ret 0 + if { $txnenv == 1 } { + error_check_good txn [$t commit] 0 + } set ret [eval {$db get} $gflags {$key}] @@ -76,7 +101,15 @@ proc test002 { method {nentries 10000} args } { # Now we will get each key from the DB and compare the results # to the original. puts "\tTest002.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 test002.check + if { $txnenv == 1 } { + error_check_good txn [$t commit] 0 + } error_check_good db_close [$db close] 0 # Now compare the keys to see if they match the dictionary @@ -100,7 +133,7 @@ proc test002 { method {nentries 10000} args } { # Now, reopen the file and run the last test again. puts "\tTest002.c: close, open, and dump file" - open_and_dump_file $testfile $env $txn $t1 test002.check \ + open_and_dump_file $testfile $env $t1 test002.check \ dump_file_direction "-first" "-next" if { [string compare $omethod "-recno"] != 0 } { @@ -111,7 +144,7 @@ proc test002 { method {nentries 10000} args } { # Now, reopen the file and run the last test again in reverse direction. puts "\tTest002.d: close, open, and dump file in reverse direction" - open_and_dump_file $testfile $env $txn $t1 test002.check \ + open_and_dump_file $testfile $env $t1 test002.check \ dump_file_direction "-last" "-prev" if { [string compare $omethod "-recno"] != 0 } { |