Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Working better with Win95. Continued work on the new db.c backend. (CVS 1714) |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
df0ff304855bd18c7a3517c500e891b6 |
User & Date: | drh 2001-01-31 13:28:08.000 |
Context
2001-01-31
| ||
13:28 | Working better with Win95. Continued work on the new db.c backend. (CVS 181) (check-in: f9c55a9000 user: drh tags: trunk) | |
13:28 | Working better with Win95. Continued work on the new db.c backend. (CVS 1714) (check-in: df0ff30485 user: drh tags: trunk) | |
2001-01-29
| ||
01:27 | :-) (CVS 1713) (check-in: 3259a53111 user: drh tags: trunk) | |
Changes
Changes to src/db.c.
︙ | ︙ | |||
17 18 19 20 21 22 23 | ** Boston, MA 02111-1307, USA. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** ************************************************************************* | | > | | < < < | | | > > > > | | < < | < < < > | | | > > | | > > > > > > > > > | | < > | | | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | | > > > > | > > > > | | | | | | > > | | > > > < > | | > < | 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 | ** Boston, MA 02111-1307, USA. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** ************************************************************************* ** $Id: db.c,v 1.6 2001/01/31 13:28:08 drh Exp $ */ #include "sqliteInt.h" #include "pg.h" /* ** Everything we need to know about an open database */ struct Db { Pgr *pPgr; /* The pager for the database */ DbCursor *pCursor; /* All open cursors */ int inTransaction; /* True if a transaction is in progress */ u32 freeList; /* List of free blocks */ int nTable; /* Number of slots in aContent[] */ u32 *aTable; /* Root page numbers for all tables */ }; /* ** The maximum depth of a cursor */ #define MX_LEVEL 10 /* ** Within a cursor, each level off the search tree is an instance of ** this structure. */ typedef struct DbIdxpt DbIdxpt; struct DbIdxpt { int pgno; /* The page number */ u32 *aPage; /* The page data */ int idx; /* Index into pPage[] */ }; /* ** Everything we need to know about a cursor */ struct DbCursor { Db *pDb; /* The whole database */ DbCursor *pPrev, *pNext; /* Linked list of all cursors */ u32 rootPgno; /* Root page of table for this cursor */ int onEntry; /* True if pointing to a table entry */ int nLevel; /* Number of levels of indexing used */ DbIdxpt aLevel[MX_LEVEL]; /* The index levels */ }; /* ** Data layouts ** ** LEAF: ** x[0] Magic number: BLOCK_LEAF ** x[1] If root page, total number of entries in this table ** ... One or more entries follow the leaf. ** ** Entry: ** x[N+0] Number of u32-sized words in this entry ** x[N+1] Hash value for this entry ** x[N+2] Number of bytes of key in the payload ** x[N+3] Number of bytes of data in the payload ** x{N+4]... The payload area. ** ** INDEX: ** x[0] Magic number: BLOCK_INDEX ** x[1] If root page: total number of entries in this table ** x[2] Number of slots in this index (Max value of N) ** x[2*N+3] Page number containing entries with hash <= x[2*N+4] ** x[2*N+4] The maximum hash value for entries on page x[2*N+3]. ** ** FREE: ** x[0] Magic number: BLOCK_FREE ** x[1] Page number of the next free block on the free list ** ** PAGE1: ** x[0] Magic number: BLOCK_PAGE1 ** x[1] First page of the freelist ** x[2] Number of tables in this database ** x[N+3] Root page for table N /* ** The first word of every page is some combination of these values ** used to indicate its function. */ #define BLOCK_PAGE1 0x24e47191 #define BLOCK_INDEX 0x7ac53b46 #define BLOCK_LEAF 0x60c45eef #define BLOCK_FREE 0x5b2dda47 /* ** The number of u32-sized objects that will fit on one page. */ #define U32_PER_PAGE (SQLITE_PAGE_SIZE/sizeof(u32)) /* ** Number of direct overflow pages per database entry */ #define N_DIRECT 10 /* ** The maximum amount of payload (in bytes) that will fit on on the same ** page as a leaf. In other words, the maximum amount of payload ** that does not require any overflow pages. ** ** This size is chosen so that a least 3 entry will fit on every ** leaf. That guarantees it will always be possible to add a new ** entry after a page split. */ #define LOCAL_PAYLOAD (((U32_PER_PAGE-2)/3 - (6+N_DIRECT))*sizeof(u32)) /* ** Allocate a new page. Return both the page number and a pointer ** to the page data. The calling function is responsible for unref-ing ** the page when it is no longer needed. ** ** The page is obtained from the freelist if there is anything there. ** If the freelist is empty, the new page comes from the end of the ** database file. */ int allocPage(Db *pDb, u32 *pPgno, u32 **ppPage){ u32 pgno; int rc; if( pDb->aTable==0 ) return SQLITE_NOMEM; /* Try to reuse a page from the freelist */ if( pDb->freeList==0 ){ u32 *pPage; rc = sqlitePgGet(pDb->pPgr, pDb->freeList, &pPage); if( rc==SQLITE_OK ){ if( pPage[0]==BLOCK_FREE ){ *pPgno = pDb->freeList; *ppPage = aPage; pDb->freeList = aPage[1]; memset(*ppPage, 0, SQLITE_PAGE_SIZE); return SQLITE_OK; } /* This only happens if we have database corruption */ sqlitePgUnref(pPage); } } /* If the freelist is empty, or we cannot access it, ** then allocate a new page from the end of the file. */ if( (rc = sqlitePgCount(pDb->pPgr, &pgno))==SQLITE_OK && (rc = sqlitePgGet(pDb->pPgr, pgno, (void**)ppPage))==SQLITE_OK ){ *pPgno = pgno; memset(*ppPage, 0, SQLITE_PAGE_SIZE); return SQLITE_OK; } return rc; } /* ** Return a page to the freelist and dereference the page. */ static void freePage(DB *pDb, u32 pgno, u32 *aPage){ if( pgno==0 ) return if( aPage==0 ){ int rc; rc = sqlitePgGet(pDb->pPgr, pgno, &aPage); if( rc!=SQLITE_OK ) return; } assert( sqlitePgNum(aPage)==pgno ); aPage[0] = BLOCK_FREE; aPage[1] = pDb->freeList; pDb->freeList = pgno; memset(&aPage[2], 0, SQLITE_PAGE_SIZE - 2*sizeof(u32)); sqlitePgTouch(aPage); sqlitePgUnref(aPage); } /* ** Return the number of bytes of payload storage required on the leaf ** node to hold the amount of payload specified by the argument. |
︙ | ︙ | |||
531 532 533 534 535 536 537 | sqlitePgUnref(dblIndirPage); } return SQLITE_OK; } /* | > | < | | | 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 | sqlitePgUnref(dblIndirPage); } return SQLITE_OK; } /* ** Resize the payload area. If the payload area descreases in size, ** this routine deallocates unused overflow pages. If the payload ** area increases in size, this routine is a no-op. */ static int payloadResize(Db *pDb, u32 *aPage, int oldSize, int newSize){ int i, j; /* Loop counters */ int first, last; /* Indices of first and last pages to be freed */ int rc; /* Return code from sqlitePgGet() */ /* Skip over the local data. We do not need to free it. */ if( newSize>=oldSize ) return SQLITE_OK; |
︙ | ︙ | |||
634 635 636 637 638 639 640 | return SQLITE_OK; } /* ** Allocate space for the content table in the given Db structure. ** return SQLITE_OK on success and SQLITE_NOMEM if it fails. */ | | < < | | < < | 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 | return SQLITE_OK; } /* ** Allocate space for the content table in the given Db structure. ** return SQLITE_OK on success and SQLITE_NOMEM if it fails. */ static int sqliteDbExpandTableArray(Db *pDb){ pDb->aTable = sqliteRealloc( pDb->aTable, pDb->nTable*sizeof(u32)); if( pDb->aTable==0 ){ pDb->inTranaction = 0; return SQLITE_NOMEM; } return SQLITE_OK; } /* |
︙ | ︙ | |||
672 673 674 675 676 677 678 | pDb->pCursor = 0; pDb->inTransaction = 0; sqlitePgCount(pDb->pPgr, &nPage); rc = sqlitePgGet(pDb->pPgr, 1, &aPage1); if( rc!=0 ) goto open_err; if( nPage==0 ){ sqlitePgBeginTransaction(pDb->pPgr); | | < | | | | | 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 | pDb->pCursor = 0; pDb->inTransaction = 0; sqlitePgCount(pDb->pPgr, &nPage); rc = sqlitePgGet(pDb->pPgr, 1, &aPage1); if( rc!=0 ) goto open_err; if( nPage==0 ){ sqlitePgBeginTransaction(pDb->pPgr); aPage1[0] = BLOCK_PAGE1; sqlitePgTouch(aPage1); sqlitePgCommit(pDb->pPgr); } pDb->freeList = aPage[1]; pDb->nTable = aPage[2]; rc = sqliteDbExpandTableArray(pDb); if( rc!=SQLITE_OK ) goto open_err; rc = payloadRead(pDb, &aPage1[3], 0, pDb->nTable*sizeof(u32), pDb->aTable); sqlitePgUnref(aPage1); if( rc!=SQLITE_OK ) goto open_err; *ppDb = pDb; return SQLITE_OK; open_err: *ppDb = 0; |
︙ | ︙ | |||
740 741 742 743 744 745 746 | u32 *aPage1; int rc; if( !pDb->inTransaction ){ return SQLITE_OK; } rc = sqlitePgGet(pDb->pPgr, 1, &aPage1); if( rc!=SQLITE_OK ) return rc; | > | | | > | | > | | | | | | > > > | < < < < < | | | | < | | | | | | 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 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 783 784 785 786 787 788 789 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 | u32 *aPage1; int rc; if( !pDb->inTransaction ){ return SQLITE_OK; } rc = sqlitePgGet(pDb->pPgr, 1, &aPage1); if( rc!=SQLITE_OK ) return rc; aPage1[1] = pDb->freeList; aPage1[2] = pDb->nTable; payloadWrite(pDb, &aPage1[3], 0, pDb->nTable*sizeof(u32), pDb->aTable); sqlitePgUnref(aPage1); rc = sqlitePgCommit(pDb->pPgr); if( rc!=SQLITE_OK ) return rc; pDb->inTransaction = 0; return SQLITE_OK; } /* ** Rollback the database to its state prior to the beginning of ** the transaction */ int sqliteDbRollback(Db *pDb){ u32 *aPage1; if( !pDb->inTransaction ) return SQLITE_OK; rc = sqlitePgRollback(pDb->pPgr); if( rc!=SQLITE_OK ) return rc; rc = sqlitePgGet(pDb->pPgr, 1, &aPage1); if( rc!=SQLITE_OK ) return rc; pDb->freeList = aPage1[1]; pDb->nTable = aPage1[2]; if( sqliteDbExpandTableArray(pDb)!=SQLITE_OK ){ return SQLITE_NOMEM; } payloadRead(pDb, &aPage1[3], 0, pDb->nTable*sizeof(u32), pDb->aTable); sqlitePgUnref(aPage1); pDb->inTransaction = 0; return SQLITE_OK; } /* ** Create a new table in the database. Write the table number ** that is used to open a cursor into that table into *pTblno. */ int sqliteDbCreateTable(Db *pDb, int *pTblno){ u32 *aPage; u32 pgno; int rc; int swTblno; int i; rc = allocPage(pDb, &pgno, &aPage); if( rc!=SQLITE_OK ){ return rc; } tblno = -1; for(i=0; i<pDb->nTable; i++){ if( pDb->aTable[i]==0 ){ tblno = i; break; } } if( tblno<0 ){ pDb->nTable++; rc = sqliteExpandTableArray(pDb); if( rc!=SQLITE_OK ){ return rc; } } pDb->aTable[tblno] = pgno; aPage[0] = BLOCK_LEAF; memset(&aPage[1], 0, SQLITE_PAGE_SIZE - sizeof(u32)); sqlitePgTouch(aPage); sqlitePgUnref(aPage); return rc; } /* ** Recursively add a page to the free list */ static int sqliteDbDropPage(Db *pDb, u32 pgno){ u32 *aPage; int rc; rc = sqlitePgGet(pDb->pPgr, pgno, (void**)&aPage); if( rc!=SQLITE_OK ) return rc; switch( aPage[0] ){ case BLOCK_INDEX: { int n, i; n = aPage[2]; for(i=0; i<n; i++){ u32 subpgno = aPage[3 + i*2]; if( subpgno>0 ) sqliteDbDropPage(pDb, subpgno); } freePage(pDb, pgno, aPage); break; } case BLOCK_LEAF: { int i = 2; while( i<U32_PER_PAGE ){ int entrySize = aPage[i]; if( entrySize==0 ) break; payloadResize(pDb, &aPage[i+4], aPage[i+2]+aPage[i+3], 0); i += entrySize; } freePage(pDb, pgno, aPage); break; } default: { /* Do nothing */ |
︙ | ︙ | |||
870 871 872 873 874 875 876 | */ static int sqliteDbDropTable(Db *pDb, int tblno){ DbCursor *pCur; u32 pgno; /* Find the root page for the table to be dropped. */ | | | | > > | > | 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 | */ static int sqliteDbDropTable(Db *pDb, int tblno){ DbCursor *pCur; u32 pgno; /* Find the root page for the table to be dropped. */ if( pDb->aTable==0 ){ return SQLITE_NOMEM; } if( tblno<0 || tblno>=pDb->nTable || pDb->aTable[tblno]==0 ){ return SQLITE_NOTFOUND; } pgno = pDb->aTable[tblno]; pDb->aTable[tblno] = 0; if( tblno==pDb->nTable-1 ){ pDb->nTable--; } /* Reset any cursors pointing to the table that is about to ** be dropped */ for(pCur=pDb->pCursor; pCur; pCur=pCur->pNext){ if( pCur->rootPgno==pgno ){ sqliteDbResetCursor(pCur, 0); } |
︙ | ︙ | |||
902 903 904 905 906 907 908 | */ int sqliteDbCursorOpen(Db *pDb, int tblno, DbCursor **ppCur){ u32 pgno; DbCursor *pCur; /* Translate the table number into a page number */ | | | | | 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 | */ int sqliteDbCursorOpen(Db *pDb, int tblno, DbCursor **ppCur){ u32 pgno; DbCursor *pCur; /* Translate the table number into a page number */ if( pDb->aTable==0 ){ *ppCur = 0; return SQLITE_NOMEM; } if( tblno<0 || tblno>=pDb->nContent || pDb->aTable[tblno]==0 ){ *ppCur = 0; return SQLITE_NOTFOUND; } pgno = pDb->aTable[tblno]; /* Allocate the cursor */ pCur = sqliteMalloc( sizeof(*pCur) ); pCur->pgno = pgno; pCur->pDb = pDb; pCur->pNext = pDb->pCursor; |
︙ | ︙ | |||
961 962 963 964 965 966 967 | if( pCur->nLevel > i+1 ){ sqliteDbResetCursor(pCur, i+1); } assert( pCur->nLevel==i+1 ); while( rc < 0 ){ u32 *aPage = pCur->aLevel[i].aPage; assert( aPage!=0 ); | | | | | | | | | > > | 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 | if( pCur->nLevel > i+1 ){ sqliteDbResetCursor(pCur, i+1); } assert( pCur->nLevel==i+1 ); while( rc < 0 ){ u32 *aPage = pCur->aLevel[i].aPage; assert( aPage!=0 ); switch( aPage[0] ){ case BLOCK_LEAF: { if( aPage[2]!=0 ){ pCur->aLevel[i].idx = 2; pCur->onEntry = 1; }else{ sqliteDbResetCursor(pCur, 1); } rc = SQLITE_OK; break; } case BLOCK_INDEX: { int n = aPage[2]; if( n<2 || n>=((U32_PER_PAGE - 3)/2) ){ sqliteDbResetCur(pCur, 1); rc = SQLITE_CORRUPT; break; } pCur->nLevel++; i++; pCur->aLevel[i].pgno = aPage[3]; rc = sqlitePgGet(pCur->pDb->pPgr, pCur->aLevel[i].pgno, &pCur->aLevel[i].aPage); if( rc != SQLITE_OK ){ sqliteDbResetCursor(pCur, 1); }else{ rc = -1; } break; } default: { sqliteDbResetCursor(pCur, 1); rc = SQLITE_CORRUPT; } } } return rc; } ################ /* ** Move the cursor to the first entry in the table. */ int sqliteDbCursorFirst(DbCursor *pCur){ if( pCur->nLevel==0 ){ int rc; |
︙ | ︙ |
Changes to src/db.h.
︙ | ︙ | |||
17 18 19 20 21 22 23 | ** Boston, MA 02111-1307, USA. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** ************************************************************************* | | | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 | ** Boston, MA 02111-1307, USA. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** ************************************************************************* ** $Id: db.h,v 1.5 2001/01/31 13:28:09 drh Exp $ */ typedef struct Db Db; typedef struct DbCursor DbCursor; int sqliteDbOpen(const char *filename, Db**); int sqliteDbClose(Db*); |
︙ | ︙ | |||
43 44 45 46 47 48 49 | int sqliteDbCursorNext(DbCursor*); int sqliteDbCursorDatasize(DbCursor*); int sqliteDbCursorKeysize(DbCursor*); int sqliteDbCursorRead(DbCursor*, int amt, int offset, void *buf); int sqliteDbCursorReadKey(DbCursor*, int amt, int offset, void *buf); int sqliteDbCursorWrite(DbCursor*, int amt, int offset, const void *buf); | | | 43 44 45 46 47 48 49 50 51 | int sqliteDbCursorNext(DbCursor*); int sqliteDbCursorDatasize(DbCursor*); int sqliteDbCursorKeysize(DbCursor*); int sqliteDbCursorRead(DbCursor*, int amt, int offset, void *buf); int sqliteDbCursorReadKey(DbCursor*, int amt, int offset, void *buf); int sqliteDbCursorWrite(DbCursor*, int amt, int offset, const void *buf); int sqliteDbCursorFind(DbCursor*, int nKey, const void *pKey, int createFlag); int sqliteDbCursorResize(DbCursor*, int nData); |
Changes to src/printf.c.
︙ | ︙ | |||
42 43 44 45 46 47 48 | ** ** + When compiled using GCC on a SPARC, this version of printf is ** faster than the library printf for SUN OS 4.1. ** ** + All functions are fully reentrant. ** */ | < | 42 43 44 45 46 47 48 49 50 51 52 53 54 55 | ** ** + When compiled using GCC on a SPARC, this version of printf is ** faster than the library printf for SUN OS 4.1. ** ** + All functions are fully reentrant. ** */ #include "sqliteInt.h" /* ** Undefine COMPATIBILITY to make some slight changes in the way things ** work. I think the changes are an improvement, but they are not ** backwards compatible. */ |
︙ | ︙ | |||
258 259 260 261 262 263 264 | width = va_arg(ap,int); if( width<0 ){ flag_leftjustify = 1; width = -width; } c = *++fmt; }else{ | | | | 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 | width = va_arg(ap,int); if( width<0 ){ flag_leftjustify = 1; width = -width; } c = *++fmt; }else{ while( c>='0' && c<='9' ){ width = width*10 + c - '0'; c = *++fmt; } } if( width > etBUFSIZE-10 ){ width = etBUFSIZE-10; } /* Get the precision */ if( c=='.' ){ precision = 0; c = *++fmt; if( c=='*' ){ precision = va_arg(ap,int); #ifndef etCOMPATIBILITY /* This is sensible, but SUN OS 4.1 doesn't do it. */ if( precision<0 ) precision = -precision; #endif c = *++fmt; }else{ while( c>='0' && c<='9' ){ precision = precision*10 + c - '0'; c = *++fmt; } } /* Limit the precision to prevent overflowing buf[] during conversion */ if( precision>etBUFSIZE-40 ) precision = etBUFSIZE-40; }else{ |
︙ | ︙ |
Changes to src/random.c.
︙ | ︙ | |||
23 24 25 26 27 28 29 | ************************************************************************* ** This file contains code to implement a pseudo-random number ** generator (PRNG) for SQLite. ** ** Random numbers are used by some of the database backends in order ** to generate random integer keys for tables or random filenames. ** | | | | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 | ************************************************************************* ** This file contains code to implement a pseudo-random number ** generator (PRNG) for SQLite. ** ** Random numbers are used by some of the database backends in order ** to generate random integer keys for tables or random filenames. ** ** $Id: random.c,v 1.2 2001/01/31 13:28:09 drh Exp $ */ #include "sqliteInt.h" #include <time.h> /* ** Get a single 8-bit random value from the RC4 PRNG. */ int sqliteRandomByte(void){ int t; |
︙ | ︙ |
Changes to src/tclsqlite.c.
︙ | ︙ | |||
19 20 21 22 23 24 25 | ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** ************************************************************************* ** A TCL Interface to SQLite ** | | | | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 | ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** ************************************************************************* ** A TCL Interface to SQLite ** ** $Id: tclsqlite.c,v 1.13 2001/01/31 13:28:09 drh Exp $ */ #ifndef NO_TCL /* Omit this whole file if TCL is unavailable */ #include "sqlite.h" #include "tcl.h" #include <stdlib.h> #include <string.h> /* ** There is one instance of this structure for each SQLite database ** that has been opened by the SQLite TCL interface. */ |
︙ | ︙ |
Changes to test/dbbe.test.
︙ | ︙ | |||
19 20 21 22 23 24 25 | # drh@hwaci.com # http://www.hwaci.com/drh/ # #*********************************************************************** # This file implements regression tests for SQLite library. The # focus of this file is exercising the code in dbbe.c. # | | | | | | | | | | | | 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 | # drh@hwaci.com # http://www.hwaci.com/drh/ # #*********************************************************************** # This file implements regression tests for SQLite library. The # focus of this file is exercising the code in dbbe.c. # # $Id: dbbe.test,v 1.5 2001/01/31 13:28:09 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl # Try to open a database that does not exist. # do_test dbbe-1.1 { catch {db close} forcedelete testdb set v [catch {sqlite db testdb 0444} msg] lappend v $msg } {1 {can't find directory "testdb"}} do_test dbbe-1.2 { catch {db close} forcedelete testdb set v [catch {sqlite db testdb/dummy 0666} msg] lappend v $msg } {1 {can't find or create directory "testdb/dummy"}} # Try to open a database for writing in a directory that # doesn't exist but for which the parent directory does # exist. This should work! # do_test dbbe-1.3 { catch {db close} forcedelete testdb set v [catch {sqlite db testdb 0666} msg] lappend v $msg } {0 {}} # Try to open a file instead of a directory. # do_test dbbe-1.4 { catch {db close} forcedelete testdb set fd [open testdb w] puts $fd hi! close $fd set v [catch {sqlite db testdb 0666} msg] lappend v $msg } {1 {not a directory: "testdb"}} # Access permission denied on the directory. # do_test dbbe-1.5 { catch {db close} forcedelete testdb file mkdir testdb file attributes testdb -permissions 0 set v [catch {sqlite db testdb 0666} msg] lappend v $msg } {1 {access permission denied}} # Access permission denied on the master file # do_test dbbe-1.6 { catch {db close} forcedelete testdb sqlite db testdb 0666 execsql {CREATE TABLE t1(x int)} db close file attributes testdb/sqlite_master.tbl -permission 0444 set v [catch {sqlite db testdb 0666} msg] lappend v $msg } {1 {access permission denied for testdb/sqlite_master.tbl}} do_test dbbe-1.6b { catch {db close} forcedelete testdb sqlite db testdb 0666 execsql {CREATE TABLE t1(x int)} db close file attributes testdb/sqlite_master.tbl -permission 0444 set v [catch {sqlite db testdb 0444} msg] lappend v $msg } {0 {}} # Make sure a table can be accessed by either uppercase or lowercase # names # do_test dbbe-2.1 { catch {db close} forcedelete testdb sqlite db testdb 0666 execsql { CREATE TABLE t1(x int); INSERT INTO t1 VALUES(1); } db close sqlite db testdb 0444 set r [execsql {SELECT * FROM T1}] db close sqlite db testdb 0666 lappend r [execsql {SELECT * FROM t1}] } {1 1} # Try to change a table after opening the database readonly # do_test dbbe-3.1 { catch {db close} forcedelete testdb sqlite db testdb 0666 execsql {CREATE TABLE t1(x int)} db close sqlite db testdb 0444 set v [catch {execsql {INSERT INTO t1 VALUES(1)}} msg] lappend v $msg } {7 {table t1 is readonly}} finish_test |
Changes to test/tester.tcl.
︙ | ︙ | |||
19 20 21 22 23 24 25 | # drh@hwaci.com # http://www.hwaci.com/drh/ # #*********************************************************************** # This file implements some common TCL routines used for regression # testing the SQLite library # | | | > > | 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 | # drh@hwaci.com # http://www.hwaci.com/drh/ # #*********************************************************************** # This file implements some common TCL routines used for regression # testing the SQLite library # # $Id: tester.tcl,v 1.10 2001/01/31 13:28:09 drh Exp $ # Create a test database # if {![info exists dbprefix]} { if {[info exists env(SQLITE_PREFIX)]} { set dbprefix $env(SQLITE_PREFIX): } else { set dbprefix "gdbm:" } } switch $dbprefix { gdbm: { if {[catch {file delete -force testdb}]} { exec rm -rf testdb } file mkdir testdb } memory: { # do nothing } } sqlite db ${dbprefix}testdb |
︙ | ︙ | |||
151 152 153 154 155 156 157 | db eval $sql data { foreach f $data(*) { lappend result $f $data($f) } } return $result } | > > > > > > > > | 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 | db eval $sql data { foreach f $data(*) { lappend result $f $data($f) } } return $result } # Delete a file or directory # proc forcedelete {filename} { if {[catch {file delete -force $filename}]} { exec rm -rf $filename } } |
Changes to www/crosscompile.tcl.
1 2 3 | # # Run this Tcl script to generate the crosscompile.html file. # | | | 1 2 3 4 5 6 7 8 9 10 11 | # # Run this Tcl script to generate the crosscompile.html file. # set rcsid {$Id: crosscompile.tcl,v 1.4 2001/01/31 13:28:09 drh Exp $} puts {<html> <head> <title>Notes On How To Compile SQLite Using The MinGW Cross-Compiler</title> </head> <body bgcolor=white> <h1 align=center> |
︙ | ︙ | |||
144 145 146 147 148 149 150 | <blockquote><pre> cat >>systems.h <<\END #ifdef NO_LOCKS #undef UNLOCK_FILE #define UNLOCK_FILE(x) #undef READLOCK_FILE | | | | 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 | <blockquote><pre> cat >>systems.h <<\END #ifdef NO_LOCKS #undef UNLOCK_FILE #define UNLOCK_FILE(x) #undef READLOCK_FILE #define READLOCK_FILE(x) lock_val=0; #undef WRITELOCK_FILE #define WRITELOCK_FILE(x) lock_val=0; #endif END </pre></blockquote> <p>Then manually build the GDBM library with the extra "NO_LOCKS" define as follows:</p> <blockquote><pre> |
︙ | ︙ |