database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-07 02:42:48 +03:00
Code Activity

A couple simple fixes to get wal.test mostly working.

Browse Source 
FossilOrigin-Name: c74458127468f30b16715594c8d68e9d3c05d292
This commit is contained in:
drh
2010-05-12 18:10:52 +00:00
parent d9e5c4f6ed
commit 686138fe88
3 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
manifest
View File

@@ -1,8 +1,8 @@
-----BEGIN PGP SIGNED MESSAGE----- -----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1 Hash: SHA1
C Refactoring\sthe\sVFS-SHM\smethods\sused\sby\sWAL.\s\sThis\sversion\scompiles\sand\nruns\snon-WAL\stest\scases\sbut\scrashes\sand\sburns\son\swal.test. C A\scouple\ssimple\sfixes\sto\sget\swal.test\smostly\sworking.
D 2010-05-12T18:01:40 D 2010-05-12T18:10:52
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -227,7 +227,7 @@ F src/vdbeblob.c 5327132a42a91e8b7acfb60b9d2c3b1c5c863e0e
F src/vdbemem.c 2a82f455f6ca6f78b59fb312f96054c04ae0ead1 F src/vdbemem.c 2a82f455f6ca6f78b59fb312f96054c04ae0ead1
F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2 F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
F src/vtab.c a0f8a40274e4261696ef57aa806de2776ab72cda F src/vtab.c a0f8a40274e4261696ef57aa806de2776ab72cda
F src/wal.c 5f52f5ea690e1d542e094ca8c83bea43c2f7ad96 F src/wal.c c66ba0b722297df063fe84edb4193ef2b05d20d0
F src/wal.h 434f76f51225bb614e43ccb6bd2341541ba6a06e F src/wal.h 434f76f51225bb614e43ccb6bd2341541ba6a06e
F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
F src/where.c 75fee9e255b62f773fcadd1d1f25b6f63ac7a356 F src/where.c 75fee9e255b62f773fcadd1d1f25b6f63ac7a356
@@ -817,18 +817,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
P 7838163d087780a6fb403a17641b96f71baec088 P 2b00152c1ac0b3735aa6cfab61259ff04d81c701
R 6b207856113b77baacd412d73fab162a R b7946fb277db4dbc4bc013e5e5fa093c
T *bgcolor * #c0ffc0
T *branch * wal-refactor
T *sym-wal-refactor *
T -sym-trunk *
U drh U drh
Z 917cc375618b87c5f919c29d2da7a2ff Z 62e42baf1876f9498d88e14692278875
-----BEGIN PGP SIGNATURE----- -----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux) Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFL6u0HoxKgR168RlERAnOPAJ9UCbogkeIyu/LrQqmeBg4rRTUaswCdFBEg iD8DBQFL6u8uoxKgR168RlERAoSbAJ9jNFTVpnB+tvn+mLuDe10PoEq3+ACeI55J
ymzYvEeQKLujVf/zBF2BuxA= 3VWwGaEkCHFZz1L5A8JAA68=
=vRvp =qjYf
-----END PGP SIGNATURE----- -----END PGP SIGNATURE-----

2
manifest.uuid
View File

@@ -1 +1 @@
2b00152c1ac0b3735aa6cfab61259ff04d81c701 c74458127468f30b16715594c8d68e9d3c05d292

4
src/wal.c
View File

@@ -224,7 +224,7 @@ static int walSetLock(Wal *pWal, int desiredStatus){
pWal->lockState = desiredStatus; pWal->lockState = desiredStatus;
}else{ }else{
int got = pWal->lockState; int got = pWal->lockState;
rc = sqlite3OsShmLock(pWal->pWalFd, desiredStatus, &got); rc = sqlite3OsShmLock(pWal->pDbFd, desiredStatus, &got);
pWal->lockState = got; pWal->lockState = got;
if( got==SQLITE_SHM_READ_FULL || got==SQLITE_SHM_READ ){ if( got==SQLITE_SHM_READ_FULL || got==SQLITE_SHM_READ ){
pWal->readerType = got; pWal->readerType = got;
@@ -690,7 +690,7 @@ int sqlite3WalOpen(
/* Allocate an instance of struct Wal to return. */ /* Allocate an instance of struct Wal to return. */
*ppWal = 0; *ppWal = 0;
nWal = sqlite3Strlen30(zWal) + 5; nWal = sqlite3Strlen30(zDbName) + 5;
pRet = (Wal*)sqlite3MallocZero(sizeof(Wal) + pVfs->szOsFile + nWal); pRet = (Wal*)sqlite3MallocZero(sizeof(Wal) + pVfs->szOsFile + nWal);
if( !pRet ){ if( !pRet ){
return SQLITE_NOMEM; return SQLITE_NOMEM;