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

Adjustments to the codec in the pager. (CVS 1222)

Browse Source 
FossilOrigin-Name: be5122e99caacbeb5e568a2782fe2faf634ad355
This commit is contained in:
drh
2004-02-10 23:51:05 +00:00
parent fb044c1d1c
commit d86a39c866
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Perform\supdates\sin\ssearch\sorder.\s\sTicket\s#602.\s(CVS\s1221) C Adjustments\sto\sthe\scodec\sin\sthe\spager.\s(CVS\s1222)
D 2004-02-10T13:41:52 D 2004-02-10T23:51:06
F Makefile.in cfd75c46b335881999333a9e4b982fa8491f200b F Makefile.in cfd75c46b335881999333a9e4b982fa8491f200b
F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -40,7 +40,7 @@ F src/main.c 6ec57b0f146572033c70493417d251365a7b4fbe
F src/md5.c fe4f9c9c6f71dfc26af8da63e4d04489b1430565 F src/md5.c fe4f9c9c6f71dfc26af8da63e4d04489b1430565
F src/os.c 681ec36217bc7c795d55d9a63ff79a8614ddee8c F src/os.c 681ec36217bc7c795d55d9a63ff79a8614ddee8c
F src/os.h 8d02b622153d2df442da1ec37cdd6b1bd9804a25 F src/os.h 8d02b622153d2df442da1ec37cdd6b1bd9804a25
F src/pager.c cde4fd5a47b5109a26d44ac9daac94c0ea8e100d F src/pager.c 3678afeb3f8ff4af3e4538e4a586b01198458046
F src/pager.h b618354fa6270a87e0105be8aeaa0a0c7c545ee2 F src/pager.h b618354fa6270a87e0105be8aeaa0a0c7c545ee2
F src/parse.y 7a121554c0c0c0150a77ab05417b01fa44813ac4 F src/parse.y 7a121554c0c0c0150a77ab05417b01fa44813ac4
F src/pragma.c 89d62c31c6f0a43376fe8d20549b87a6d30c467a F src/pragma.c 89d62c31c6f0a43376fe8d20549b87a6d30c467a
@@ -183,7 +183,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
P d0624d257789ac3f4cd3a7473bb741030c999b65 P cf1cec74ae039cd7cbc8a1032d29f067dedb4210
R ebe97ced16ef0c70fcbd5351d23e8ea5 R 33a0bad7d3175733647a431c861739f1
U drh U drh
Z c5b53421362378360594d03b5da09dfe Z 19f14306e79d3dfba9d27638424ae996

2
manifest.uuid
View File

@@ -1 +1 @@
cf1cec74ae039cd7cbc8a1032d29f067dedb4210 be5122e99caacbeb5e568a2782fe2faf634ad355

12
src/pager.c
View File

@@ -18,7 +18,7 @@
** file simultaneously, or one process from reading the database while ** file simultaneously, or one process from reading the database while
** another is writing. ** another is writing.
** **
** @(#) $Id: pager.c,v 1.97 2004/02/10 01:54:28 drh Exp $ ** @(#) $Id: pager.c,v 1.98 2004/02/10 23:51:06 drh Exp $
*/ */
#include "os.h" /* Must be first to enable large file support */ #include "os.h" /* Must be first to enable large file support */
#include "sqliteInt.h" #include "sqliteInt.h"
@@ -563,7 +563,7 @@ static int pager_playback_one_page(Pager *pPager, OsFile *jfd, int format){
pPg->dirty = 0; pPg->dirty = 0;
pPg->needSync = 0; pPg->needSync = 0;
if( pPager->xCodec ){ if( pPager->xCodec ){
pPager->xCodec(pPager->pCodecArg, PGHDR_TO_DATA(pPg), 2); pPager->xCodec(pPager->pCodecArg, PGHDR_TO_DATA(pPg), 3);
} }
} }
return rc; return rc;
@@ -726,7 +726,7 @@ static int pager_playback(Pager *pPager, int useJournalSize){
rc = sqliteOsRead(&pPager->fd, zBuf, SQLITE_PAGE_SIZE); rc = sqliteOsRead(&pPager->fd, zBuf, SQLITE_PAGE_SIZE);
if( rc ) break; if( rc ) break;
if( pPager->xCodec ){ if( pPager->xCodec ){
pPager->xCodec(pPager->pCodecArg, zBuf, 0); pPager->xCodec(pPager->pCodecArg, zBuf, 2);
} }
}else{ }else{
memset(zBuf, 0, SQLITE_PAGE_SIZE); memset(zBuf, 0, SQLITE_PAGE_SIZE);
@@ -1248,7 +1248,7 @@ static int pager_write_pagelist(PgHdr *pList){
assert( pList->dirty ); assert( pList->dirty );
sqliteOsSeek(&pPager->fd, (pList->pgno-1)*(off_t)SQLITE_PAGE_SIZE); sqliteOsSeek(&pPager->fd, (pList->pgno-1)*(off_t)SQLITE_PAGE_SIZE);
if( pPager->xCodec ){ if( pPager->xCodec ){
pPager->xCodec(pPager->pCodecArg, PGHDR_TO_DATA(pList), 1); pPager->xCodec(pPager->pCodecArg, PGHDR_TO_DATA(pList), 6);
} }
rc = sqliteOsWrite(&pPager->fd, PGHDR_TO_DATA(pList), SQLITE_PAGE_SIZE); rc = sqliteOsWrite(&pPager->fd, PGHDR_TO_DATA(pList), SQLITE_PAGE_SIZE);
if( pPager->xCodec ){ if( pPager->xCodec ){
@@ -1524,7 +1524,7 @@ int sqlitepager_get(Pager *pPager, Pgno pgno, void **ppPage){
memset(PGHDR_TO_DATA(pPg), 0, SQLITE_PAGE_SIZE); memset(PGHDR_TO_DATA(pPg), 0, SQLITE_PAGE_SIZE);
} }
}else if( pPager->xCodec ){ }else if( pPager->xCodec ){
pPager->xCodec(pPager->pCodecArg, PGHDR_TO_DATA(pPg), 0); pPager->xCodec(pPager->pCodecArg, PGHDR_TO_DATA(pPg), 3);
} }
} }
}else{ }else{
@@ -1808,7 +1808,7 @@ int sqlitepager_write(void *pData){
} }
rc = sqliteOsWrite(&pPager->jfd, &((char*)pData)[-4], szPg); rc = sqliteOsWrite(&pPager->jfd, &((char*)pData)[-4], szPg);
if( pPager->xCodec ){ if( pPager->xCodec ){
pPager->xCodec(pPager->pCodecArg, pData, 2); pPager->xCodec(pPager->pCodecArg, pData, 0);
} }
if( journal_format>=JOURNAL_FORMAT_3 ){ if( journal_format>=JOURNAL_FORMAT_3 ){
*(u32*)PGHDR_TO_EXTRA(pPg) = saved; *(u32*)PGHDR_TO_EXTRA(pPg) = saved;