Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Add tests for the RBU module. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
a194e53670e25a48c2bb51b54755abff |
User & Date: | dan 2019-05-10 20:44:10.289 |
Context
2019-05-11
| ||
13:04 | Do not assume that "x IS NOT ?" implies "x NOT NULL" when considering partial indexes. Fix for ticket [8025674847]. (check-in: 0ba6d709b5 user: dan tags: trunk) | |
2019-05-10
| ||
20:44 | Add tests for the RBU module. (check-in: a194e53670 user: dan tags: trunk) | |
17:54 | Fix harmless compiler warnings. (check-in: 956ca2a452 user: drh tags: trunk) | |
Changes
Changes to ext/rbu/rbufault2.test.
︙ | ︙ | |||
48 49 50 51 52 53 54 55 56 57 | {1 SQLITE_CONSTRAINT} \ {1 SQLITE_NOMEM} \ {1 {SQLITE_NOMEM - unable to open a temporary database file for storing temporary tables}} \ {1 {SQLITE_NOMEM - out of memory}} } finish_test | > > > > > > > > > | 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 | {1 SQLITE_CONSTRAINT} \ {1 SQLITE_NOMEM} \ {1 {SQLITE_NOMEM - unable to open a temporary database file for storing temporary tables}} \ {1 {SQLITE_NOMEM - out of memory}} } sqlite3rbu_create_vfs -default rbu "" sqlite3 db test.db set ::vfsname [file_control_vfsname db] do_faultsim_test 2 -faults oom* -prep { } -body { file_control_vfsname db } db close sqlite3rbu_destroy_vfs rbu finish_test |
Changes to ext/rbu/rbumisc.test.
︙ | ︙ | |||
14 15 16 17 18 19 20 | set ::testprefix rbumisc db close sqlite3_shutdown sqlite3_config_uri 1 reset_db | < < | < < < < < > > > > > > > > > > > < < | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | set ::testprefix rbumisc db close sqlite3_shutdown sqlite3_config_uri 1 reset_db proc populate_rbu_db {} { forcedelete rbu.db sqlite3 rbu rbu.db rbu eval { CREATE TABLE data_x1(a, b, c, rbu_control); INSERT INTO data_x1 VALUES(1, 1, 1, 0); INSERT INTO data_x1 VALUES(2, 2, 2, 0); CREATE TABLE dat(a, b, c, rbu_control); CREATE TABLE "data x1"(a, b, c, rbu_control); CREATE TABLE datax1(a, b, c, rbu_control); CREATE TABLE data_(a, b, c, rbu_control); INSERT INTO "data x1" VALUES(3, 3, 3, 0); INSERT INTO datax1 VALUES(3, 3, 3, 0); INSERT INTO data_ VALUES(3, 3, 3, 0); INSERT INTO dat VALUES(3, 3, 3, 0); } rbu close } #------------------------------------------------------------------------- # Ensure that RBU is not confused by oddly named tables in an RBU # database. # do_execsql_test 1.0 { CREATE TABLE x1(a, b, c INTEGER PRIMARY KEY); } do_test 1.1 { populate_rbu_db } {} do_test 1.2 { step_rbu test.db rbu.db db eval { SELECT * FROM x1 } } {1 1 1 2 2 2} do_test 1.3 { db eval { DELETE FROM x1 } sqlite3 rbu rbu.db rbu eval { DELETE FROM rbu_state } rbu close step_rbu test.db rbu.db db eval { SELECT * FROM x1 } } {1 1 1 2 2 2} do_test 1.4 { db eval { DELETE FROM x1 } populate_rbu_db sqlite3rbu rbu test.db rbu.db rbu step rbu step rbu close forcecopy test.db-oal test.db-wal sqlite3rbu rbu test.db rbu.db rbu step list [catch { rbu close } msg] $msg } {1 {SQLITE_ERROR - cannot update wal mode database}} #------------------------------------------------------------------------- # Test the effect of a wal file appearing after the target database has # been opened, but before it has been locked. # catch { db close } testvfs tvfs -default 1 for {set N 1} {$N < 10} {incr N} { reset_db populate_rbu_db do_execsql_test 2.$N.0 { CREATE TABLE x1(a, b, c INTEGER PRIMARY KEY); } set nAccessCnt 0 do_test 2.$N.1 { sqlite3rbu rbu test.db rbu.db rbu step rbu step rbu close } {SQLITE_OK} tvfs script xAccess tvfs filter xAccess set nAccessCnt 0 proc xAccess {method file args} { global nAccessCnt if {[file tail $file]=="test.db-wal"} { incr nAccessCnt -1 if {$nAccessCnt==0} { set fd [open test.db-wal w] puts -nonewline $fd [string repeat 0 2000] close $fd } } return SQLITE_OK } foreach r { {1 {SQLITE_ERROR - cannot update wal mode database}} {0 SQLITE_OK} {1 {SQLITE_CANTOPEN - unable to open database file}} } { set RES($r) 1 } do_test 2.$N.2 { set ::nAccessCnt $N set res [list [catch { sqlite3rbu rbu test.db rbu.db rbu step rbu close } msg ] $msg] set RES($res) } {1} catch {rbu close} } catch {db close} catch {tvfs delete} #------------------------------------------------------------------------- testvfs tvfs -default 1 reset_db populate_rbu_db do_execsql_test 3.0 { CREATE TABLE x1(a, b, c INTEGER PRIMARY KEY); } tvfs script xFileControl tvfs filter xFileControl proc xFileControl {method file verb args} { if {$verb=="ZIPVFS" && [info exists ::zipvfs_filecontrol]} { return $::zipvfs_filecontrol } return "SQLITE_NOTFOUND" } breakpoint foreach {tn ret err} { 1 SQLITE_OK 0 2 SQLITE_ERROR 1 3 SQLITE_NOTFOUND 0 4 SQLITE_OMIT 1 } { set ::zipvfs_filecontrol $ret do_test 3.$tn.1 { catch { sqlite3rbu rbu test.db rbu.db rbu step rbu close } } $err } catch {db close} catch {tvfs delete} #------------------------------------------------------------------------- finish_test |
Changes to ext/rbu/sqlite3rbu.c.
︙ | ︙ | |||
4703 4704 4705 4706 4707 4708 4709 | rc = xControl(p->pReal, SQLITE_FCNTL_ZIPVFS, &dummy); if( rc==SQLITE_OK ){ rc = SQLITE_ERROR; pRbu->zErrmsg = sqlite3_mprintf("rbu/zipvfs setup error"); }else if( rc==SQLITE_NOTFOUND ){ pRbu->pTargetFd = p; p->pRbu = pRbu; | < < | 4703 4704 4705 4706 4707 4708 4709 4710 4711 4712 4713 4714 4715 4716 4717 | rc = xControl(p->pReal, SQLITE_FCNTL_ZIPVFS, &dummy); if( rc==SQLITE_OK ){ rc = SQLITE_ERROR; pRbu->zErrmsg = sqlite3_mprintf("rbu/zipvfs setup error"); }else if( rc==SQLITE_NOTFOUND ){ pRbu->pTargetFd = p; p->pRbu = pRbu; rbuMainlistAdd(p); if( p->pWalFd ) p->pWalFd->pRbu = pRbu; rc = SQLITE_OK; } } return rc; } else if( op==SQLITE_FCNTL_RBUCNT ){ |
︙ | ︙ | |||
4768 4769 4770 4771 4772 4773 4774 | /* Magic number 1 is the WAL_CKPT_LOCK lock. Preventing SQLite from ** taking this lock also prevents any checkpoints from occurring. ** todo: really, it's not clear why this might occur, as ** wal_autocheckpoint ought to be turned off. */ if( ofst==WAL_LOCK_CKPT && n==1 ) rc = SQLITE_BUSY; }else{ int bCapture = 0; | < | < < | 4766 4767 4768 4769 4770 4771 4772 4773 4774 4775 4776 4777 4778 4779 4780 | /* Magic number 1 is the WAL_CKPT_LOCK lock. Preventing SQLite from ** taking this lock also prevents any checkpoints from occurring. ** todo: really, it's not clear why this might occur, as ** wal_autocheckpoint ought to be turned off. */ if( ofst==WAL_LOCK_CKPT && n==1 ) rc = SQLITE_BUSY; }else{ int bCapture = 0; if( pRbu && pRbu->eStage==RBU_STAGE_CAPTURE ){ bCapture = 1; } if( bCapture==0 || 0==(flags & SQLITE_SHM_UNLOCK) ){ rc = p->pReal->pMethods->xShmLock(p->pReal, ofst, n, flags); if( bCapture && rc==SQLITE_OK ){ pRbu->mLock |= (1 << ofst); |
︙ | ︙ | |||
4804 4805 4806 4807 4808 4809 4810 | int rc = SQLITE_OK; int eStage = (p->pRbu ? p->pRbu->eStage : 0); /* If not in RBU_STAGE_OAL, allow this call to pass through. Or, if this ** rbu is in the RBU_STAGE_OAL state, use heap memory for *-shm space ** instead of a file on disk. */ assert( p->openFlags & (SQLITE_OPEN_MAIN_DB|SQLITE_OPEN_TEMP_DB) ); | | < > > > > > > | < | | 4799 4800 4801 4802 4803 4804 4805 4806 4807 4808 4809 4810 4811 4812 4813 4814 4815 4816 4817 4818 4819 4820 4821 4822 4823 4824 4825 4826 4827 4828 4829 4830 | int rc = SQLITE_OK; int eStage = (p->pRbu ? p->pRbu->eStage : 0); /* If not in RBU_STAGE_OAL, allow this call to pass through. Or, if this ** rbu is in the RBU_STAGE_OAL state, use heap memory for *-shm space ** instead of a file on disk. */ assert( p->openFlags & (SQLITE_OPEN_MAIN_DB|SQLITE_OPEN_TEMP_DB) ); if( eStage==RBU_STAGE_OAL ){ sqlite3_int64 nByte = (iRegion+1) * sizeof(char*); char **apNew = (char**)sqlite3_realloc64(p->apShm, nByte); /* This is an RBU connection that uses its own heap memory for the ** pages of the *-shm file. Since no other process can have run ** recovery, the connection must request *-shm pages in order ** from start to finish. */ assert( iRegion==p->nShm ); if( apNew==0 ){ rc = SQLITE_NOMEM; }else{ memset(&apNew[p->nShm], 0, sizeof(char*) * (1 + iRegion - p->nShm)); p->apShm = apNew; p->nShm = iRegion+1; } if( rc==SQLITE_OK ){ char *pNew = (char*)sqlite3_malloc64(szRegion); if( pNew==0 ){ rc = SQLITE_NOMEM; }else{ memset(pNew, 0, szRegion); p->apShm[iRegion] = pNew; } |
︙ | ︙ |
Changes to src/test_vfs.c.
︙ | ︙ | |||
231 232 233 234 235 236 237 238 239 240 241 242 243 244 | { SQLITE_OK, "SQLITE_OK" }, { SQLITE_ERROR, "SQLITE_ERROR" }, { SQLITE_IOERR, "SQLITE_IOERR" }, { SQLITE_LOCKED, "SQLITE_LOCKED" }, { SQLITE_BUSY, "SQLITE_BUSY" }, { SQLITE_READONLY, "SQLITE_READONLY" }, { SQLITE_READONLY_CANTINIT, "SQLITE_READONLY_CANTINIT" }, { -1, "SQLITE_OMIT" }, }; const char *z; int i; z = Tcl_GetStringResult(p->interp); | > | 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 | { SQLITE_OK, "SQLITE_OK" }, { SQLITE_ERROR, "SQLITE_ERROR" }, { SQLITE_IOERR, "SQLITE_IOERR" }, { SQLITE_LOCKED, "SQLITE_LOCKED" }, { SQLITE_BUSY, "SQLITE_BUSY" }, { SQLITE_READONLY, "SQLITE_READONLY" }, { SQLITE_READONLY_CANTINIT, "SQLITE_READONLY_CANTINIT" }, { SQLITE_NOTFOUND, "SQLITE_NOTFOUND" }, { -1, "SQLITE_OMIT" }, }; const char *z; int i; z = Tcl_GetStringResult(p->interp); |
︙ | ︙ | |||
548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 | if( p->pScript && (p->mask&TESTVFS_FCNTL_MASK) ){ struct Fcntl { int iFnctl; const char *zFnctl; } aF[] = { { SQLITE_FCNTL_BEGIN_ATOMIC_WRITE, "BEGIN_ATOMIC_WRITE" }, { SQLITE_FCNTL_COMMIT_ATOMIC_WRITE, "COMMIT_ATOMIC_WRITE" }, }; int i; for(i=0; i<sizeof(aF)/sizeof(aF[0]); i++){ if( op==aF[i].iFnctl ) break; } if( i<sizeof(aF)/sizeof(aF[0]) ){ int rc = 0; tvfsExecTcl(p, "xFileControl", Tcl_NewStringObj(pFd->zFilename, -1), Tcl_NewStringObj(aF[i].zFnctl, -1), 0, 0 ); tvfsResultCode(p, &rc); | > | | 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 | if( p->pScript && (p->mask&TESTVFS_FCNTL_MASK) ){ struct Fcntl { int iFnctl; const char *zFnctl; } aF[] = { { SQLITE_FCNTL_BEGIN_ATOMIC_WRITE, "BEGIN_ATOMIC_WRITE" }, { SQLITE_FCNTL_COMMIT_ATOMIC_WRITE, "COMMIT_ATOMIC_WRITE" }, { SQLITE_FCNTL_ZIPVFS, "ZIPVFS" }, }; int i; for(i=0; i<sizeof(aF)/sizeof(aF[0]); i++){ if( op==aF[i].iFnctl ) break; } if( i<sizeof(aF)/sizeof(aF[0]) ){ int rc = 0; tvfsExecTcl(p, "xFileControl", Tcl_NewStringObj(pFd->zFilename, -1), Tcl_NewStringObj(aF[i].zFnctl, -1), 0, 0 ); tvfsResultCode(p, &rc); if( rc ) return (rc<0 ? SQLITE_OK : rc); } } return sqlite3OsFileControl(pFd->pReal, op, pArg); } /* ** Return the sector-size in bytes for an tvfs-file. |
︙ | ︙ |