Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Add a vfs backend that detects problems like the one addressed by (6043) and (6047). (CVS 6049) |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
49172e487610268662c39fc403803277 |
User & Date: | danielk1977 2008-12-20 18:33:59.000 |
Context
2008-12-21
| ||
03:51 | Continue refactoring where.c in preparation for installing OR-clause optimizations. (CVS 6050) (check-in: 778e91ddb8 user: drh tags: trunk) | |
2008-12-20
| ||
18:33 | Add a vfs backend that detects problems like the one addressed by (6043) and (6047). (CVS 6049) (check-in: 49172e4876 user: danielk1977 tags: trunk) | |
13:18 | Do not use long long constants in code. Ticket #3547. (CVS 6048) (check-in: 51b3bfc3b9 user: drh tags: trunk) | |
Changes
Changes to main.mk.
︙ | ︙ | |||
221 222 223 224 225 226 227 228 229 230 231 232 233 234 | $(TOP)/src/test_autoext.c \ $(TOP)/src/test_async.c \ $(TOP)/src/test_btree.c \ $(TOP)/src/test_config.c \ $(TOP)/src/test_devsym.c \ $(TOP)/src/test_func.c \ $(TOP)/src/test_hexio.c \ $(TOP)/src/test_malloc.c \ $(TOP)/src/test_md5.c \ $(TOP)/src/test_mutex.c \ $(TOP)/src/test_onefile.c \ $(TOP)/src/test_osinst.c \ $(TOP)/src/test_pcache.c \ $(TOP)/src/test_schema.c \ | > | 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 | $(TOP)/src/test_autoext.c \ $(TOP)/src/test_async.c \ $(TOP)/src/test_btree.c \ $(TOP)/src/test_config.c \ $(TOP)/src/test_devsym.c \ $(TOP)/src/test_func.c \ $(TOP)/src/test_hexio.c \ $(TOP)/src/test_journal.c \ $(TOP)/src/test_malloc.c \ $(TOP)/src/test_md5.c \ $(TOP)/src/test_mutex.c \ $(TOP)/src/test_onefile.c \ $(TOP)/src/test_osinst.c \ $(TOP)/src/test_pcache.c \ $(TOP)/src/test_schema.c \ |
︙ | ︙ |
Changes to src/test6.c.
︙ | ︙ | |||
10 11 12 13 14 15 16 | ** ****************************************************************************** ** ** This file contains code that modified the OS layer in order to simulate ** the effect on the database file of an OS crash or power failure. This ** is used to test the ability of SQLite to recover from those situations. ** | | | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | ** ****************************************************************************** ** ** This file contains code that modified the OS layer in order to simulate ** the effect on the database file of an OS crash or power failure. This ** is used to test the ability of SQLite to recover from those situations. ** ** $Id: test6.c,v 1.41 2008/12/20 18:33:59 danielk1977 Exp $ */ #if SQLITE_TEST /* This file is used for testing only */ #include "sqliteInt.h" #include "tcl.h" #ifndef SQLITE_OMIT_DISKIO /* This file is a no-op if disk I/O is disabled */ |
︙ | ︙ | |||
859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 | if( processDevSymArgs(interp, objc-1, &objv[1], &iDc, &iSectorSize) ){ return TCL_ERROR; } devsym_register(iDc, iSectorSize); return TCL_OK; } #endif /* SQLITE_OMIT_DISKIO */ /* ** This procedure registers the TCL procedures defined in this file. */ int Sqlitetest6_Init(Tcl_Interp *interp){ #ifndef SQLITE_OMIT_DISKIO Tcl_CreateObjCommand(interp, "sqlite3_crash_enable", crashEnableCmd, 0, 0); Tcl_CreateObjCommand(interp, "sqlite3_crashparams", crashParamsObjCmd, 0, 0); Tcl_CreateObjCommand(interp, "sqlite3_simulate_device", devSymObjCmd, 0, 0); #endif return TCL_OK; } #endif /* SQLITE_TEST */ | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 | if( processDevSymArgs(interp, objc-1, &objv[1], &iDc, &iSectorSize) ){ return TCL_ERROR; } devsym_register(iDc, iSectorSize); return TCL_OK; } /* ** tclcmd: register_jt_vfs ?-default? PARENT-VFS */ static int jtObjCmd( void * clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[] ){ int jt_register(char *, int); char *zParent = 0; if( objc!=2 && objc!=3 ){ Tcl_WrongNumArgs(interp, 1, objv, "?-default? PARENT-VFS"); return TCL_ERROR; } zParent = Tcl_GetString(objv[1]); if( objc==3 ){ if( strcmp(zParent, "-default") ){ Tcl_AppendResult(interp, "bad option \"", zParent, "\": must be -default", 0 ); return TCL_ERROR; } zParent = Tcl_GetString(objv[2]); } if( !(*zParent) ){ zParent = 0; } if( jt_register(zParent, objc==3) ){ Tcl_AppendResult(interp, "Error in jt_register", 0); return TCL_ERROR; } return TCL_OK; } /* ** tclcmd: unregister_jt_vfs */ static int jtUnregisterObjCmd( void * clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[] ){ void jt_unregister(void); if( objc!=1 ){ Tcl_WrongNumArgs(interp, 1, objv, ""); return TCL_ERROR; } jt_unregister(); return TCL_OK; } #endif /* SQLITE_OMIT_DISKIO */ /* ** This procedure registers the TCL procedures defined in this file. */ int Sqlitetest6_Init(Tcl_Interp *interp){ #ifndef SQLITE_OMIT_DISKIO Tcl_CreateObjCommand(interp, "sqlite3_crash_enable", crashEnableCmd, 0, 0); Tcl_CreateObjCommand(interp, "sqlite3_crashparams", crashParamsObjCmd, 0, 0); Tcl_CreateObjCommand(interp, "sqlite3_simulate_device", devSymObjCmd, 0, 0); Tcl_CreateObjCommand(interp, "register_jt_vfs", jtObjCmd, 0, 0); Tcl_CreateObjCommand(interp, "unregister_jt_vfs", jtUnregisterObjCmd, 0, 0); #endif return TCL_OK; } #endif /* SQLITE_TEST */ |
Added src/test_journal.c.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 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 422 423 424 425 426 427 428 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 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 | /* ** 2008 Jan 22 ** ** 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 contains code for a VFS layer that acts as a wrapper around ** an existing VFS. The code in this file attempts to detect a specific ** bug in SQLite - writing data to a database file page when: ** ** a) the original page data is not stored in a synced portion of the ** journal file, and ** b) the page was not a free-list leaf page when the transaction was ** first opened. ** ** $Id: test_journal.c,v 1.1 2008/12/20 18:33:59 danielk1977 Exp $ */ #if SQLITE_TEST /* This file is used for testing only */ #include "sqlite3.h" #include "sqliteInt.h" /* ** Maximum pathname length supported by the jt backend. */ #define JT_MAX_PATHNAME 512 /* ** Name used to identify this VFS. */ #define JT_VFS_NAME "jt" typedef struct jt_file jt_file; struct jt_file { sqlite3_file base; const char *zName; /* Name of open file */ int flags; /* Flags the file was opened with */ /* The following are only used by database file file handles */ int eLock; /* Current lock held on the file */ u32 nPage; /* Size of file in pages when transaction started */ u32 nPagesize; /* Page size when transaction started */ Bitvec *pWritable; /* Bitvec of pages that may be written to the file */ jt_file *pNext; /* All files are stored in a linked list */ sqlite3_file *pReal; /* The file handle for the underlying vfs */ }; /* ** Method declarations for jt_file. */ static int jtClose(sqlite3_file*); static int jtRead(sqlite3_file*, void*, int iAmt, sqlite3_int64 iOfst); static int jtWrite(sqlite3_file*,const void*,int iAmt, sqlite3_int64 iOfst); static int jtTruncate(sqlite3_file*, sqlite3_int64 size); static int jtSync(sqlite3_file*, int flags); static int jtFileSize(sqlite3_file*, sqlite3_int64 *pSize); static int jtLock(sqlite3_file*, int); static int jtUnlock(sqlite3_file*, int); static int jtCheckReservedLock(sqlite3_file*, int *); static int jtFileControl(sqlite3_file*, int op, void *pArg); static int jtSectorSize(sqlite3_file*); static int jtDeviceCharacteristics(sqlite3_file*); /* ** Method declarations for jt_vfs. */ static int jtOpen(sqlite3_vfs*, const char *, sqlite3_file*, int , int *); static int jtDelete(sqlite3_vfs*, const char *zName, int syncDir); static int jtAccess(sqlite3_vfs*, const char *zName, int flags, int *); static int jtFullPathname(sqlite3_vfs*, const char *zName, int, char *zOut); #ifndef SQLITE_OMIT_LOAD_EXTENSION static void *jtDlOpen(sqlite3_vfs*, const char *zFilename); static void jtDlError(sqlite3_vfs*, int nByte, char *zErrMsg); static void (*jtDlSym(sqlite3_vfs*,void*, const char *zSymbol))(void); static void jtDlClose(sqlite3_vfs*, void*); #endif /* SQLITE_OMIT_LOAD_EXTENSION */ static int jtRandomness(sqlite3_vfs*, int nByte, char *zOut); static int jtSleep(sqlite3_vfs*, int microseconds); static int jtCurrentTime(sqlite3_vfs*, double*); static sqlite3_vfs jt_vfs = { 1, /* iVersion */ sizeof(jt_file), /* szOsFile */ JT_MAX_PATHNAME, /* mxPathname */ 0, /* pNext */ JT_VFS_NAME, /* zName */ 0, /* pAppData */ jtOpen, /* xOpen */ jtDelete, /* xDelete */ jtAccess, /* xAccess */ jtFullPathname, /* xFullPathname */ #ifndef SQLITE_OMIT_LOAD_EXTENSION jtDlOpen, /* xDlOpen */ jtDlError, /* xDlError */ jtDlSym, /* xDlSym */ jtDlClose, /* xDlClose */ #else 0, /* xDlOpen */ 0, /* xDlError */ 0, /* xDlSym */ 0, /* xDlClose */ #endif /* SQLITE_OMIT_LOAD_EXTENSION */ jtRandomness, /* xRandomness */ jtSleep, /* xSleep */ jtCurrentTime /* xCurrentTime */ }; static sqlite3_io_methods jt_io_methods = { 1, /* iVersion */ jtClose, /* xClose */ jtRead, /* xRead */ jtWrite, /* xWrite */ jtTruncate, /* xTruncate */ jtSync, /* xSync */ jtFileSize, /* xFileSize */ jtLock, /* xLock */ jtUnlock, /* xUnlock */ jtCheckReservedLock, /* xCheckReservedLock */ jtFileControl, /* xFileControl */ jtSectorSize, /* xSectorSize */ jtDeviceCharacteristics /* xDeviceCharacteristics */ }; struct JtGlobal { sqlite3_vfs *pVfs; jt_file *pList; }; static struct JtGlobal g = {0, 0}; /* ** Close an jt-file. */ static int jtClose(sqlite3_file *pFile){ jt_file **pp; jt_file *p = (jt_file *)pFile; if( p->zName ){ for(pp=&g.pList; *pp!=p; *pp=(*pp)->pNext); *pp = p->pNext; } return sqlite3OsClose(p->pReal); } /* ** Read data from an jt-file. */ static int jtRead( sqlite3_file *pFile, void *zBuf, int iAmt, sqlite_int64 iOfst ){ jt_file *p = (jt_file *)pFile; return sqlite3OsRead(p->pReal, zBuf, iAmt, iOfst); } static jt_file *locateDatabaseHandle(const char *zJournal){ jt_file *pMain; for(pMain=g.pList; pMain; pMain=pMain->pNext){ int nName = strlen(zJournal) - strlen("-journal"); if( (pMain->flags&SQLITE_OPEN_MAIN_DB) && (strlen(pMain->zName)==nName) && 0==memcmp(pMain->zName, zJournal, nName) && (pMain->eLock>=SQLITE_LOCK_RESERVED) ){ break; } } return pMain; } static u32 decodeUint32(const unsigned char *z){ return (z[0]<<24) + (z[1]<<16) + (z[2]<<8) + z[3]; } static void readFreelist(jt_file *pMain){ sqlite3_file *p = pMain->pReal; sqlite3_int64 iSize; sqlite3OsFileSize(p, &iSize); if( iSize>=pMain->nPagesize ){ unsigned char *zBuf = (unsigned char *)malloc(pMain->nPagesize); u32 iTrunk; sqlite3OsRead(p, zBuf, pMain->nPagesize, 0); iTrunk = decodeUint32(&zBuf[32]); while( iTrunk>0 ){ u32 nLeaf; u32 iLeaf; sqlite3OsRead(p, zBuf, pMain->nPagesize, (iTrunk-1)*pMain->nPagesize); nLeaf = decodeUint32(&zBuf[4]); for(iLeaf=0; iLeaf<nLeaf; iLeaf++){ u32 pgno = decodeUint32(&zBuf[8+4*iLeaf]); sqlite3BitvecSet(pMain->pWritable, pgno); } iTrunk = decodeUint32(zBuf); } free(zBuf); } } /* ** The first argument, zBuf, points to a buffer containing a 28 byte ** serialized journal header. This function deserializes four of the ** integer fields contained in the journal header and writes their ** values to the output variables. */ static int decodeJournalHdr( const unsigned char *zBuf, /* Input: 28 byte journal header */ u32 *pnRec, /* Out: Number of journalled records */ u32 *pnPage, /* Out: Original database page count */ u32 *pnSector, /* Out: Sector size in bytes */ u32 *pnPagesize /* Out: Page size in bytes */ ){ unsigned char aMagic[] = { 0xd9, 0xd5, 0x05, 0xf9, 0x20, 0xa1, 0x63, 0xd7 }; if( memcmp(aMagic, zBuf, 8) ) return 1; if( pnRec ) *pnRec = decodeUint32(&zBuf[8]); if( pnPage ) *pnPage = decodeUint32(&zBuf[16]); if( pnSector ) *pnSector = decodeUint32(&zBuf[20]); if( pnPagesize ) *pnPagesize = decodeUint32(&zBuf[24]); return 0; } /* ** Write data to an jt-file. */ static int jtWrite( sqlite3_file *pFile, const void *zBuf, int iAmt, sqlite_int64 iOfst ){ jt_file *p = (jt_file *)pFile; if( p->flags&SQLITE_OPEN_MAIN_JOURNAL && iOfst==0 ){ jt_file *pMain = locateDatabaseHandle(p->zName); assert( pMain ); if( decodeJournalHdr(zBuf, 0, &pMain->nPage, 0, &pMain->nPagesize) ){ /* Zeroing the first journal-file header. This is the end of a ** transaction. */ sqlite3BitvecDestroy(pMain->pWritable); pMain->pWritable = 0; }else{ /* Writing the first journal header to a journal file. This happens ** when a transaction is first started. */ pMain->pWritable = sqlite3BitvecCreate(pMain->nPage); readFreelist(pMain); } } if( p->flags&SQLITE_OPEN_MAIN_DB && p->pWritable ){ u32 pgno; assert( iAmt==p->nPagesize ); pgno = iOfst/p->nPagesize + 1; assert( pgno>p->nPage || sqlite3BitvecTest(p->pWritable, pgno) ); } return sqlite3OsWrite(p->pReal, zBuf, iAmt, iOfst); } /* ** Truncate an jt-file. */ static int jtTruncate(sqlite3_file *pFile, sqlite_int64 size){ jt_file *p = (jt_file *)pFile; if( p->flags&SQLITE_OPEN_MAIN_JOURNAL && size==0 ){ /* Truncating a journal file. This is the end of a transaction. */ jt_file *pMain = locateDatabaseHandle(p->zName); sqlite3BitvecDestroy(pMain->pWritable); pMain->pWritable = 0; } return sqlite3OsTruncate(p->pReal, size); } /* ** The first argument to this function is a handle open on a journal file. ** This function reads the journal file and adds the page number for each ** page in the journal to the Bitvec object passed as the second argument. */ static void readJournalFile(jt_file *p, jt_file *pMain){ unsigned char zBuf[28]; sqlite3_file *pReal = p->pReal; sqlite3_int64 iOff = 0; sqlite3_int64 iSize = 0; sqlite3OsFileSize(p->pReal, &iSize); while( iOff<iSize ){ u32 nRec, nPage, nSector, nPagesize; u32 ii; sqlite3OsRead(pReal, zBuf, 28, iOff); if( decodeJournalHdr(zBuf, &nRec, &nPage, &nSector, &nPagesize) ){ return; } iOff += nSector; for(ii=0; ii<nRec && iOff<iSize; ii++){ u32 pgno; sqlite3OsRead(pReal, zBuf, 4, iOff); pgno = decodeUint32(zBuf); iOff += (8 + pMain->nPagesize); sqlite3BitvecSet(pMain->pWritable, pgno); } iOff = ((iOff + (nSector-1)) / nSector) * nSector; } } /* ** Sync an jt-file. */ static int jtSync(sqlite3_file *pFile, int flags){ jt_file *p = (jt_file *)pFile; if( p->flags&SQLITE_OPEN_MAIN_JOURNAL ){ jt_file *pMain; /* The associated database file */ /* The journal file is being synced. At this point, we inspect the ** contents of the file up to this point and set each bit in the ** jt_file.pWritable bitvec of the main database file associated with ** this journal file. */ pMain = locateDatabaseHandle(p->zName); assert(pMain); assert(pMain->pWritable); /* Set the bitvec values */ readJournalFile(p, pMain); } return sqlite3OsSync(p->pReal, flags); } /* ** Return the current file-size of an jt-file. */ static int jtFileSize(sqlite3_file *pFile, sqlite_int64 *pSize){ jt_file *p = (jt_file *)pFile; return sqlite3OsFileSize(p->pReal, pSize); } /* ** Lock an jt-file. */ static int jtLock(sqlite3_file *pFile, int eLock){ int rc; jt_file *p = (jt_file *)pFile; rc = sqlite3OsLock(p->pReal, eLock); if( rc==SQLITE_OK && eLock>p->eLock ){ p->eLock = eLock; } return rc; } /* ** Unlock an jt-file. */ static int jtUnlock(sqlite3_file *pFile, int eLock){ int rc; jt_file *p = (jt_file *)pFile; rc = sqlite3OsUnlock(p->pReal, eLock); if( rc==SQLITE_OK && eLock<p->eLock ){ p->eLock = eLock; } return rc; } /* ** Check if another file-handle holds a RESERVED lock on an jt-file. */ static int jtCheckReservedLock(sqlite3_file *pFile, int *pResOut){ jt_file *p = (jt_file *)pFile; return sqlite3OsCheckReservedLock(p->pReal, pResOut); } /* ** File control method. For custom operations on an jt-file. */ static int jtFileControl(sqlite3_file *pFile, int op, void *pArg){ jt_file *p = (jt_file *)pFile; return sqlite3OsFileControl(p->pReal, op, pArg); } /* ** Return the sector-size in bytes for an jt-file. */ static int jtSectorSize(sqlite3_file *pFile){ jt_file *p = (jt_file *)pFile; return sqlite3OsSectorSize(p->pReal); } /* ** Return the device characteristic flags supported by an jt-file. */ static int jtDeviceCharacteristics(sqlite3_file *pFile){ jt_file *p = (jt_file *)pFile; return sqlite3OsDeviceCharacteristics(p->pReal); } /* ** Open an jt file handle. */ static int jtOpen( sqlite3_vfs *pVfs, const char *zName, sqlite3_file *pFile, int flags, int *pOutFlags ){ int rc; jt_file *p = (jt_file *)pFile; p->pReal = (sqlite3_file *)&p[1]; rc = sqlite3OsOpen(g.pVfs, zName, p->pReal, flags, pOutFlags); if( p->pReal->pMethods ){ pFile->pMethods = &jt_io_methods; p->eLock = 0; p->zName = zName; p->flags = flags; p->pNext = 0; if( zName ){ p->pNext = g.pList; g.pList = p; } } return rc; } /* ** Delete the file located at zPath. If the dirSync argument is true, ** ensure the file-system modifications are synced to disk before ** returning. */ static int jtDelete(sqlite3_vfs *pVfs, const char *zPath, int dirSync){ int nPath = strlen(zPath); if( nPath>8 && 0==strcmp("-journal", &zPath[nPath-8]) ){ /* Deleting a journal file. The end of a transaction. */ jt_file *pMain = locateDatabaseHandle(zPath); sqlite3BitvecDestroy(pMain->pWritable); pMain->pWritable = 0; } return sqlite3OsDelete(g.pVfs, zPath, dirSync); } /* ** Test for access permissions. Return true if the requested permission ** is available, or false otherwise. */ static int jtAccess( sqlite3_vfs *pVfs, const char *zPath, int flags, int *pResOut ){ return sqlite3OsAccess(g.pVfs, zPath, flags, pResOut); } /* ** Populate buffer zOut with the full canonical pathname corresponding ** to the pathname in zPath. zOut is guaranteed to point to a buffer ** of at least (JT_MAX_PATHNAME+1) bytes. */ static int jtFullPathname( sqlite3_vfs *pVfs, const char *zPath, int nOut, char *zOut ){ return sqlite3OsFullPathname(g.pVfs, zPath, nOut, zOut); } #ifndef SQLITE_OMIT_LOAD_EXTENSION /* ** Open the dynamic library located at zPath and return a handle. */ static void *jtDlOpen(sqlite3_vfs *pVfs, const char *zPath){ return sqlite3OsDlOpen(g.pVfs, zPath); } /* ** Populate the buffer zErrMsg (size nByte bytes) with a human readable ** utf-8 string describing the most recent error encountered associated ** with dynamic libraries. */ static void jtDlError(sqlite3_vfs *pVfs, int nByte, char *zErrMsg){ sqlite3OsDlError(g.pVfs, nByte, zErrMsg); } /* ** Return a pointer to the symbol zSymbol in the dynamic library pHandle. */ static void (*jtDlSym(sqlite3_vfs *pVfs, void *p, const char *zSym))(void){ return sqlite3OsDlSym(g.pVfs, p, zSym); } /* ** Close the dynamic library handle pHandle. */ static void jtDlClose(sqlite3_vfs *pVfs, void *pHandle){ sqlite3OsDlClose(g.pVfs, pHandle); } #endif /* SQLITE_OMIT_LOAD_EXTENSION */ /* ** Populate the buffer pointed to by zBufOut with nByte bytes of ** random data. */ static int jtRandomness(sqlite3_vfs *pVfs, int nByte, char *zBufOut){ return sqlite3OsRandomness(g.pVfs, nByte, zBufOut); } /* ** Sleep for nMicro microseconds. Return the number of microseconds ** actually slept. */ static int jtSleep(sqlite3_vfs *pVfs, int nMicro){ return sqlite3OsSleep(g.pVfs, nMicro); } /* ** Return the current time as a Julian Day number in *pTimeOut. */ static int jtCurrentTime(sqlite3_vfs *pVfs, double *pTimeOut){ return sqlite3OsCurrentTime(g.pVfs, pTimeOut); } int jt_register(char *zWrap, int isDefault){ g.pVfs = sqlite3_vfs_find(zWrap); if( g.pVfs==0 ){ return SQLITE_ERROR; } jt_vfs.szOsFile += g.pVfs->szOsFile; sqlite3_vfs_register(&jt_vfs, isDefault); return SQLITE_OK; } void jt_unregister(){ sqlite3_vfs_unregister(&jt_vfs); } #endif |
Changes to test/savepoint2.test.
1 2 3 4 5 6 7 8 9 10 11 | # 2008 December 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. # #*********************************************************************** # | | > > > > | 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 | # 2008 December 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. # #*********************************************************************** # # $Id: savepoint2.test,v 1.3 2008/12/20 18:33:59 danielk1977 Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl # Tests in this file are quite similar to those run by trans.test and # avtrans.test. # db close register_jt_vfs -default "" sqlite3 db test.db -vfs jt proc signature {} { return [db eval {SELECT count(*), md5sum(x) FROM t3}] } do_test savepoint2-1 { execsql { PRAGMA cache_size=10; |
︙ | ︙ | |||
140 141 142 143 144 145 146 147 148 149 | sqlite3_get_autocommit db } {1} integrity_check savepoint2-$ii.6.1 } unset -nocomplain ::sig unset -nocomplain SQL finish_test | > > | 144 145 146 147 148 149 150 151 152 153 154 155 | sqlite3_get_autocommit db } {1} integrity_check savepoint2-$ii.6.1 } unset -nocomplain ::sig unset -nocomplain SQL unregister_jt_vfs finish_test |