diff --git a/manifest b/manifest index 29660ee501..dba6635dd7 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fixes\sto\sthe\sfile\slocking.\s\s109\stests\sare\snow\sfailing.\s(CVS\s1548) -D 2004-06-09T17:37:23 +C Remove\slegacy\sjournal\sformats.\s(CVS\s1549) +D 2004-06-09T19:03:55 F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd @@ -47,7 +47,7 @@ F src/os_unix.c 1d6f3d1a87d4aa0e4490bcc47b3f0ff9b2e37e7a F src/os_unix.h 1cd6133cf66dea704b8646b70b2dfdcbdd9b3738 F src/os_win.c 6b8f9fcc683bb888e07fc485372803baa68faadb F src/os_win.h 004eec47b1780fcaf07420ddc2072294b698d48c -F src/pager.c ee2e2fa71584ce402e0266b342f96efbf74cb45f +F src/pager.c 5c37b973e827d7a9a45070498356e67ee720f960 F src/pager.h ca8f293e1d623a7c628a1c5e0c6cf43d5bbb80bf F src/parse.y 097438674976355a10cf177bd97326c548820b86 F src/pragma.c 3251628662963f30a95133b19d59e4bc08226c76 @@ -60,7 +60,7 @@ F src/sqliteInt.h c0a328c7567cdeebe14d7a4668f22946e281ebc9 F src/table.c af14284fa36c8d41f6829e3f2819dce07d3e2de2 F src/tclsqlite.c f5c5116720baefb7de5d6acf18baedf1e42756cc F src/test1.c f78d6ac0675bc5db48dac9c5379c965bdadb9113 -F src/test2.c ae18537d8a85e5028c955837797f9da461b908b8 +F src/test2.c 05f810c90cf6262d5f352860e87d41a3f34207f9 F src/test3.c beafd0ccf7b9ae784744be1b1e66ffe8f64c25da F src/test4.c a921a69821fd30209589228e64f94e9f715b6fe2 F src/test5.c 862784cd7a68e7d36f00287aac6e413ca996eaf8 @@ -122,7 +122,7 @@ F test/limit.test 60d7f856ee7846f7130dee67f10f0e726cd70b5d F test/lock.test 3dfd0f4f981f759ae1c07c19443e424dc9fdb133 F test/main.test 6a851b5992c4881a725a3d9647e629199df8de9d F test/malloc.test 4e19b96d9cd7d61f4826e6fce03849ad5ad526dd -F test/memdb.test 6ece25c7c0e6500199d3662607a3edca081abb2a +F test/memdb.test befe8f26d430d07ba65692243a893a0e82a0b866 F test/memleak.test 4d5d374c8ea1fc5ac634aed58cac1047848ce65e F test/minmax.test 9dcf52f713b1b9e61d0a88a51eb8bb2e3c52d0ab F test/misc1.test 06e92b613615d38919bf6fea85536bc685a3da4b @@ -155,7 +155,7 @@ F test/tester.tcl fc10520db0d3ce4ef6a8b5ab91bd102fc3f4280a F test/thread1.test 2fd5c10e82434f6b03be77b61fde5a050668abf2 F test/threadtest1.c f7f896e62ed46feae1dc411114a48c15a0f82ee2 F test/threadtest2.c d94ca4114fd1504f7e0ae724bcd83d4b40931d86 -F test/trans.test 45fa0ed87ee487797ea6a30f3ec298a6618531b9 +F test/trans.test eae47c3a25b7f6c45296b1e472a4f8e3b3d91cdf F test/trigger1.test 99b7cd9a568ac60aa04bbc3b9db9575ffa97709a F test/trigger2.test 0767ab30cb5a2c8402c8524f3d566b410b6f5263 F test/trigger3.test a95ccace88291449f5eae7139ec438a42f90654d @@ -218,7 +218,7 @@ F www/support.tcl 1801397edd271cc39a2aadd54e701184b5181248 F www/tclsqlite.tcl 19191cf2a1010eaeff74c51d83fd5f5a4d899075 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4 -P 0ecbba78fcde8f7715cd74c674b5040ef4953f6e -R 81671c9563d17cd7ee532f949a6e58e5 +P dc0763455bbf54c1d8728e16033709caedd6e1c6 +R b4b9380769fdca06ed613331f57399e7 U drh -Z 32ba6607d3f053fb955e6ec92a8309ce +Z 21a5c28788a000b1f8a2eec2e4e3d0e6 diff --git a/manifest.uuid b/manifest.uuid index c586cfabc3..948d08cb7b 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -dc0763455bbf54c1d8728e16033709caedd6e1c6 \ No newline at end of file +a12bef4a0877fb1dca531509a1186e092727b6d8 \ No newline at end of file diff --git a/src/pager.c b/src/pager.c index 4dabfca291..50eedd80ae 100644 --- a/src/pager.c +++ b/src/pager.c @@ -18,7 +18,7 @@ ** file simultaneously, or one process from reading the database while ** another is writing. ** -** @(#) $Id: pager.c,v 1.115 2004/06/09 17:37:28 drh Exp $ +** @(#) $Id: pager.c,v 1.116 2004/06/09 19:03:55 drh Exp $ */ #include "os.h" /* Must be first to enable large file support */ #include "sqliteInt.h" @@ -233,39 +233,19 @@ struct Pager { #define PAGER_ERR_CORRUPT 0x08 /* database or journal corruption */ #define PAGER_ERR_DISK 0x10 /* general disk I/O error - bad hard drive? */ -/* -** The journal file contains page records in the following -** format. -** -** Actually, this structure is the complete page record for pager -** formats less than 3. Beginning with format 3, this record is surrounded -** by two checksums. -*/ -typedef struct PageRecord PageRecord; -struct PageRecord { - Pgno pgno; /* The page number */ - char aData[SQLITE_PAGE_SIZE]; /* Original data for page pgno */ -}; - /* ** Journal files begin with the following magic string. The data ** was obtained from /dev/random. It is used only as a sanity check. ** -** There are three journal formats (so far). The 1st journal format writes -** 32-bit integers in the byte-order of the host machine. New -** formats writes integers as big-endian. All new journals use the -** new format, but we have to be able to read an older journal in order -** to rollback journals created by older versions of the library. -** -** The 3rd journal format (added for 2.8.0) adds additional sanity -** checking information to the journal. If the power fails while the -** journal is being written, semi-random garbage data might appear in -** the journal file after power is restored. If an attempt is then made +** Since version 2.8.0, the journal format contains additional sanity +** checking information. If the power fails while the journal is begin +** written, semi-random garbage data might appear in the journal +** file after power is restored. If an attempt is then made ** to roll the journal back, the database could be corrupted. The additional ** sanity checking data is an attempt to discover the garbage in the ** journal and ignore it. ** -** The sanity checking information for the 3rd journal format consists +** The sanity checking information for the new journal format consists ** of a 32-bit checksum on each page of data. The checksum covers both ** the page number and the SQLITE_PAGE_SIZE bytes of data for the page. ** This cksum is initialized to a 32-bit random value that appears in the @@ -276,49 +256,17 @@ struct PageRecord { ** be correct. But by initializing the checksum to random value which ** is different for every journal, we minimize that risk. */ -static const unsigned char aJournalMagic1[] = { - 0xd9, 0xd5, 0x05, 0xf9, 0x20, 0xa1, 0x63, 0xd4, +static const unsigned char aJournalMagic[] = { + 0xd9, 0xd5, 0x05, 0xf9, 0x20, 0xa1, 0x63, 0xd7, }; -static const unsigned char aJournalMagic2[] = { - 0xd9, 0xd5, 0x05, 0xf9, 0x20, 0xa1, 0x63, 0xd5, -}; -static const unsigned char aJournalMagic3[] = { - 0xd9, 0xd5, 0x05, 0xf9, 0x20, 0xa1, 0x63, 0xd6, -}; -#define JOURNAL_FORMAT_1 1 -#define JOURNAL_FORMAT_2 2 -#define JOURNAL_FORMAT_3 3 - -/* -** The following integer determines what format to use when creating -** new primary journal files. By default we always use format 3. -** When testing, we can set this value to older journal formats in order to -** make sure that newer versions of the library are able to rollback older -** journal files. -** -** Note that statement journals always use format 2 and omit the header. -*/ -#ifdef SQLITE_TEST -int journal_format = 3; -#else -# define journal_format 3 -#endif /* ** The size of the header and of each page in the journal varies according ** to which journal format is being used. The following macros figure out ** the sizes based on format numbers. */ -/* -#define JOURNAL_HDR_SZ(X) \ - (sizeof(aJournalMagic1) + sizeof(Pgno) + ((X)>=3)*2*sizeof(u32)) -*/ -#define JOURNAL_HDR_SZ(pPager, X) (\ - sizeof(aJournalMagic1) + \ - sizeof(Pgno) + \ - ((X)>=3?3*sizeof(u32)+(pPager)->nMaster:0) ) -#define JOURNAL_PG_SZ(X) \ - (SQLITE_PAGE_SIZE + sizeof(Pgno) + ((X)>=3)*sizeof(u32)) +#define JOURNAL_HDR_SZ(pPager) (24 + (pPager)->nMaster) +#define JOURNAL_PG_SZ(pPager) ((pPager->pageSize) + 8) /* @@ -344,16 +292,12 @@ int journal_format = 3; ** Read a 32-bit integer from the given file descriptor. Store the integer ** that is read in *pRes. Return SQLITE_OK if everything worked, or an ** error code is something goes wrong. -** -** If the journal format is 2 or 3, read a big-endian integer. If the -** journal format is 1, read an integer in the native byte-order of the -** host machine. */ -static int read32bits(int format, OsFile *fd, u32 *pRes){ +static int read32bits(OsFile *fd, u32 *pRes){ u32 res; int rc; rc = sqlite3OsRead(fd, &res, sizeof(res)); - if( rc==SQLITE_OK && format>JOURNAL_FORMAT_1 ){ + if( rc==SQLITE_OK ){ unsigned char ac[4]; memcpy(ac, &res, 4); res = (ac[0]<<24) | (ac[1]<<16) | (ac[2]<<8) | ac[3]; @@ -365,17 +309,9 @@ static int read32bits(int format, OsFile *fd, u32 *pRes){ /* ** Write a 32-bit integer into the given file descriptor. Return SQLITE_OK ** on success or an error code is something goes wrong. -** -** If the journal format is 2 or 3, write the integer as 4 big-endian -** bytes. If the journal format is 1, write the integer in the native -** byte order. In normal operation, only formats 2 and 3 are used. -** Journal format 1 is only used for testing. */ static int write32bits(OsFile *fd, u32 val){ unsigned char ac[4]; - if( journal_format<=1 ){ - return sqlite3OsWrite(fd, &val, 4); - } ac[0] = (val>>24) & 0xff; ac[1] = (val>>16) & 0xff; ac[2] = (val>>8) & 0xff; @@ -386,21 +322,14 @@ static int write32bits(OsFile *fd, u32 val){ /* ** Write a 32-bit integer into a page header right before the ** page data. This will overwrite the PgHdr.pDirty pointer. -** -** The integer is big-endian for formats 2 and 3 and native byte order -** for journal format 1. */ static void store32bits(u32 val, PgHdr *p, int offset){ unsigned char *ac; ac = &((unsigned char*)PGHDR_TO_DATA(p))[offset]; - if( journal_format<=1 ){ - memcpy(ac, &val, 4); - }else{ - ac[0] = (val>>24) & 0xff; - ac[1] = (val>>16) & 0xff; - ac[2] = (val>>8) & 0xff; - ac[3] = val & 0xff; - } + ac[0] = (val>>24) & 0xff; + ac[1] = (val>>16) & 0xff; + ac[2] = (val>>8) & 0xff; + ac[3] = val & 0xff; } @@ -552,18 +481,21 @@ static u32 pager_cksum(Pager *pPager, Pgno pgno, const char *aData){ ** Read a single page from the journal file opened on file descriptor ** jfd. Playback this one page. ** +** +** ** There are three different journal formats. The format parameter determines ** which format is used by the journal that is played back. */ -static int pager_playback_one_page(Pager *pPager, OsFile *jfd, int format){ +static int pager_playback_one_page(Pager *pPager, OsFile *jfd, int useCksum){ int rc; - PgHdr *pPg; /* An existing page in the cache */ - PageRecord pgRec; - u32 cksum; + PgHdr *pPg; /* An existing page in the cache */ + Pgno pgno; /* The page number of a page in journal */ + u32 cksum; /* Checksum used for sanity checking */ + u8 aData[SQLITE_PAGE_SIZE]; /* Store data here */ - rc = read32bits(format, jfd, &pgRec.pgno); + rc = read32bits(jfd, &pgno); if( rc!=SQLITE_OK ) return rc; - rc = sqlite3OsRead(jfd, &pgRec.aData, sizeof(pgRec.aData)); + rc = sqlite3OsRead(jfd, &aData, pPager->pageSize); if( rc!=SQLITE_OK ) return rc; /* Sanity checking on the page. This is more important that I originally @@ -571,16 +503,16 @@ static int pager_playback_one_page(Pager *pPager, OsFile *jfd, int format){ ** it could cause invalid data to be written into the journal. We need to ** detect this invalid data (with high probability) and ignore it. */ - if( pgRec.pgno==0 ){ + if( pgno==0 ){ return SQLITE_DONE; } - if( pgRec.pgno>(unsigned)pPager->dbSize ){ + if( pgno>(unsigned)pPager->dbSize ){ return SQLITE_OK; } - if( format>=JOURNAL_FORMAT_3 ){ - rc = read32bits(format, jfd, &cksum); + if( useCksum ){ + rc = read32bits(jfd, &cksum); if( rc ) return rc; - if( pager_cksum(pPager, pgRec.pgno, pgRec.aData)!=cksum ){ + if( pager_cksum(pPager, pgno, aData)!=cksum ){ return SQLITE_DONE; } } @@ -588,10 +520,10 @@ static int pager_playback_one_page(Pager *pPager, OsFile *jfd, int format){ /* Playback the page. Update the in-memory copy of the page ** at the same time, if there is one. */ - pPg = pager_lookup(pPager, pgRec.pgno); - TRACE2("PLAYBACK page %d\n", pgRec.pgno); - sqlite3OsSeek(&pPager->fd, (pgRec.pgno-1)*(off_t)SQLITE_PAGE_SIZE); - rc = sqlite3OsWrite(&pPager->fd, pgRec.aData, SQLITE_PAGE_SIZE); + pPg = pager_lookup(pPager, pgno); + TRACE2("PLAYBACK page %d\n", pgno); + sqlite3OsSeek(&pPager->fd, (pgno-1)*(off_t)SQLITE_PAGE_SIZE); + rc = sqlite3OsWrite(&pPager->fd, aData, SQLITE_PAGE_SIZE); if( pPg ){ /* No page should ever be rolled back that is in use, except for page ** 1 which is held in use in order to keep the lock on the database @@ -600,7 +532,7 @@ static int pager_playback_one_page(Pager *pPager, OsFile *jfd, int format){ void *pData; assert( pPg->nRef==0 || pPg->pgno==1 ); pData = PGHDR_TO_DATA(pPg); - memcpy(pData, pgRec.aData, pPager->pageSize); + memcpy(pData, aData, pPager->pageSize); if( pPager->xDestructor ){ pPager->xDestructor(pData, pPager->pageSize); } @@ -668,7 +600,7 @@ static int pager_delmaster(const char *zMaster){ goto delmaster_out; } - /* Check if the file is big enough to be a format 3 journal file + /* Check if the file is big enough to be a journal file ** with the required master journal name. If not, ignore it. */ rc = sqlite3OsFileSize(&journal, &jsz); @@ -676,7 +608,7 @@ static int pager_delmaster(const char *zMaster){ sqlite3OsClose(&journal); goto delmaster_out; } - if( jsz<(sizeof(aJournalMagic3)+4*sizeof(u32)+strlen(zMaster)+1) ){ + if( jsz<(25+strlen(zMaster)) ){ sqlite3OsClose(&journal); continue; } @@ -685,11 +617,11 @@ static int pager_delmaster(const char *zMaster){ ** is stored. Read the master journal name into memory obtained ** from malloc. */ - rc = sqlite3OsSeek(&journal, sizeof(aJournalMagic3)+2*sizeof(u32)); + rc = sqlite3OsSeek(&journal, 20); if( rc!=SQLITE_OK ) goto delmaster_out; - rc = read32bits(3, &journal, (u32 *)&nMaster); + rc = read32bits(&journal, (u32*)&nMaster); if( rc!=SQLITE_OK ) goto delmaster_out; - if( nMaster>0 && nMaster==strlen(zMaster)+1 ){ + if( nMaster>0 && nMaster>=strlen(zMaster)+1 ){ char *zMasterPtr = (char *)sqliteMalloc(nMaster); if( !zMasterPtr ){ rc = SQLITE_NOMEM; @@ -767,25 +699,28 @@ static int pager_reload_cache(Pager *pPager){ ** ** The journal file format is as follows: ** -** * 8 byte prefix. One of the aJournalMagic123 vectors defined -** above. The format of the journal file is determined by which -** of the three prefix vectors is seen. -** * 4 byte big-endian integer which is the number of valid page records +** (1) 8 byte prefix. A copy of aJournalMagic[]. +** (2) 4 byte big-endian integer which is the number of valid page records ** in the journal. If this value is 0xffffffff, then compute the -** number of page records from the journal size. This field appears -** in format 3 only. -** * 4 byte big-endian integer which is the initial value for the -** sanity checksum. This field appears in format 3 only. -** * 4 byte integer which is the number of pages to truncate the +** number of page records from the journal size. +** (3) 4 byte big-endian integer which is the initial value for the +** sanity checksum. +** (4) 4 byte integer which is the number of pages to truncate the ** database to during a rollback. -** * Zero or more pages instances, each as follows: +** (5) 4 byte integer which is the number of bytes in the master journal +** name. The value may be zero (indicate that there is no master +** journal.) +** (6) N bytes of the master journal name. The name will be nul-terminated +** and might be shorter than the value read from (5). If the first byte +** of the name is \000 then there is no master journal. The master +** journal name is stored in UTF-8. +** (7) Zero or more pages instances, each as follows: ** + 4 byte page number. -** + SQLITE_PAGE_SIZE bytes of data. -** + 4 byte checksum (format 3 only) +** + pPager->pageSize bytes of data. +** + 4 byte checksum ** -** When we speak of the journal header, we mean the first 4 bullets above. -** Each entry in the journal is an instance of the 5th bullet. Note that -** bullets 2 and 3 only appear in format-3 journals. +** When we speak of the journal header, we mean the first 6 items above. +** Each entry in the journal is an instance of the 7th item. ** ** Call the value from the second bullet "nRec". nRec is the number of ** valid page entries in the journal. In most cases, you can compute the @@ -802,11 +737,6 @@ static int pager_reload_cache(Pager *pPager){ ** in this case. But for things like temporary table (which will be ** deleted when the power is restored) we don't care. ** -** Journal formats 1 and 2 do not have an nRec value in the header so we -** have to compute nRec from the file size. This has risks (as described -** above) which is why all persistent tables have been changed to use -** format 3. -** ** If the file opened as the journal file is not a well-formed ** journal file then the database will likely already be ** corrupted, so the PAGER_ERR_CORRUPT bit is set in pPager->errMask @@ -818,9 +748,9 @@ static int pager_playback(Pager *pPager, int useJournalSize){ int nRec; /* Number of Records in the journal */ int i; /* Loop counter */ Pgno mxPg = 0; /* Size of the original file in pages */ - int format; /* Format of the journal file. */ - unsigned char aMagic[sizeof(aJournalMagic1)]; - int rc; + unsigned char aMagic[8]; /* A buffer to hold the magic header */ + int rc; /* Result code of a subroutine */ + int nMaster; /* Number of bytes in the name of master journal */ char *zMaster = 0; /* Name of master journal file if any */ /* Figure out how many records are in the journal. Abort early if @@ -839,70 +769,53 @@ static int pager_playback(Pager *pPager, int useJournalSize){ ** the database file should have still been completely unchanged. ** Nothing needs to be rolled back. We can safely ignore this journal. */ - if( szJ < sizeof(aMagic)+sizeof(Pgno) ){ + if( szJ < 24 ){ goto end_playback; } - /* Read the beginning of the journal and truncate the - ** database file back to its original size. - */ + /* (1) Read the beginning of the journal and verify the magic string + ** at the beginning of the journal. */ rc = sqlite3OsRead(&pPager->jfd, aMagic, sizeof(aMagic)); + if( rc!=SQLITE_OK || memcmp(aMagic, aJournalMagic, sizeof(aMagic))!=0 ){ + rc = SQLITE_PROTOCOL; + goto end_playback; + } + + /* (2) Read the number of pages stored in the journal. */ + rc = read32bits(&pPager->jfd, (u32*)&nRec); + if( rc ) goto end_playback; + if( nRec==0xffffffff || useJournalSize ){ + nRec = (szJ - JOURNAL_HDR_SZ(pPager))/JOURNAL_PG_SZ(pPager); + } + + /* (3) Read the initial value for the sanity checksum */ + rc = read32bits(&pPager->jfd, &pPager->cksumInit); + if( rc ) goto end_playback; + + /* (4) Read the number of pages in the database file prior to the + ** start of the transaction */ + rc = read32bits(&pPager->jfd, &mxPg); if( rc!=SQLITE_OK ){ - rc = SQLITE_PROTOCOL; goto end_playback; } - if( memcmp(aMagic, aJournalMagic3, sizeof(aMagic))==0 ){ - format = JOURNAL_FORMAT_3; - }else if( memcmp(aMagic, aJournalMagic2, sizeof(aMagic))==0 ){ - format = JOURNAL_FORMAT_2; - }else if( memcmp(aMagic, aJournalMagic1, sizeof(aMagic))==0 ){ - format = JOURNAL_FORMAT_1; - }else{ - rc = SQLITE_PROTOCOL; - goto end_playback; - } - if( format>=JOURNAL_FORMAT_3 ){ - if( szJ < sizeof(aMagic) + 4*sizeof(u32) ){ - /* Ignore the journal if it is too small to contain a complete - ** header. We already did this test once above, but at the prior - ** test, we did not know the journal format and so we had to assume - ** the smallest possible header. Now we know the header is bigger - ** than the minimum so we test again. - */ + + /* (5) and (6): Check if a master journal file is specified. If one is + ** specified, only proceed with the playback if it still exists. */ + rc = read32bits(&pPager->jfd, &nMaster); + if( rc ) goto end_playback; + if( nMaster>0 ){ + zMaster = sqliteMalloc(nMaster); + if( !zMaster ){ + rc = SQLITE_NOMEM; goto end_playback; } - rc = read32bits(format, &pPager->jfd, (u32*)&nRec); - if( rc ) goto end_playback; - rc = read32bits(format, &pPager->jfd, &pPager->cksumInit); - if( rc ) goto end_playback; - if( nRec==0xffffffff || useJournalSize ){ - nRec = (szJ - JOURNAL_HDR_SZ(pPager, 3))/JOURNAL_PG_SZ(3); + rc = sqlite3OsRead(&pPager->jfd, zMaster, pPager->nMaster); + if( rc!=SQLITE_OK || (zMaster[0] && !sqlite3OsFileExists(zMaster)) ){ + goto end_playback; } + } - /* Check if a master journal file is specified. If one is specified, - ** only proceed with the playback if it still exists. - */ - rc = read32bits(format, &pPager->jfd, &pPager->nMaster); - if( rc ) goto end_playback; - if( pPager->nMaster>0 ){ - zMaster = sqliteMalloc(pPager->nMaster); - if( !zMaster ){ - rc = SQLITE_NOMEM; - goto end_playback; - } - rc = sqlite3OsRead(&pPager->jfd, zMaster, pPager->nMaster); - if( rc!=SQLITE_OK || (strlen(zMaster) && !sqlite3OsFileExists(zMaster)) ){ - goto end_playback; - } - } - }else{ - nRec = (szJ - JOURNAL_HDR_SZ(pPager, 2))/JOURNAL_PG_SZ(2); - assert( nRec*JOURNAL_PG_SZ(2)+JOURNAL_HDR_SZ(pPager, 2)==szJ ); - } - rc = read32bits(format, &pPager->jfd, &mxPg); - if( rc!=SQLITE_OK ){ - goto end_playback; - } + /* Truncate the database file back to it's original size */ assert( pPager->origDbSize==0 || pPager->origDbSize==mxPg ); rc = sqlite3OsTruncate(&pPager->fd, SQLITE_PAGE_SIZE*(off_t)mxPg); if( rc!=SQLITE_OK ){ @@ -913,7 +826,7 @@ static int pager_playback(Pager *pPager, int useJournalSize){ /* Copy original pages out of the journal and back into the database file. */ for(i=0; ijfd, format); + rc = pager_playback_one_page(pPager, &pPager->jfd, 1); if( rc!=SQLITE_OK ){ if( rc==SQLITE_DONE ){ rc = SQLITE_OK; @@ -987,12 +900,12 @@ static int pager_stmt_playback(Pager *pPager){ nRec = pPager->stmtNRec; /* Copy original pages out of the statement journal and back into the - ** database file. Note that the statement journal always uses format - ** 2 instead of format 3 since it does not need to be concerned with - ** power failures corrupting the journal and can thus omit the checksums. + ** database file. Note that the statement journal omits checksums from + ** each record since power-failure recovery is not important to statement + ** journals. */ for(i=nRec-1; i>=0; i--){ - rc = pager_playback_one_page(pPager, &pPager->stfd, 2); + rc = pager_playback_one_page(pPager, &pPager->stfd, 0); assert( rc!=SQLITE_DONE ); if( rc!=SQLITE_OK ) goto end_stmt_playback; } @@ -1008,9 +921,9 @@ static int pager_stmt_playback(Pager *pPager){ if( rc!=SQLITE_OK ){ goto end_stmt_playback; } - nRec = (szJ - pPager->stmtJSize)/JOURNAL_PG_SZ(journal_format); + nRec = (szJ - pPager->stmtJSize)/JOURNAL_PG_SZ(pPager); for(i=nRec-1; i>=0; i--){ - rc = pager_playback_one_page(pPager, &pPager->jfd, journal_format); + rc = pager_playback_one_page(pPager, &pPager->jfd, 1); if( rc!=SQLITE_OK ){ assert( rc!=SQLITE_DONE ); goto end_stmt_playback; @@ -1136,7 +1049,7 @@ int sqlite3pager_open( if( strcmp(zFilename,":memory:")==0 ){ memDb = 1; zFullPathname = sqliteMalloc(4); - if( zFullPathname ) strcpy(zFullPathname, "nil"); + if( zFullPathname ) strcpy(zFullPathname, ""); rc = SQLITE_OK; }else{ zFullPathname = sqlite3OsFullPathname(zFilename); @@ -1507,14 +1420,14 @@ static int syncJournal(Pager *pPager, const char *zMaster){ ** with the nRec computed from the size of the journal file. */ off_t hdrSz, pgSz, jSz; - hdrSz = JOURNAL_HDR_SZ(pPager, journal_format); - pgSz = JOURNAL_PG_SZ(journal_format); + hdrSz = JOURNAL_HDR_SZ(pPager); + pgSz = JOURNAL_PG_SZ(pPager); rc = sqlite3OsFileSize(&pPager->jfd, &jSz); if( rc!=0 ) return rc; assert( pPager->nRec*pgSz+hdrSz==jSz ); } #endif - if( journal_format>=3 ){ + { /* Write the nRec value into the journal file header */ off_t szJ; if( pPager->fullSync ){ @@ -1522,21 +1435,20 @@ static int syncJournal(Pager *pPager, const char *zMaster){ rc = sqlite3OsSync(&pPager->jfd); if( rc!=0 ) return rc; } - sqlite3OsSeek(&pPager->jfd, sizeof(aJournalMagic1)); + sqlite3OsSeek(&pPager->jfd, sizeof(aJournalMagic)); rc = write32bits(&pPager->jfd, pPager->nRec); if( rc ) return rc; /* Write the name of the master journal file if one is specified */ if( zMaster ){ assert( strlen(zMaster)nMaster ); - rc = sqlite3OsSeek(&pPager->jfd, sizeof(aJournalMagic3) + 3*4); + rc = sqlite3OsSeek(&pPager->jfd, 20); if( rc ) return rc; rc = sqlite3OsWrite(&pPager->jfd, zMaster, strlen(zMaster)+1); if( rc ) return rc; } - szJ = JOURNAL_HDR_SZ(pPager, journal_format) + - pPager->nRec*JOURNAL_PG_SZ(journal_format); + szJ = JOURNAL_HDR_SZ(pPager) + pPager->nRec*JOURNAL_PG_SZ(pPager); sqlite3OsSeek(&pPager->jfd, szJ); } TRACE2("SYNC journal of %d\n", pPager->fd.h); @@ -1998,48 +1910,32 @@ static int pager_open_journal(Pager *pPager){ return rc; } pPager->origDbSize = pPager->dbSize; - if( journal_format==JOURNAL_FORMAT_3 ){ - /* Create the header for a format 3 journal: - ** - 8 bytes: Magic identifying journal format 3. - ** - 4 bytes: Number of records in journal, or -1 no-sync mode is on. - ** - 4 bytes: Magic used for page checksums. - ** - 4 bytes: Number of bytes reserved for master journal ptr (nMaster) - ** - nMaster bytes: Space for a master journal pointer. - ** - 4 bytes: Initial database page count. - */ - rc = sqlite3OsWrite(&pPager->jfd, aJournalMagic3, sizeof(aJournalMagic3)); - if( rc==SQLITE_OK ){ - rc = write32bits(&pPager->jfd, pPager->noSync ? 0xffffffff : 0); - } - if( rc==SQLITE_OK ){ - sqlite3Randomness(sizeof(pPager->cksumInit), &pPager->cksumInit); - rc = write32bits(&pPager->jfd, pPager->cksumInit); - } - if( rc==SQLITE_OK ){ - rc = write32bits(&pPager->jfd, pPager->nMaster); - } - - /* Unless the size reserved for the master-journal pointer is 0, set - ** the first byte of the master journal pointer to 0x00. Either way, - ** this is interpreted as 'no master journal' in the event of a - ** rollback after a crash. - */ - if( rc==SQLITE_OK && pPager->nMaster>0 ){ - rc = sqlite3OsWrite(&pPager->jfd, "", 1); - } - if( rc==SQLITE_OK ){ - rc = sqlite3OsSeek(&pPager->jfd, - sizeof(aJournalMagic3) + 3*4 + pPager->nMaster); - } - }else if( journal_format==JOURNAL_FORMAT_2 ){ - rc = sqlite3OsWrite(&pPager->jfd, aJournalMagic2, sizeof(aJournalMagic2)); - }else{ - assert( journal_format==JOURNAL_FORMAT_1 ); - rc = sqlite3OsWrite(&pPager->jfd, aJournalMagic1, sizeof(aJournalMagic1)); + + /* Create the header for the journal: + ** - 8 bytes: Magic identifying journal format. + ** - 4 bytes: Number of records in journal, or -1 no-sync mode is on. + ** - 4 bytes: Magic used for page checksums. + ** - 4 bytes: Initial database page count. + ** - 4 bytes: Number of bytes reserved for master journal ptr (nMaster) + ** - nMaster bytes: Space for a master journal pointer. + */ + rc = sqlite3OsWrite(&pPager->jfd, aJournalMagic, sizeof(aJournalMagic)); + if( rc==SQLITE_OK ){ + rc = write32bits(&pPager->jfd, pPager->noSync ? 0xffffffff : 0); + } + if( rc==SQLITE_OK ){ + sqlite3Randomness(sizeof(pPager->cksumInit), &pPager->cksumInit); + rc = write32bits(&pPager->jfd, pPager->cksumInit); } if( rc==SQLITE_OK ){ rc = write32bits(&pPager->jfd, pPager->dbSize); } + if( rc==SQLITE_OK ){ + rc = write32bits(&pPager->jfd, pPager->nMaster); + } + if( rc==SQLITE_OK ){ + rc = sqlite3OsSeek(&pPager->jfd, 24 + pPager->nMaster); + } if( pPager->stmtAutoopen && rc==SQLITE_OK ){ rc = sqlite3pager_stmt_begin(pPager); } @@ -2189,22 +2085,16 @@ int sqlite3pager_write(void *pData){ } pPg->inJournal = 1; }else{ - if( journal_format>=JOURNAL_FORMAT_3 ){ - u32 cksum = pager_cksum(pPager, pPg->pgno, pData); - saved = *(u32*)PGHDR_TO_EXTRA(pPg); - store32bits(cksum, pPg, SQLITE_PAGE_SIZE); - szPg = SQLITE_PAGE_SIZE+8; - }else{ - szPg = SQLITE_PAGE_SIZE+4; - } + u32 cksum = pager_cksum(pPager, pPg->pgno, pData); + saved = *(u32*)PGHDR_TO_EXTRA(pPg); + store32bits(cksum, pPg, SQLITE_PAGE_SIZE); + szPg = SQLITE_PAGE_SIZE+8; store32bits(pPg->pgno, pPg, -4); CODEC(pPager, pData, pPg->pgno, 7); rc = sqlite3OsWrite(&pPager->jfd, &((char*)pData)[-4], szPg); TRACE3("JOURNAL page %d needSync=%d\n", pPg->pgno, pPg->needSync); CODEC(pPager, pData, pPg->pgno, 0); - if( journal_format>=JOURNAL_FORMAT_3 ){ - *(u32*)PGHDR_TO_EXTRA(pPg) = saved; - } + *(u32*)PGHDR_TO_EXTRA(pPg) = saved; if( rc!=SQLITE_OK ){ sqlite3pager_rollback(pPager); pPager->errMask |= PAGER_ERR_FULL; @@ -2231,8 +2121,8 @@ int sqlite3pager_write(void *pData){ /* If the statement journal is open and the page is not in it, ** then write the current page to the statement journal. Note that - ** the statement journal always uses the simplier format 2 that lacks - ** checksums. The header is also omitted from the statement journal. + ** the statement journal format differs from the standard journal format + ** in that it omits the checksums and the header. */ if( pPager->stmtInUse && !pPg->inStmt && (int)pPg->pgno<=pPager->stmtSize ){ assert( pPg->inJournal || (int)pPg->pgno>pPager->origDbSize ); @@ -2593,11 +2483,10 @@ int sqlite3pager_stmt_begin(Pager *pPager){ rc = sqlite3OsFileSize(&pPager->jfd, &pPager->stmtJSize); if( rc ) goto stmt_begin_failed; assert( pPager->stmtJSize == - pPager->nRec*JOURNAL_PG_SZ(journal_format) + - JOURNAL_HDR_SZ(pPager, journal_format) ); + pPager->nRec*JOURNAL_PG_SZ(pPager) + JOURNAL_HDR_SZ(pPager) ); #endif - pPager->stmtJSize = pPager->nRec*JOURNAL_PG_SZ(journal_format) - + JOURNAL_HDR_SZ(pPager, journal_format); + pPager->stmtJSize = + pPager->nRec*JOURNAL_PG_SZ(pPager) + JOURNAL_HDR_SZ(pPager); pPager->stmtSize = pPager->dbSize; if( !pPager->stmtOpen ){ rc = sqlite3pager_opentemp(zTemp, &pPager->stfd); diff --git a/src/test2.c b/src/test2.c index 177043f025..7e50604327 100644 --- a/src/test2.c +++ b/src/test2.c @@ -13,7 +13,7 @@ ** is not included in the SQLite library. It is used for automated ** testing of the SQLite library. ** -** $Id: test2.c,v 1.20 2004/06/04 06:22:02 danielk1977 Exp $ +** $Id: test2.c,v 1.21 2004/06/09 19:03:55 drh Exp $ */ #include "os.h" #include "sqliteInt.h" @@ -553,13 +553,6 @@ int Sqlitetest2_Init(Tcl_Interp *interp){ } Tcl_LinkVar(interp, "sqlite3_io_error_pending", (char*)&sqlite3_io_error_pending, TCL_LINK_INT); -#ifdef SQLITE_TEST - { - extern int journal_format; - Tcl_LinkVar(interp, "journal_format", - (char*)&journal_format, TCL_LINK_INT); - } -#endif sprintf(zBuf, "%d", SQLITE_PAGE_SIZE); Tcl_SetVar(interp, "SQLITE_PAGE_SIZE", zBuf, TCL_GLOBAL_ONLY); sprintf(zBuf, "%d", SQLITE_PAGE_RESERVE); @@ -568,6 +561,3 @@ int Sqlitetest2_Init(Tcl_Interp *interp){ Tcl_SetVar(interp, "SQLITE_USABLE_SIZE", zBuf, TCL_GLOBAL_ONLY); return TCL_OK; } - - - diff --git a/test/memdb.test b/test/memdb.test index 383b927ecd..3958f3960b 100644 --- a/test/memdb.test +++ b/test/memdb.test @@ -11,7 +11,7 @@ # This file implements regression tests for SQLite library. The # focus of this script is in-memory database backend. # -# $Id: memdb.test,v 1.6 2003/08/05 13:13:39 drh Exp $ +# $Id: memdb.test,v 1.7 2004/06/09 19:03:55 drh Exp $ set testdir [file dirname $argv0] @@ -73,7 +73,6 @@ for {set i 2} {$i<=$limit} {incr i} { set ::sig [signature one] # puts "sig=$sig" set cnt [lindex $::sig 0] - set ::journal_format [expr {($i%3)+1}] if {$i%2==0} { execsql {PRAGMA synchronous=FULL} } else { diff --git a/test/trans.test b/test/trans.test index 4e59a63ccd..1f3cd76828 100644 --- a/test/trans.test +++ b/test/trans.test @@ -11,7 +11,7 @@ # This file implements regression tests for SQLite library. The # focus of this script is database locks. # -# $Id: trans.test,v 1.20 2004/05/31 08:26:50 danielk1977 Exp $ +# $Id: trans.test,v 1.21 2004/06/09 19:03:55 drh Exp $ set testdir [file dirname $argv0] @@ -864,7 +864,6 @@ if {[info exists ISQUICK]} { for {set i 2} {$i<=$limit} {incr i} { set ::sig [signature] set cnt [lindex $::sig 0] - set ::journal_format [expr {($i%3)+1}] if {$i%2==0} { execsql {PRAGMA synchronous=FULL} } else {