diff options
Diffstat (limited to 'bdb/test/test056.tcl')
| -rw-r--r-- | bdb/test/test056.tcl | 40 |
1 files changed, 32 insertions, 8 deletions
diff --git a/bdb/test/test056.tcl b/bdb/test/test056.tcl index ade3890c3f9..ef310332ed1 100644 --- a/bdb/test/test056.tcl +++ b/bdb/test/test056.tcl @@ -1,12 +1,14 @@ # See the file LICENSE for redistribution information. # -# Copyright (c) 1996, 1997, 1998, 1999, 2000 +# Copyright (c) 1996-2002 # Sleepycat Software. All rights reserved. # -# $Id: test056.tcl,v 11.13 2000/08/25 14:21:57 sue Exp $ +# $Id: test056.tcl,v 11.18 2002/05/22 15:42:55 sue Exp $ # -# Test056 -# Check if deleting a key when a cursor is on a duplicate of that key works. +# TEST test056 +# TEST Cursor maintenance during deletes. +# TEST Check if deleting a key when a cursor is on a duplicate of that +# TEST key works. proc test056 { method args } { global errorInfo source ./include.tcl @@ -14,7 +16,7 @@ proc test056 { method args } { set args [convert_args $method $args] set omethod [convert_method $method] - append args " -create -truncate -mode 0644 -dup " + append args " -create -mode 0644 -dup " if { [is_record_based $method] == 1 || [is_rbtree $method] } { puts "Test056: skipping for method $method" return @@ -22,6 +24,7 @@ proc test056 { method args } { puts "Test056: $method delete of key in presence of cursor" # 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. @@ -33,6 +36,11 @@ proc test056 { method args } { set testfile test056.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] } cleanup $testdir $env @@ -42,18 +50,31 @@ proc test056 { method args } { set db [eval {berkdb_open} $args {$omethod $testfile}] error_check_good db_open:dup [is_valid_db $db] TRUE - set curs [eval {$db cursor} $txn] - error_check_good curs_open:dup [is_substr $curs $db] 1 - puts "\tTest056.a: Key delete with cursor on duplicate." # Put three keys in the database for { set key 1 } { $key <= 3 } {incr key} { + 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 $flags {$key datum$key}] error_check_good put $r 0 + if { $txnenv == 1 } { + error_check_good txn [$t commit] 0 + } } # Retrieve keys sequentially so we can figure out their order set i 1 + if { $txnenv == 1 } { + set t [$env txn] + error_check_good txn [is_valid_txn $t $env] TRUE + set txn "-txn $t" + } + set curs [eval {$db cursor} $txn] + error_check_good curs_open:dup [is_valid_cursor $curs $db] TRUE + for {set d [$curs get -first] } { [llength $d] != 0 } { set d [$curs get -next] } { set key_set($i) [lindex [lindex $d 0] 0] @@ -141,5 +162,8 @@ proc test056 { method args } { error_check_good curs_get:DB_FIRST:data $d datum$key_set(3) error_check_good curs_close [$curs close] 0 + if { $txnenv == 1 } { + error_check_good txn [$t commit] 0 + } error_check_good db_close [$db close] 0 } |