Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | The btree.c module passes all tests and is ready for integration. Still need to go back and do coverage testing. (CVS 1343) |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
84506b23365933383397e02a8ec5a980 |
User & Date: | drh 2004-05-10 18:45:10.000 |
Context
2004-05-10
| ||
23:29 | Work toward getting the new btree.c integrated with vdbe.c. (CVS 1345) (check-in: bc5a2dafa1 user: drh tags: trunk) | |
18:45 | The btree.c module passes all tests and is ready for integration. Still need to go back and do coverage testing. (CVS 1343) (check-in: 84506b2336 user: drh tags: trunk) | |
16:18 | The btree.c module now passes all the historical regression tests. New tests for new functionality still need to be added. (CVS 1342) (check-in: 433ae0d327 user: drh tags: trunk) | |
Changes
Changes to src/btree.c.
1 2 3 4 5 6 7 8 9 10 11 | /* ** 2004 April 6 ** ** The author disclaims copyright to this source code. In place of ** a legal notice, here is a blessing: ** ** May you do good and not evil. ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | /* ** 2004 April 6 ** ** The author disclaims copyright to this source code. In place of ** a legal notice, here is a blessing: ** ** May you do good and not evil. ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** $Id: btree.c,v 1.123 2004/05/10 18:45:10 drh Exp $ ** ** This file implements a external (disk-based) database using BTrees. ** For a detailed discussion of BTrees, refer to ** ** Donald E. Knuth, THE ART OF COMPUTER PROGRAMMING, Volume 3: ** "Sorting And Searching", pages 473-480. Addison-Wesley ** Publishing Company, Reading, Massachusetts. |
︙ | ︙ | |||
1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 | pCur->pPage = pRoot; pCur->idx = 0; if( pRoot->nCell==0 && !pRoot->leaf ){ Pgno subpage; assert( pRoot->pgno==1 ); subpage = get4byte(&pRoot->aData[pRoot->hdrOffset+6]); assert( subpage>0 ); rc = moveToChild(pCur, subpage); } pCur->isValid = pCur->pPage->nCell>0; return rc; } /* | > | 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 | pCur->pPage = pRoot; pCur->idx = 0; if( pRoot->nCell==0 && !pRoot->leaf ){ Pgno subpage; assert( pRoot->pgno==1 ); subpage = get4byte(&pRoot->aData[pRoot->hdrOffset+6]); assert( subpage>0 ); pCur->isValid = 1; rc = moveToChild(pCur, subpage); } pCur->isValid = pCur->pPage->nCell>0; return rc; } /* |
︙ | ︙ | |||
3493 3494 3495 3496 3497 3498 3499 | i++; idx = get2byte(pCell); } if( idx!=0 ){ printf("ERROR: next cell index out of range: %d\n", idx); } if( !pPage->leaf ){ | | | 3494 3495 3496 3497 3498 3499 3500 3501 3502 3503 3504 3505 3506 3507 3508 | i++; idx = get2byte(pCell); } if( idx!=0 ){ printf("ERROR: next cell index out of range: %d\n", idx); } if( !pPage->leaf ){ printf("right_child: %d\n", get4byte(&data[hdr+6])); } nFree = 0; i = 0; idx = get2byte(&data[hdr+1]); while( idx>0 && idx<pPage->pBt->pageSize ){ int sz = get2byte(&data[idx+2]); sprintf(range,"%d..%d", idx, idx+sz-1); |
︙ | ︙ | |||
3520 3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533 | unsigned char *pCell = &data[idx]; sqlite3BtreePageDump(pBt, get4byte(&pCell[2]), 1); idx = get2byte(pCell); } sqlite3BtreePageDump(pBt, get4byte(&data[hdr+6]), 1); } sqlite3pager_unref(data); return SQLITE_OK; } #endif #ifdef SQLITE_TEST /* ** Return the flag byte at the beginning of the page that the cursor | > | 3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533 3534 3535 | unsigned char *pCell = &data[idx]; sqlite3BtreePageDump(pBt, get4byte(&pCell[2]), 1); idx = get2byte(pCell); } sqlite3BtreePageDump(pBt, get4byte(&data[hdr+6]), 1); } sqlite3pager_unref(data); fflush(stdout); return SQLITE_OK; } #endif #ifdef SQLITE_TEST /* ** Return the flag byte at the beginning of the page that the cursor |
︙ | ︙ |
Added test/btree5.test.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 | # 2004 May 10 # # The author disclaims copyright to this source code. In place of # a legal notice, here is a blessing: # # May you do good and not evil. # May you find forgiveness for yourself and forgive others. # May you share freely, never taking more than you give. # #*********************************************************************** # This file implements regression tests for SQLite library. The # focus of this script is btree database backend # # $Id: btree5.test,v 1.1 2004/05/10 18:45:10 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl # Attempting to read table 1 of an empty file gives an SQLITE_EMPTY # error. # do_test btree5-1.1 { file delete -force test1.bt file delete -force test1.bt-journal set rc [catch {btree_open test1.bt 2000 0} ::b1] } {0} do_test btree5-1.2 { set rc [catch {btree_cursor $::b1 1 0} ::c1] } {1} do_test btree5-1.3 { set ::c1 } {SQLITE_EMPTY} do_test btree5-1.4 { set rc [catch {btree_cursor $::b1 1 1} ::c1] } {1} do_test btree5-1.5 { set ::c1 } {SQLITE_EMPTY} # Starting a transaction initializes the first page of the database # and the error goes away. # do_test btree5-1.6 { btree_begin_transaction $b1 set rc [catch {btree_cursor $b1 1 0} c1] } {0} do_test btree5-1.7 { btree_first $c1 } {1} do_test btree5-1.8 { btree_close_cursor $c1 btree_rollback $b1 set rc [catch {btree_cursor $b1 1 0} c1] } {1} do_test btree5-1.9 { set c1 } {SQLITE_EMPTY} do_test btree5-1.10 { btree_begin_transaction $b1 set rc [catch {btree_cursor $b1 1 0} c1] } {0} do_test btree5-1.11 { btree_first $c1 } {1} do_test btree5-1.12 { btree_close_cursor $c1 btree_commit $b1 set rc [catch {btree_cursor $b1 1 0} c1] } {0} do_test btree5-1.13 { btree_first $c1 } {1} do_test btree5-1.14 { btree_close_cursor $c1 btree_integrity_check $b1 1 } {} # Insert many entries into table 1. This is designed to test the # virtual-root logic that comes into play for page one. It is also # a good test of INTKEY tables. # # Stagger the inserts. After the inserts complete, go back and do # deletes. Stagger the deletes too. Repeat this several times. # # Do N inserts into table 1 using random keys between 0 and 1000000 # proc random_inserts {N} { global c1 while {$N>0} { set k [expr {int(rand()*1000000)}] if {[btree_move_to $c1 $k]==0} continue; # entry already exists btree_insert $c1 $k data-for-$k incr N -1 } } # Do N delete from table 1 # proc random_deletes {N} { global c1 while {$N>0} { set k [expr {int(rand()*1000000)}] btree_move_to $c1 $k btree_delete $c1 incr N -1 } } # Make sure the table has exactly N entries. Make sure the data for # each entry agrees with its key. # proc check_table {N} { global c1 btree_first $c1 set cnt 0 while {![btree_eof $c1]} { if {[btree_data $c1] ne "data-for-[btree_key $c1]"} { return "wrong data for entry $cnt" } incr cnt btree_next $c1 } if {$cnt!=$N} { return "wrong number of entries" } return {} } # Initialize the database # btree_begin_transaction $b1 set c1 [btree_cursor $b1 1 1] set btree_trace 0 # Do the tests. # set cnt 0 for {set i 1} {$i<=100} {incr i} { do_test test5-2.$i.1 { random_inserts 200 incr cnt 200 check_table $cnt } {} do_test test5-2.$i.2 { btree_integrity_check $b1 1 } {} do_test test5-2.$i.3 { random_deletes 190 incr cnt -190 check_table $cnt } {} do_test test5-2.$i.4 { btree_integrity_check $b1 1 } {} } btree_close_cursor $c1 btree_commit $b1 btree_begin_transaction $b1 # This procedure converts an integer into a variable-length text key. # The conversion is reversible. # # The first two characters of the string are alphabetics derived from # the least significant bits of the number. Because they are derived # from least significant bits, the sort order of the resulting string # is different from numeric order. After the alphabetic prefix comes # the original number. A variable-length suffix follows. The length # of the suffix is based on a hash of the original number. # proc num_to_key {n} { global charset ncharset suffix set c1 [string index $charset [expr {$n%$ncharset}]] set c2 [string index $charset [expr {($n/$ncharset)%$ncharset}]] set nsuf [expr {($n*211)%593}] return $c1$c2-$n-[string range $suffix 0 $nsuf] } set charset {abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ} set ncharset [string length $charset] set suffix $charset$charset while {[string length $suffix]<1000} {append suffix $suffix} # This procedures extracts the original integer used to create # a key by num_to_key # proc key_to_num {key} { regexp {^..-([0-9]+)} $key all n return $n } # Insert into table $tab keys corresponding to all values between # $start and $end, inclusive. # proc insert_range {tab start end} { for {set i $start} {$i<=$end} {incr i} { btree_insert $tab [num_to_key $i] {} } } # Delete from table $tab keys corresponding to all values between # $start and $end, inclusive. # proc delete_range {tab start end} { for {set i $start} {$i<=$end} {incr i} { if {[btree_move_to $tab [num_to_key $i]]==0} { btree_delete $tab } } } # Make sure table $tab contains exactly those keys corresponding # to values between $start and $end # proc check_range {tab start end} { btree_first $tab while {![btree_eof $tab]} { set key [btree_key $tab] set i [key_to_num $key] if {[num_to_key $i] ne $key} { return "malformed key: $key" } set got($i) 1 btree_next $tab } set all [lsort -integer [array names got]] if {[llength $all]!=$end+1-$start} { return "table contains wrong number of values" } if {[lindex $all 0]!=$start} { return "wrong starting value" } if {[lindex $all end]!=$end} { return "wrong ending value" } return {} } # Create a zero-data table and test it out. # do_test btree5-3.1 { set rc [catch {btree_create_table $b1 2} t2] } {0} do_test btree5-3.2 { set rc [catch {btree_cursor $b1 $t2 1} c2] } {0} set start 1 set end 100 for {set i 1} {$i<=100} {incr i} { do_test btree5-3.3.$i.1 { insert_range $c2 $start $end btree_integrity_check $b1 1 $t2 } {} do_test btree5-3.3.$i.2 { check_range $c2 $start $end } {} set nstart $start incr nstart 89 do_test btree5-3.3.$i.3 { delete_range $c2 $start $nstart btree_integrity_check $b1 1 $t2 } {} incr start 90 do_test btree5-3.3.$i.4 { check_range $c2 $start $end } {} incr end 100 } btree_close_cursor $c2 btree_commit $b1 finish_test |