Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | The btree.c module compiles and links and passes some tests. Many tests still fail, though. (CVS 1321) |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
d394b2b217d4d728f9eba397262bf9d3 |
User & Date: | drh 2004-05-07 17:57:50.000 |
Context
2004-05-07
| ||
23:50 | More bug fixes in btree.c. (CVS 1322) (check-in: a80939ef71 user: drh tags: trunk) | |
17:57 | The btree.c module compiles and links and passes some tests. Many tests still fail, though. (CVS 1321) (check-in: d394b2b217 user: drh tags: trunk) | |
13:30 | New btree.c module compiles and links. (CVS 1320) (check-in: dcd6b55f93 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.111 2004/05/07 17:57:50 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. |
︙ | ︙ | |||
53 54 55 56 57 58 59 | ** page. ** ** The first page is always a btree page. The first 100 bytes of the first ** page contain a special header that describes the file. The format ** of that header is as follows: ** ** OFFSET SIZE DESCRIPTION | | | 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 | ** page. ** ** The first page is always a btree page. The first 100 bytes of the first ** page contain a special header that describes the file. The format ** of that header is as follows: ** ** OFFSET SIZE DESCRIPTION ** 0 16 Header string: "SQLite format 3\000" ** 16 2 Page size in bytes. ** 18 1 File format write version ** 19 1 File format read version ** 20 2 Bytes of unused space at the end of each page ** 22 2 Maximum allowed local payload per entry ** 24 8 File change counter ** 32 4 First freelist page |
︙ | ︙ | |||
183 184 185 186 187 188 189 | /* Forward declarations */ typedef struct MemPage MemPage; /* ** This is a magic string that appears at the beginning of every ** SQLite database in order to identify the file as a real database. | | | | | > | 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 | /* Forward declarations */ typedef struct MemPage MemPage; /* ** This is a magic string that appears at the beginning of every ** SQLite database in order to identify the file as a real database. ** 123456789 123456 */ static const char zMagicHeader[] = "SQLite format 3"; /* ** Page type flags. An ORed combination of these flags appear as the ** first byte of every BTree page. */ #define PTF_INTKEY 0x01 #define PTF_ZERODATA 0x02 #define PTF_LEAF 0x04 /* Idea for the future: PTF_LEAFDATA */ /* ** As each page of the file is loaded into memory, an instance of the following ** structure is appended and initialized to zero. This structure stores ** information about the page that is decoded from the raw file page. ** ** The pParent field points back to the parent page. This allows us to ** walk up the BTree from any leaf to the root. Care must be taken to ** unref() the parent page pointer when this page is no longer referenced. ** The pageDestructor() routine handles that chore. */ struct MemPage { u32 notUsed; struct Btree *pBt; /* Pointer back to BTree structure */ unsigned char *aData; /* Pointer back to the start of the page */ u8 isInit; /* True if previously initialized */ u8 idxShift; /* True if Cell indices have changed */ u8 isOverfull; /* Some aCell[] do not fit on page */ u8 intKey; /* True if intkey flag is set */ u8 leaf; /* True if leaf flag is set */ |
︙ | ︙ | |||
322 323 324 325 326 327 328 | /* ** Write a variable length integer with value v into p[]. Return ** the number of bytes written. */ static unsigned int putVarint(unsigned char *p, u64 v){ int i = 0; do{ | | | | 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 | /* ** Write a variable length integer with value v into p[]. Return ** the number of bytes written. */ static unsigned int putVarint(unsigned char *p, u64 v){ int i = 0; do{ p[i++] = (v & 0x7f) | 0x80; v >>= 7; }while( v!=0 ); p[i-1] &= 0x7f; return i; } /* ** Parse a cell header and fill in the CellInfo structure. */ static void parseCellHeader( |
︙ | ︙ | |||
350 351 352 353 354 355 356 | n = 6; } if( pPage->zeroData ){ *pnData = 0; }else{ n += getVarint(&pCell[n], pnData); } | | | 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 | n = 6; } if( pPage->zeroData ){ *pnData = 0; }else{ n += getVarint(&pCell[n], pnData); } n += getVarint(&pCell[n], pnKey); *pnHeader = n; } /* ** Compute the total number of bytes that a Cell needs on the main ** database page. The number returned includes the Cell header, ** local payload storage, and the pointer to overflow pages (if |
︙ | ︙ | |||
485 486 487 488 489 490 491 | addr = pPage->hdrOffset+1; pc = get2byte(&data[addr]); } } assert( pc>0 && size>=nByte ); assert( pc+size<=pPage->pBt->pageSize ); if( size>nByte+4 ){ | > | | | | 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 | addr = pPage->hdrOffset+1; pc = get2byte(&data[addr]); } } assert( pc>0 && size>=nByte ); assert( pc+size<=pPage->pBt->pageSize ); if( size>nByte+4 ){ int newStart = pc+nByte; put2byte(&data[addr], newStart); put2byte(&data[newStart], get2byte(&data[pc])); put2byte(&data[newStart+2], size-nByte); }else{ put2byte(&data[addr], get2byte(&data[pc])); data[hdr+5] += size-nByte; } pPage->nFree -= nByte; assert( pPage->nFree>=0 ); return pc; |
︙ | ︙ | |||
687 688 689 690 691 692 693 | unsigned char *data; int pageSize; int sumCell = 0; /* Total size of all cells */ assert( pPage->pBt!=0 ); assert( pParent==0 || pParent->pBt==pPage->pBt ); assert( pPage->pgno==sqlite3pager_pagenumber(pPage->aData) ); | | > | | 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 | unsigned char *data; int pageSize; int sumCell = 0; /* Total size of all cells */ assert( pPage->pBt!=0 ); assert( pParent==0 || pParent->pBt==pPage->pBt ); assert( pPage->pgno==sqlite3pager_pagenumber(pPage->aData) ); assert( pPage->aData == &((unsigned char*)pPage)[-pPage->pBt->pageSize] ); assert( pPage->isInit==0 || pPage->pParent==pParent ); if( pPage->isInit ) return SQLITE_OK; assert( pPage->pParent==0 ); pPage->pParent = pParent; if( pParent ){ sqlite3pager_ref(pParent->aData); } pPage->nCell = pPage->nCellAlloc = 0; assert( pPage->hdrOffset==(pPage->pgno==1 ? 100 : 0) ); hdr = pPage->hdrOffset; data = pPage->aData; c = data[hdr]; pPage->intKey = (c & PTF_INTKEY)!=0; pPage->zeroData = (c & PTF_ZERODATA)!=0; pPage->leaf = (c & PTF_LEAF)!=0; pageSize = pPage->pBt->pageSize; |
︙ | ︙ | |||
718 719 720 721 722 723 724 | } if( resizeCellArray(pPage, pPage->nCell) ){ return SQLITE_NOMEM; } pc = get2byte(&data[hdr+3]); for(i=0; pc>0; i++){ pPage->aCell[i] = &data[pc]; | < > | 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 | } if( resizeCellArray(pPage, pPage->nCell) ){ return SQLITE_NOMEM; } pc = get2byte(&data[hdr+3]); for(i=0; pc>0; i++){ pPage->aCell[i] = &data[pc]; sumCell += cellSize(pPage, &data[pc]); pc = get2byte(&data[pc]); } /* Compute the total free space on the page */ pPage->nFree = data[hdr+5]; pc = get2byte(&data[hdr+1]); while( pc>0 ){ int next, size; |
︙ | ︙ | |||
742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 | /* Sanity check: Cells and freespace and header must sum to the size ** a page. */ if( sumCell+pPage->nFree+hdr+10-pPage->leaf*4 != pageSize ){ return SQLITE_CORRUPT; } return SQLITE_OK; } /* ** Set up a raw page so that it looks like a database page holding ** no entries. */ static void zeroPage(MemPage *pPage, int flags){ unsigned char *data = pPage->aData; Btree *pBt = pPage->pBt; int hdr = pPage->hdrOffset; int first; assert( sqlite3pager_iswriteable(data) ); memset(&data[hdr], 0, pBt->pageSize - hdr); data[hdr] = flags; | > | > | 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 | /* Sanity check: Cells and freespace and header must sum to the size ** a page. */ if( sumCell+pPage->nFree+hdr+10-pPage->leaf*4 != pageSize ){ return SQLITE_CORRUPT; } pPage->isInit = 1; return SQLITE_OK; } /* ** Set up a raw page so that it looks like a database page holding ** no entries. */ static void zeroPage(MemPage *pPage, int flags){ unsigned char *data = pPage->aData; Btree *pBt = pPage->pBt; int hdr = pPage->hdrOffset; int first; assert( sqlite3pager_iswriteable(data) ); memset(&data[hdr], 0, pBt->pageSize - hdr); data[hdr] = flags; first = hdr + 6 + 4*((flags&PTF_LEAF)==0); put2byte(&data[hdr+1], first); put2byte(&data[first+2], pBt->pageSize - first); sqliteFree(pPage->aCell); pPage->aCell = 0; pPage->nCell = 0; pPage->nCellAlloc = 0; pPage->nFree = pBt->pageSize - first; pPage->intKey = (flags & PTF_INTKEY)!=0; pPage->leaf = (flags & PTF_LEAF)!=0; pPage->zeroData = (flags & PTF_ZERODATA)!=0; pPage->hdrOffset = hdr; } |
︙ | ︙ | |||
785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 | MemPage *pPage; rc = sqlite3pager_get(pBt->pPager, pgno, (void**)&aData); if( rc ) return rc; pPage = (MemPage*)&aData[pBt->pageSize]; pPage->aData = aData; pPage->pBt = pBt; pPage->pgno = pgno; *ppPage = pPage; return SQLITE_OK; } /* ** Release a MemPage. This should be called once for each prior ** call to getPage. */ static void releasePage(MemPage *pPage){ if( pPage ){ | > > > > > > > > > > > > > > > > > > > > | 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 | MemPage *pPage; rc = sqlite3pager_get(pBt->pPager, pgno, (void**)&aData); if( rc ) return rc; pPage = (MemPage*)&aData[pBt->pageSize]; pPage->aData = aData; pPage->pBt = pBt; pPage->pgno = pgno; pPage->hdrOffset = pPage->pgno==1 ? 100 : 0; *ppPage = pPage; return SQLITE_OK; } /* ** Get a page from the pager and initialize it. This routine ** is just a convenience wrapper around separate calls to ** getPage() and initPage(). */ static int getAndInitPage( Btree *pBt, /* The database file */ Pgno pgno, /* Number of the page to get */ MemPage **ppPage, /* Write the page pointer here */ MemPage *pParent /* Parent of the page */ ){ int rc; rc = getPage(pBt, pgno, ppPage); if( rc==SQLITE_OK ){ rc = initPage(*ppPage, pParent); } return rc; } /* ** Release a MemPage. This should be called once for each prior ** call to getPage. */ static void releasePage(MemPage *pPage){ if( pPage ){ |
︙ | ︙ | |||
984 985 986 987 988 989 990 | ** Create a new database by initializing the first page of the ** file. */ static int newDatabase(Btree *pBt){ MemPage *pP1; unsigned char *data; int rc; | | | 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 | ** Create a new database by initializing the first page of the ** file. */ static int newDatabase(Btree *pBt){ MemPage *pP1; unsigned char *data; int rc; if( sqlite3pager_pagecount(pBt->pPager)>0 ) return SQLITE_OK; pP1 = pBt->pPage1; assert( pP1!=0 ); data = pP1->aData; rc = sqlite3pager_write(data); if( rc ) return rc; memcpy(data, zMagicHeader, sizeof(zMagicHeader)); assert( sizeof(zMagicHeader)==16 ); |
︙ | ︙ | |||
1227 1228 1229 1230 1231 1232 1233 | } pCur = sqliteMalloc( sizeof(*pCur) ); if( pCur==0 ){ rc = SQLITE_NOMEM; goto create_cursor_exception; } pCur->pgnoRoot = (Pgno)iTable; | | < < < < | 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 | } pCur = sqliteMalloc( sizeof(*pCur) ); if( pCur==0 ){ rc = SQLITE_NOMEM; goto create_cursor_exception; } pCur->pgnoRoot = (Pgno)iTable; rc = getAndInitPage(pBt, pCur->pgnoRoot, &pCur->pPage, 0); if( rc!=SQLITE_OK ){ goto create_cursor_exception; } pCur->xCompare = xCmp ? xCmp : dfltCompare; pCur->pArg = pArg; pCur->pBt = pBt; pCur->wrFlag = wrFlag; |
︙ | ︙ | |||
1334 1335 1336 1337 1338 1339 1340 | pPage = pCur->pPage; assert( pPage!=0 ); if( pCur->idx >= pPage->nCell ){ *pSize = 0; }else{ unsigned char *cell = pPage->aCell[pCur->idx]; cell += 2; /* Skip the offset to the next cell */ | | | 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 | pPage = pCur->pPage; assert( pPage!=0 ); if( pCur->idx >= pPage->nCell ){ *pSize = 0; }else{ unsigned char *cell = pPage->aCell[pCur->idx]; cell += 2; /* Skip the offset to the next cell */ if( !pPage->leaf ){ cell += 4; /* Skip the child pointer */ } if( !pPage->zeroData ){ while( (0x80&*(cell++))!=0 ){} /* Skip the data size number */ } getVarint(cell, pSize); } |
︙ | ︙ | |||
1374 1375 1376 1377 1378 1379 1380 | assert( pCur!=0 && pCur->pPage!=0 ); pBt = pCur->pBt; pPage = pCur->pPage; assert( pCur->idx>=0 && pCur->idx<pPage->nCell ); aPayload = pPage->aCell[pCur->idx]; aPayload += 2; /* Skip the next cell index */ | | | 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 | assert( pCur!=0 && pCur->pPage!=0 ); pBt = pCur->pBt; pPage = pCur->pPage; assert( pCur->idx>=0 && pCur->idx<pPage->nCell ); aPayload = pPage->aCell[pCur->idx]; aPayload += 2; /* Skip the next cell index */ if( !pPage->leaf ){ aPayload += 4; /* Skip the child pointer */ } if( pPage->zeroData ){ nData = 0; }else{ aPayload += getVarint(aPayload, &nData); } |
︙ | ︙ | |||
1493 1494 1495 1496 1497 1498 1499 | assert( pCur!=0 && pCur->pPage!=0 ); pBt = pCur->pBt; pPage = pCur->pPage; assert( pCur->idx>=0 && pCur->idx<pPage->nCell ); aPayload = pPage->aCell[pCur->idx]; aPayload += 2; /* Skip the next cell index */ | | | 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 | assert( pCur!=0 && pCur->pPage!=0 ); pBt = pCur->pBt; pPage = pCur->pPage; assert( pCur->idx>=0 && pCur->idx<pPage->nCell ); aPayload = pPage->aCell[pCur->idx]; aPayload += 2; /* Skip the next cell index */ if( !pPage->leaf ){ aPayload += 4; /* Skip the child pointer */ } if( !pPage->zeroData ){ aPayload += getVarint(aPayload, &nData); } aPayload += getVarint(aPayload, &nKey); if( pPage->intKey || nKey>pBt->maxLocal ){ |
︙ | ︙ | |||
1526 1527 1528 1529 1530 1531 1532 | if( pCur->idx >= pPage->nCell || pPage->zeroData ){ *pSize = 0; }else{ unsigned char *cell; u64 size; cell = pPage->aCell[pCur->idx]; cell += 2; /* Skip the offset to the next cell */ | | | 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 | if( pCur->idx >= pPage->nCell || pPage->zeroData ){ *pSize = 0; }else{ unsigned char *cell; u64 size; cell = pPage->aCell[pCur->idx]; cell += 2; /* Skip the offset to the next cell */ if( !pPage->leaf ){ cell += 4; /* Skip the child pointer */ } getVarint(cell, &size); assert( (size & 0x00000000ffffffff)==size ); *pSize = (u32)size; } return SQLITE_OK; |
︙ | ︙ | |||
1568 1569 1570 1571 1572 1573 1574 | */ static int moveToChild(BtCursor *pCur, u32 newPgno){ int rc; MemPage *pNewPage; MemPage *pOldPage; Btree *pBt = pCur->pBt; | | < < | 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 | */ static int moveToChild(BtCursor *pCur, u32 newPgno){ int rc; MemPage *pNewPage; MemPage *pOldPage; Btree *pBt = pCur->pBt; rc = getAndInitPage(pBt, newPgno, &pNewPage, pCur->pPage); if( rc ) return rc; pNewPage->idxParent = pCur->idx; pOldPage = pCur->pPage; pOldPage->idxShift = 0; releasePage(pOldPage); pCur->pPage = pNewPage; pCur->idx = 0; |
︙ | ︙ | |||
1596 1597 1598 1599 1600 1601 1602 | ** is empty except for the right-pointer. In such cases the ** virtual root page is the page that the right-pointer of page ** 1 is pointing to. */ static int isRootPage(MemPage *pPage){ MemPage *pParent = pPage->pParent; assert( pParent==0 || pParent->isInit ); | | | 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 | ** is empty except for the right-pointer. In such cases the ** virtual root page is the page that the right-pointer of page ** 1 is pointing to. */ static int isRootPage(MemPage *pPage){ MemPage *pParent = pPage->pParent; assert( pParent==0 || pParent->isInit ); if( pParent==0 || (pParent->pgno==1 && pParent->nCell==0) ) return 1; return 0; } /* ** Move the cursor up to the parent page. ** ** pCur->idx is set to the cell index that contains the pointer |
︙ | ︙ | |||
1662 1663 1664 1665 1666 1667 1668 | ** Move the cursor to the root page */ static int moveToRoot(BtCursor *pCur){ MemPage *pRoot; int rc; Btree *pBt = pCur->pBt; | | < < | 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 | ** Move the cursor to the root page */ static int moveToRoot(BtCursor *pCur){ MemPage *pRoot; int rc; Btree *pBt = pCur->pBt; rc = getAndInitPage(pBt, pCur->pgnoRoot, &pRoot, 0); if( rc ) return rc; releasePage(pCur->pPage); pCur->pPage = pRoot; pCur->idx = 0; if( pRoot->nCell==0 && !pRoot->leaf ){ Pgno subpage; assert( pRoot->pgno==1 ); |
︙ | ︙ | |||
1803 1804 1805 1806 1807 1808 1809 | int c = -1; /* pRes return if table is empty must be -1 */ lwr = 0; upr = pPage->nCell-1; while( lwr<=upr ){ void *pCellKey; u64 nCellKey; pCur->idx = (lwr+upr)/2; | | | 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 | int c = -1; /* pRes return if table is empty must be -1 */ lwr = 0; upr = pPage->nCell-1; while( lwr<=upr ){ void *pCellKey; u64 nCellKey; pCur->idx = (lwr+upr)/2; sqlite3BtreeKeySize(pCur, &nCellKey); if( pPage->intKey ){ if( nCellKey<nKey ){ c = -1; }else if( nCellKey>nKey ){ c = +1; }else{ c = 0; |
︙ | ︙ | |||
2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 | spaceLeft = pBt->pageSize - 4; } n = nPayload; if( n>spaceLeft ) n = spaceLeft; if( n>nSrc ) n = nSrc; memcpy(pPayload, pSrc, n); nPayload -= n; nSrc -= n; spaceLeft -= n; if( nSrc==0 ){ nSrc = nData; pSrc = pData; } if( pOvfl && (spaceLeft==0 || nPayload==0) ){ | > | 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 | spaceLeft = pBt->pageSize - 4; } n = nPayload; if( n>spaceLeft ) n = spaceLeft; if( n>nSrc ) n = nSrc; memcpy(pPayload, pSrc, n); nPayload -= n; pPayload += n; nSrc -= n; spaceLeft -= n; if( nSrc==0 ){ nSrc = nData; pSrc = pData; } if( pOvfl && (spaceLeft==0 || nPayload==0) ){ |
︙ | ︙ | |||
2281 2282 2283 2284 2285 2286 2287 | ** ** Do not bother maintaining the integrity of the linked list of Cells. ** Only the pPage->aCell[] array is important. The relinkCellList() ** routine will be called soon after this routine in order to rebuild ** the linked list. */ static void dropCell(MemPage *pPage, int idx, int sz){ | | > > | | 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 | ** ** Do not bother maintaining the integrity of the linked list of Cells. ** Only the pPage->aCell[] array is important. The relinkCellList() ** routine will be called soon after this routine in order to rebuild ** the linked list. */ static void dropCell(MemPage *pPage, int idx, int sz){ int j, pc; assert( idx>=0 && idx<pPage->nCell ); assert( sz==cellSize(pPage, pPage->aCell[idx]) ); assert( sqlite3pager_iswriteable(pPage->aData) ); assert( pPage->aCell[idx]>=pPage->aData ); assert( pPage->aCell[idx]<&pPage->aData[pPage->pBt->pageSize-sz] ); pc = Addr(pPage->aCell[idx]) - Addr(pPage->aData); assert( pc>pPage->hdrOffset && pc+sz<=pPage->pBt->pageSize ); freeSpace(pPage, pc, sz); for(j=idx; j<pPage->nCell-1; j++){ pPage->aCell[j] = pPage->aCell[j+1]; } pPage->nCell--; pPage->idxShift = 1; } |
︙ | ︙ | |||
2340 2341 2342 2343 2344 2345 2346 | ** invocations of either insertCell() or dropCell(). */ static void relinkCellList(MemPage *pPage){ int i, idxFrom; assert( sqlite3pager_iswriteable(pPage->aData) ); idxFrom = pPage->hdrOffset+3; for(i=0; i<pPage->nCell; i++){ | | | 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 | ** invocations of either insertCell() or dropCell(). */ static void relinkCellList(MemPage *pPage){ int i, idxFrom; assert( sqlite3pager_iswriteable(pPage->aData) ); idxFrom = pPage->hdrOffset+3; for(i=0; i<pPage->nCell; i++){ int idx = Addr(pPage->aCell[i]) - Addr(pPage->aData); assert( idx>pPage->hdrOffset && idx<pPage->pBt->pageSize ); put2byte(&pPage->aData[idxFrom], idx); idxFrom = idx; } put2byte(&pPage->aData[idxFrom], 0); } |
︙ | ︙ | |||
2616 2617 2618 2619 2620 2621 2622 | assert( !pParent->leaf ); pgnoOld[i] = get4byte(&apDiv[i][2]); }else if( k==pParent->nCell ){ pgnoOld[i] = get4byte(&pParent->aData[pParent->hdrOffset+6]); }else{ break; } | | < < | 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 | assert( !pParent->leaf ); pgnoOld[i] = get4byte(&apDiv[i][2]); }else if( k==pParent->nCell ){ pgnoOld[i] = get4byte(&pParent->aData[pParent->hdrOffset+6]); }else{ break; } rc = getAndInitPage(pBt, pgnoOld[i], &apOld[i], pParent); if( rc ) goto balance_cleanup; apOld[i]->idxParent = k; apCopy[i] = 0; assert( i==nOld ); nOld++; } |
︙ | ︙ | |||
3049 3050 3051 3052 3053 3054 3055 | } if( pBt->readOnly ){ return SQLITE_READONLY; } rc = allocatePage(pBt, &pRoot, &pgnoRoot, 0); if( rc ) return rc; assert( sqlite3pager_iswriteable(pRoot->aData) ); | | | < < | 3067 3068 3069 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 3090 3091 3092 3093 3094 3095 3096 3097 3098 3099 3100 3101 3102 3103 3104 3105 | } if( pBt->readOnly ){ return SQLITE_READONLY; } rc = allocatePage(pBt, &pRoot, &pgnoRoot, 0); if( rc ) return rc; assert( sqlite3pager_iswriteable(pRoot->aData) ); zeroPage(pRoot, flags | PTF_LEAF); sqlite3pager_unref(pRoot->aData); *piTable = (int)pgnoRoot; return SQLITE_OK; } /* ** Erase the given database page and all its children. Return ** the page to the freelist. */ static int clearDatabasePage( Btree *pBt, /* The BTree that contains the table */ Pgno pgno, /* Page number to clear */ MemPage *pParent, /* Parent page. NULL for the root */ int freePageFlag /* Deallocate page if true */ ){ MemPage *pPage; int rc; unsigned char *pCell; int i; rc = getAndInitPage(pBt, pgno, &pPage, pParent); if( rc ) return rc; rc = sqlite3pager_write(pPage->aData); if( rc ) return rc; for(i=0; i<pPage->nCell; i++){ pCell = pPage->aCell[i]; if( !pPage->leaf ){ rc = clearDatabasePage(pBt, get4byte(&pCell[2]), pPage->pParent, 1); if( rc ) return rc; } rc = clearCell(pPage, pCell); |
︙ | ︙ | |||
3179 3180 3181 3182 3183 3184 3185 | int sqlite3BtreeUpdateMeta(Btree *pBt, int idx, u32 iMeta){ unsigned char *pP1; int rc; assert( idx>=1 && idx<=15 ); if( !pBt->inTrans ){ return pBt->readOnly ? SQLITE_READONLY : SQLITE_ERROR; } | | | | 3195 3196 3197 3198 3199 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 3210 | int sqlite3BtreeUpdateMeta(Btree *pBt, int idx, u32 iMeta){ unsigned char *pP1; int rc; assert( idx>=1 && idx<=15 ); if( !pBt->inTrans ){ return pBt->readOnly ? SQLITE_READONLY : SQLITE_ERROR; } assert( pBt->pPage1!=0 ); pP1 = pBt->pPage1->aData; rc = sqlite3pager_write(pP1); if( rc ) return rc; put4byte(&pP1[36 + idx*4], iMeta); return SQLITE_OK; } /****************************************************************************** |
︙ | ︙ | |||
3214 3215 3216 3217 3218 3219 3220 | rc = getPage(pBt, (Pgno)pgno, &pPage); if( rc ){ return rc; } printf("PAGE %d: flags=0x%02x frag=%d\n", pgno, pPage->aData[pPage->hdrOffset], pPage->aData[pPage->hdrOffset+5]); i = 0; | | | 3230 3231 3232 3233 3234 3235 3236 3237 3238 3239 3240 3241 3242 3243 3244 | rc = getPage(pBt, (Pgno)pgno, &pPage); if( rc ){ return rc; } printf("PAGE %d: flags=0x%02x frag=%d\n", pgno, pPage->aData[pPage->hdrOffset], pPage->aData[pPage->hdrOffset+5]); i = 0; assert( pPage->hdrOffset == (pgno==1 ? 100 : 0) ); idx = get2byte(&pPage->aData[hdrOffset+3]); while( idx>0 && idx<=pBt->pageSize ){ u64 nData, nKey; int nHeader; Pgno child; unsigned char *pCell = &pPage->aData[idx]; int sz = cellSize(pPage, pCell); |
︙ | ︙ |
Changes to src/pager.c.
︙ | ︙ | |||
14 15 16 17 18 19 20 | ** The pager is used to access a database disk file. It implements ** atomic commit and rollback through the use of a journal file that ** is separate from the database file. The pager also implements file ** locking to prevent two processes from writing the same database ** file simultaneously, or one process from reading the database while ** another is writing. ** | | | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | ** The pager is used to access a database disk file. It implements ** atomic commit and rollback through the use of a journal file that ** is separate from the database file. The pager also implements file ** locking to prevent two processes from writing the same database ** file simultaneously, or one process from reading the database while ** another is writing. ** ** @(#) $Id: pager.c,v 1.103 2004/05/07 17:57:50 drh Exp $ */ #include "os.h" /* Must be first to enable large file support */ #include "sqliteInt.h" #include "pager.h" #include <assert.h> #include <string.h> |
︙ | ︙ | |||
565 566 567 568 569 570 571 | if( pPg ){ /* No page should ever be rolled back that is in use, except for page ** 1 which is held in use in order to keep the lock on the database ** active. */ assert( pPg->nRef==0 || pPg->pgno==1 ); memcpy(PGHDR_TO_DATA(pPg), pgRec.aData, SQLITE_PAGE_SIZE); | | > > | 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 | if( pPg ){ /* No page should ever be rolled back that is in use, except for page ** 1 which is held in use in order to keep the lock on the database ** active. */ assert( pPg->nRef==0 || pPg->pgno==1 ); memcpy(PGHDR_TO_DATA(pPg), pgRec.aData, SQLITE_PAGE_SIZE); if( pPager->xDestructor ){ pPager->xDestructor(PGHDR_TO_DATA(pPg)); } pPg->dirty = 0; pPg->needSync = 0; CODEC(pPager, PGHDR_TO_DATA(pPg), pPg->pgno, 3); } return rc; } |
︙ | ︙ |
Changes to src/tclsqlite.c.
1 2 3 4 5 6 7 8 9 10 11 12 13 | /* ** 2001 September 15 ** ** 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. ** ************************************************************************* ** A TCL Interface to SQLite ** | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 | /* ** 2001 September 15 ** ** 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. ** ************************************************************************* ** A TCL Interface to SQLite ** ** $Id: tclsqlite.c,v 1.62 2004/05/07 17:57:50 drh Exp $ */ #ifndef NO_TCL /* Omit this whole file if TCL is unavailable */ #include "sqliteInt.h" #include "tcl.h" #include <stdlib.h> #include <string.h> |
︙ | ︙ | |||
1208 1209 1210 1211 1212 1213 1214 | extern int Sqlitetest2_Init(Tcl_Interp*); extern int Sqlitetest3_Init(Tcl_Interp*); extern int Sqlitetest4_Init(Tcl_Interp*); extern int Sqlitetest5_Init(Tcl_Interp*); extern int Md5_Init(Tcl_Interp*); /* Sqlitetest1_Init(interp); */ Sqlitetest2_Init(interp); | | | 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 | extern int Sqlitetest2_Init(Tcl_Interp*); extern int Sqlitetest3_Init(Tcl_Interp*); extern int Sqlitetest4_Init(Tcl_Interp*); extern int Sqlitetest5_Init(Tcl_Interp*); extern int Md5_Init(Tcl_Interp*); /* Sqlitetest1_Init(interp); */ Sqlitetest2_Init(interp); Sqlitetest3_Init(interp); /* Sqlitetest4_Init(interp); */ Sqlitetest5_Init(interp); Md5_Init(interp); } #endif if( argc>=2 ){ int i; |
︙ | ︙ |
Changes to src/test3.c.
︙ | ︙ | |||
9 10 11 12 13 14 15 | ** May you share freely, never taking more than you give. ** ************************************************************************* ** Code for testing the btree.c module in SQLite. This code ** is not included in the SQLite library. It is used for automated ** testing of the SQLite library. ** | | | 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | ** May you share freely, never taking more than you give. ** ************************************************************************* ** Code for testing the btree.c module in SQLite. This code ** is not included in the SQLite library. It is used for automated ** testing of the SQLite library. ** ** $Id: test3.c,v 1.27 2004/05/07 17:57:50 drh Exp $ */ #include "sqliteInt.h" #include "pager.h" #include "btree.h" #include "tcl.h" #include <stdlib.h> #include <string.h> |
︙ | ︙ | |||
325 326 327 328 329 330 331 | Tcl_Interp *interp, /* The TCL interpreter that invoked this command */ int argc, /* Number of arguments */ const char **argv /* Text of each argument */ ){ Btree *pBt; int rc; int i; | | | | | | | | 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 | Tcl_Interp *interp, /* The TCL interpreter that invoked this command */ int argc, /* Number of arguments */ const char **argv /* Text of each argument */ ){ Btree *pBt; int rc; int i; int aMeta[SQLITE_N_BTREE_META]; if( argc!=1+SQLITE_N_BTREE_META ){ char zBuf[30]; sprintf(zBuf,"%d",SQLITE_N_BTREE_META); Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], " ID METADATA...\" (METADATA is ", zBuf, " integers)", 0); return TCL_ERROR; } if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR; for(i=1; i<SQLITE_N_BTREE_META; i++){ if( Tcl_GetInt(interp, argv[i+1], &aMeta[i]) ) return TCL_ERROR; } for(i=1; i<SQLITE_N_BTREE_META; i++){ rc = sqlite3BtreeUpdateMeta(pBt, i, aMeta[i]); if( rc!=SQLITE_OK ){ Tcl_AppendResult(interp, errorName(rc), 0); return TCL_ERROR; } } return TCL_OK; } |
︙ | ︙ | |||
590 591 592 593 594 595 596 | if( argc!=3 ){ Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], " ID KEY\"", 0); return TCL_ERROR; } if( Tcl_GetInt(interp, argv[1], (int*)&pCur) ) return TCL_ERROR; | > > > > > | > | 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 | if( argc!=3 ){ Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], " ID KEY\"", 0); return TCL_ERROR; } if( Tcl_GetInt(interp, argv[1], (int*)&pCur) ) return TCL_ERROR; if( sqlite3BtreeFlags(pCur) & BTREE_INTKEY ){ int iKey; if( Tcl_GetInt(interp, argv[2], &iKey) ) return TCL_ERROR; rc = sqlite3BtreeMoveto(pCur, 0, iKey, &res); }else{ rc = sqlite3BtreeMoveto(pCur, argv[2], strlen(argv[2]), &res); } if( rc ){ Tcl_AppendResult(interp, errorName(rc), 0); return TCL_ERROR; } if( res<0 ) res = -1; if( res>0 ) res = 1; sprintf(zBuf,"%d",res); |
︙ | ︙ | |||
651 652 653 654 655 656 657 | if( argc!=4 ){ Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], " ID KEY DATA\"", 0); return TCL_ERROR; } if( Tcl_GetInt(interp, argv[1], (int*)&pCur) ) return TCL_ERROR; | > > > > > | > | 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 | if( argc!=4 ){ Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0], " ID KEY DATA\"", 0); return TCL_ERROR; } if( Tcl_GetInt(interp, argv[1], (int*)&pCur) ) return TCL_ERROR; if( sqlite3BtreeFlags(pCur) & BTREE_INTKEY ){ int iKey; if( Tcl_GetInt(interp, argv[2], &iKey) ) return TCL_ERROR; rc = sqlite3BtreeInsert(pCur, 0, iKey, argv[3], strlen(argv[3])); }else{ rc = sqlite3BtreeInsert(pCur, argv[2], strlen(argv[2]), argv[3], strlen(argv[3])); } if( rc ){ Tcl_AppendResult(interp, errorName(rc), 0); return TCL_ERROR; } return SQLITE_OK; } |
︙ | ︙ | |||
851 852 853 854 855 856 857 | if( sqlite3BtreeFlags(pCur) & BTREE_INTKEY ){ char zBuf2[60]; sprintf(zBuf2, "%llu", n); Tcl_AppendResult(interp, zBuf2, 0); }else{ zBuf = malloc( n+1 ); rc = sqlite3BtreeKey(pCur, 0, n, zBuf); | | < < < | | 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 | if( sqlite3BtreeFlags(pCur) & BTREE_INTKEY ){ char zBuf2[60]; sprintf(zBuf2, "%llu", n); Tcl_AppendResult(interp, zBuf2, 0); }else{ zBuf = malloc( n+1 ); rc = sqlite3BtreeKey(pCur, 0, n, zBuf); if( rc ){ Tcl_AppendResult(interp, errorName(rc), 0); return TCL_ERROR; } zBuf[n] = 0; Tcl_AppendResult(interp, zBuf, 0); free(zBuf); } return SQLITE_OK; |
︙ | ︙ | |||
890 891 892 893 894 895 896 | " ID\"", 0); return TCL_ERROR; } if( Tcl_GetInt(interp, argv[1], (int*)&pCur) ) return TCL_ERROR; sqlite3BtreeDataSize(pCur, &n); zBuf = malloc( n+1 ); rc = sqlite3BtreeData(pCur, 0, n, zBuf); | | < < < | | 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 | " ID\"", 0); return TCL_ERROR; } if( Tcl_GetInt(interp, argv[1], (int*)&pCur) ) return TCL_ERROR; sqlite3BtreeDataSize(pCur, &n); zBuf = malloc( n+1 ); rc = sqlite3BtreeData(pCur, 0, n, zBuf); if( rc ){ Tcl_AppendResult(interp, errorName(rc), 0); return TCL_ERROR; } zBuf[n] = 0; Tcl_AppendResult(interp, zBuf, 0); free(zBuf); return SQLITE_OK; } |
︙ | ︙ |
Changes to test/btree.test.
1 2 3 4 5 6 7 8 9 10 11 12 13 | # 2001 September 15 # # 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 # | | < < < | | | | > | | | | | | | | | > | | | > | | > | | > | | > | | | | | | | | | | | | | | | | 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 | # 2001 September 15 # # 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: btree.test,v 1.16 2004/05/07 17:57:50 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl # Basic functionality. Open and close a database. # do_test btree-1.1 { file delete -force test1.bt file delete -force test1.bt-journal set rc [catch {btree_open test1.bt 2000 0} ::b1] } {0} # The second element of the list returned by btree_pager_stats is the # number of pages currently checked out. We'll be checking this value # frequently during this test script, to make sure the btree library # is properly releasing the pages it checks out, and thus avoiding # page leaks. # do_test btree-1.1.1 { lindex [btree_pager_stats $::b1] 1 } {0} do_test btree-1.2 { set rc [catch {btree_open test1.bt 2000 0} ::b2] } {0} do_test btree-1.3 { set rc [catch {btree_close $::b2} msg] lappend rc $msg } {0 {}} # Do an insert and verify that the database file grows in size. # do_test btree-1.4 { set rc [catch {btree_begin_transaction $::b1} msg] lappend rc $msg } {0 {}} do_test btree-1.4.1 { lindex [btree_pager_stats $::b1] 1 } {1} do_test btree-1.5 { set rc [catch {btree_cursor $::b1 1 1} ::c1] if {$rc} {lappend rc $::c1} set rc } {0} do_test btree-1.6 { set rc [catch {btree_insert $::c1 100 1.00} msg] lappend rc $msg } {0 {}} do_test btree-1.7 { btree_move_to $::c1 100 btree_key $::c1 } {100} do_test btree-1.8 { btree_data $::c1 } {1.00} do_test btree-1.9 { set rc [catch {btree_close_cursor $::c1} msg] lappend rc $msg } {0 {}} do_test btree-1.10 { set rc [catch {btree_commit $::b1} msg] lappend rc $msg } {0 {}} do_test btree-1.11 { file size test1.bt } {1024} do_test btree-1.12 { lindex [btree_pager_stats $::b1] 1 } {0} # Reopen the database and attempt to read the record that we wrote. # do_test btree-2.1 { set rc [catch {btree_cursor $::b1 1 1} ::c1] if {$rc} {lappend rc $::c1} set rc } {0} do_test btree-2.2 { btree_move_to $::c1 99 } {1} do_test btree-2.3 { btree_move_to $::c1 101 } {-1} do_test btree-2.4 { btree_move_to $::c1 100 } {0} do_test btree-2.5 { btree_key $::c1 } {100} do_test btree-2.6 { btree_data $::c1 } {1.00} do_test btree-2.7 { lindex [btree_pager_stats $::b1] 1 } {1} # Do some additional inserts # do_test btree-3.1 { btree_begin_transaction $::b1 btree_insert $::c1 200 2.00 btree_move_to $::c1 200 btree_key $::c1 } {200} do_test btree-3.1.1 { lindex [btree_pager_stats $::b1] 1 } {1} do_test btree-3.2 { btree_insert $::c1 300 3.00 btree_move_to $::c1 300 btree_key $::c1 } {300} do_test btree-3.4 { btree_insert $::c1 400 4.00 btree_move_to $::c1 400 btree_key $::c1 } {400} do_test btree-3.5 { btree_insert $::c1 500 5.00 btree_move_to $::c1 500 btree_key $::c1 } {500} do_test btree-3.6 { btree_insert $::c1 600 6.00 btree_move_to $::c1 600 btree_key $::c1 } {600} #btree_page_dump $::b1 2 do_test btree-3.7 { set rc [btree_move_to $::c1 0] expr {$rc>0} } {1} do_test btree-3.8 { btree_key $::c1 } {100} do_test btree-3.9 { btree_data $::c1 } {1.00} do_test btree-3.10 { btree_next $::c1 btree_key $::c1 } {200} do_test btree-3.11 { btree_data $::c1 } {2.00} do_test btree-3.12 { btree_next $::c1 btree_key $::c1 } {300} do_test btree-3.13 { btree_data $::c1 } {3.00} do_test btree-3.14 { btree_next $::c1 btree_key $::c1 } {400} do_test btree-3.15 { btree_data $::c1 } {4.00} do_test btree-3.16 { btree_next $::c1 btree_key $::c1 } {500} do_test btree-3.17 { btree_data $::c1 } {5.00} do_test btree-3.18 { btree_next $::c1 btree_key $::c1 } {600} do_test btree-3.19 { btree_data $::c1 } {6.00} do_test btree-3.20 { btree_next $::c1 btree_key $::c1 } {0} do_test btree-3.21 { btree_data $::c1 } {} # Commit the changes, reopen and reread the data # do_test btree-3.22 { |
︙ | ︙ | |||
204 205 206 207 208 209 210 | lappend rc $msg } {0 {}} do_test btree-3.23.1 { lindex [btree_pager_stats $::b1] 1 } {0} do_test btree-3.24 { file size test1.bt | | | | | | | | | | | | | | | | | | | | | | > | | | | | | | | | | | | | | | | > | > > | > | | | > | > > > > > > > > > > > > | 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 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 | lappend rc $msg } {0 {}} do_test btree-3.23.1 { lindex [btree_pager_stats $::b1] 1 } {0} do_test btree-3.24 { file size test1.bt } {1024} do_test btree-3.25 { set rc [catch {btree_cursor $::b1 1 1} ::c1] if {$rc} {lappend rc $::c1} set rc } {0} do_test btree-3.25.1 { lindex [btree_pager_stats $::b1] 1 } {1} do_test btree-3.26 { set rc [btree_move_to $::c1 0] expr {$rc>0} } {1} do_test btree-3.27 { btree_key $::c1 } {100} do_test btree-3.28 { btree_data $::c1 } {1.00} do_test btree-3.29 { btree_next $::c1 btree_key $::c1 } {200} do_test btree-3.30 { btree_data $::c1 } {2.00} do_test btree-3.31 { btree_next $::c1 btree_key $::c1 } {300} do_test btree-3.32 { btree_data $::c1 } {3.00} do_test btree-3.33 { btree_next $::c1 btree_key $::c1 } {400} do_test btree-3.34 { btree_data $::c1 } {4.00} do_test btree-3.35 { btree_next $::c1 btree_key $::c1 } {500} do_test btree-3.36 { btree_data $::c1 } {5.00} do_test btree-3.37 { btree_next $::c1 btree_key $::c1 } {600} do_test btree-3.38 { btree_data $::c1 } {6.00} do_test btree-3.39 { btree_next $::c1 btree_key $::c1 } {0} do_test btree-3.40 { btree_data $::c1 } {} do_test btree-3.41 { lindex [btree_pager_stats $::b1] 1 } {1} # Now try a delete # do_test btree-4.1 { btree_begin_transaction $::b1 btree_move_to $::c1 100 btree_key $::c1 } {100} do_test btree-4.1.1 { lindex [btree_pager_stats $::b1] 1 } {1} do_test btree-4.2 { btree_delete $::c1 } {} do_test btree-4.3 { btree_move_to $::c1 100 btree_key $::c1 } {200} do_test btree-4.4 { btree_next $::c1 btree_key $::c1 } {300} do_test btree-4.5 { btree_next $::c1 btree_key $::c1 } {400} do_test btree-4.4 { btree_move_to $::c1 0 set r {} while 1 { set key [btree_key $::c1] if {$key==0} break lappend r $key lappend r [btree_data $::c1] btree_next $::c1 } set r } {200 2.00 300 3.00 400 4.00 500 5.00 600 6.00} # Commit and make sure the delete is still there. # do_test btree-4.5 { btree_commit $::b1 btree_move_to $::c1 0 set r {} while 1 { set key [btree_key $::c1] if {$key==0} break lappend r $key lappend r [btree_data $::c1] btree_next $::c1 } set r } {200 2.00 300 3.00 400 4.00 500 5.00 600 6.00} # Completely close the database and reopen it. Then check # the data again. # do_test btree-4.6 { lindex [btree_pager_stats $::b1] 1 } {1} do_test btree-4.7 { btree_close_cursor $::c1 lindex [btree_pager_stats $::b1] 1 } {0} do_test btree-4.8 { btree_close $::b1 set ::b1 [btree_open test1.bt 2000 0] set ::c1 [btree_cursor $::b1 1 1] lindex [btree_pager_stats $::b1] 1 } {1} do_test btree-4.9 { set r {} btree_first $::c1 while 1 { set key [btree_key $::c1] if {$key==0} break lappend r $key lappend r [btree_data $::c1] btree_next $::c1 } set r } {200 2.00 300 3.00 400 4.00 500 5.00 600 6.00} # Try to read and write meta data # do_test btree-5.1 { btree_get_meta $::b1 } {0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0} do_test btree-5.2 { set rc [catch { btree_update_meta $::b1 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 } msg] lappend rc $msg } {1 SQLITE_ERROR} do_test btree-5.3 { btree_begin_transaction $::b1 set rc [catch { btree_update_meta $::b1 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 } msg] lappend rc $msg } {0 {}} do_test btree-5.4 { btree_get_meta $::b1 } {0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15} do_test btree-5.5 { btree_close_cursor $::c1 btree_rollback $::b1 btree_get_meta $::b1 } {0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0} do_test btree-5.6 { btree_begin_transaction $::b1 btree_update_meta $::b1 10 20 30 40 50 60 70 80 90 100 110 120 130 \ 140 150 btree_commit $::b1 btree_get_meta $::b1 } {0 10 20 30 40 50 60 70 80 90 100 110 120 130 140 150} proc select_all {cursor} { set r {} btree_move_to $cursor {} while 1 { set key [btree_key $cursor] if {$key==""} break lappend r $key lappend r [btree_data $cursor] btree_next $cursor } return $r } proc select_all_intkey {cursor} { set r {} btree_move_to $cursor 0 while 1 { set key [btree_key $cursor] if {$key==0} break lappend r $key lappend r [btree_data $cursor] btree_next $cursor } return $r } proc select_keys {cursor} { |
︙ | ︙ | |||
408 409 410 411 412 413 414 | } return $r } # Try to create a new table in the database file # do_test btree-6.1 { | | | | | | | | | | | | | 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 | } return $r } # Try to create a new table in the database file # do_test btree-6.1 { set rc [catch {btree_create_table $::b1 0} msg] lappend rc $msg } {1 SQLITE_ERROR} do_test btree-6.2 { btree_begin_transaction $::b1 set ::t2 [btree_create_table $::b1 0] } {2} do_test btree-6.2.1 { lindex [btree_pager_stats $::b1] 1 } {1} do_test btree-6.2.2 { set ::c2 [btree_cursor $::b1 $::t2 1] lindex [btree_pager_stats $::b1] 1 } {2} do_test btree-6.2.3 { btree_insert $::c2 ten 10 btree_key $::c2 } {ten} do_test btree-6.3 { btree_commit $::b1 set ::c1 [btree_cursor $::b1 1 1] lindex [btree_pager_stats $::b1] 1 } {2} do_test btree-6.3.1 { select_all_intkey $::c1 } {200 2.00 300 3.00 400 4.00 500 5.00 600 6.00} #btree_page_dump $::b1 3 do_test btree-6.4 { select_all $::c2 } {ten 10} # Drop the new table, then create it again anew. # do_test btree-6.5 { btree_begin_transaction $::b1 } {} do_test btree-6.6 { btree_close_cursor $::c2 } {} do_test btree-6.6.1 { lindex [btree_pager_stats $::b1] 1 } {1} do_test btree-6.7 { btree_drop_table $::b1 $::t2 } {} do_test btree-6.7.1 { lindex [btree_get_meta $::b1] 0 } {1} do_test btree-6.8 { set ::t2 [btree_create_table $::b1 0] } {2} do_test btree-6.8.1 { lindex [btree_get_meta $::b1] 0 } {0} do_test btree-6.9 { set ::c2 [btree_cursor $::b1 $::t2 1] lindex [btree_pager_stats $::b1] 1 } {2} do_test btree-6.9.1 { btree_move_to $::c2 {} btree_key $::c2 } {} # If we drop table 2 it just clears the table. Table 2 always exists. |
︙ | ︙ | |||
628 629 630 631 632 633 634 | do_test btree-8.8 { btree_commit $::b1 btree_data $::c1 } $::data do_test btree-8.9 { btree_close_cursor $::c1 btree_close $::b1 | | | 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 | do_test btree-8.8 { btree_commit $::b1 btree_data $::c1 } $::data do_test btree-8.9 { btree_close_cursor $::c1 btree_close $::b1 set ::b1 [btree_open test1.bt 2000 0] set ::c1 [btree_cursor $::b1 2 1] btree_move_to $::c1 020 btree_data $::c1 } $::data do_test btree-8.10 { btree_begin_transaction $::b1 btree_delete $::c1 |
︙ | ︙ | |||
1011 1012 1013 1014 1015 1016 1017 | do_test btree-99.1 { btree_close $::b1 } {} catch {unset data} catch {unset key} | < < | 1032 1033 1034 1035 1036 1037 1038 1039 | do_test btree-99.1 { btree_close $::b1 } {} catch {unset data} catch {unset key} finish_test |
Changes to test/tester.tcl.
1 2 3 4 5 6 7 8 9 10 11 12 13 | # 2001 September 15 # # 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 some common TCL routines used for regression # testing the SQLite library # | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 | # 2001 September 15 # # 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 some common TCL routines used for regression # testing the SQLite library # # $Id: tester.tcl,v 1.30 2004/05/07 17:57:50 drh Exp $ if 0 { # Make sure tclsqlite was compiled correctly. Abort now with an # error message if not. # if {[sqlite -tcl-uses-utf]} { if {"\u1234"=="u1234"} { |
︙ | ︙ | |||
106 107 108 109 110 111 112 | incr nErr lappend ::failList $name if {$nErr>100} {puts "*** Giving up..."; finalize_testing} } elseif {[string compare $result $expected]} { puts "\nExpected: \[$expected\]\n Got: \[$result\]" incr nErr lappend ::failList $name | | | 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 | incr nErr lappend ::failList $name if {$nErr>100} {puts "*** Giving up..."; finalize_testing} } elseif {[string compare $result $expected]} { puts "\nExpected: \[$expected\]\n Got: \[$result\]" incr nErr lappend ::failList $name if {$nErr>=1} {puts "*** Giving up..."; finalize_testing} } else { puts " Ok" } } # Invoke this procedure on a test that is probabilistic # and might fail sometimes. |
︙ | ︙ |