diff options
Diffstat (limited to 'bdb/test/test021.tcl')
| -rw-r--r-- | bdb/test/test021.tcl | 54 |
1 files changed, 43 insertions, 11 deletions
diff --git a/bdb/test/test021.tcl b/bdb/test/test021.tcl index f9a1fe32f7e..56936da389a 100644 --- a/bdb/test/test021.tcl +++ b/bdb/test/test021.tcl @@ -1,25 +1,26 @@ # See the file LICENSE for redistribution information. # -# Copyright (c) 1996, 1997, 1998, 1999, 2000 +# Copyright (c) 1996-2002 # Sleepycat Software. All rights reserved. # -# $Id: test021.tcl,v 11.10 2000/08/25 14:21:55 sue Exp $ +# $Id: test021.tcl,v 11.15 2002/05/22 15:42:47 sue Exp $ # -# DB Test 21 {access method} -# Use the first 10,000 entries from the dictionary. -# Insert each with self, reversed as key and self as data. -# After all are entered, retrieve each using a cursor SET_RANGE, and getting -# about 20 keys sequentially after it (in some cases we'll run out towards -# the end of the file). +# TEST test021 +# TEST Btree range tests. +# TEST +# TEST Use the first 10,000 entries from the dictionary. +# TEST Insert each with self, reversed as key and self as data. +# TEST After all are entered, retrieve each using a cursor SET_RANGE, and +# TEST getting about 20 keys sequentially after it (in some cases we'll +# TEST run out towards the end of the file). proc test021 { method {nentries 10000} args } { source ./include.tcl set args [convert_args $method $args] set omethod [convert_method $method] - puts "Test021: $method ($args) $nentries equal key/data pairs" - # 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. @@ -31,13 +32,27 @@ proc test021 { method {nentries 10000} args } { set testfile test021.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] } + puts "Test021: $method ($args) $nentries equal key/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] @@ -65,9 +80,17 @@ proc test021 { method {nentries 10000} args } { set key [reverse $str] } + if { $txnenv == 1 } { + set t [$env txn] + error_check_good txn [is_valid_txn $t $env] TRUE + set txn "-txn $t" + } set r [eval {$db put} \ $txn $pflags {$key [chop_data $method $str]}] error_check_good db_put $r 0 + if { $txnenv == 1 } { + error_check_good txn [$t commit] 0 + } incr count } close $did @@ -81,6 +104,11 @@ proc test021 { method {nentries 10000} args } { error_check_good dbopen [is_valid_db $db] TRUE # Open a cursor + if { $txnenv == 1 } { + set t [$env txn] + error_check_good txn [is_valid_txn $t $env] TRUE + set txn "-txn $t" + } set dbc [eval {$db cursor} $txn] error_check_good db_cursor [is_substr $dbc $db] 1 @@ -112,6 +140,10 @@ proc test021 { method {nentries 10000} args } { } incr i } + error_check_good dbc_close [$dbc close] 0 + if { $txnenv == 1 } { + error_check_good txn [$t commit] 0 + } error_check_good db_close [$db close] 0 close $did } |