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

Remove an overzealous assert() from pager.c. (CVS 6931)

Browse Source 
FossilOrigin-Name: 4a924b475aa0f7f2f69caed0adc2e60d29c47f21
This commit is contained in:
drh
2009-07-25 00:10:45 +00:00
parent d05c223c2e
commit 16ff1700a9
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Fix\san\sissue\swith\sthe\sprevious\scheck-in,\s(6929).\s(CVS\s6930) C Remove\san\soverzealous\sassert()\sfrom\spager.c.\s(CVS\s6931)
D 2009-07-24T21:23:16 D 2009-07-25T00:10:46
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in df9359da7a726ccb67a45db905c5447d5c00c6ef F Makefile.in df9359da7a726ccb67a45db905c5447d5c00c6ef
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -147,7 +147,7 @@ F src/os_common.h 8c61457df58f1a4bd5f5adc3e90e01b37bf7afbc
F src/os_os2.c bed77dc26e3a95ce4a204936b9a1ca6fe612fcc5 F src/os_os2.c bed77dc26e3a95ce4a204936b9a1ca6fe612fcc5
F src/os_unix.c cdb2a08b9ce4aa13b3f7b91d4dd60fb48be9f56a F src/os_unix.c cdb2a08b9ce4aa13b3f7b91d4dd60fb48be9f56a
F src/os_win.c 725c38a524d168ce280446ad8761d731bc516405 F src/os_win.c 725c38a524d168ce280446ad8761d731bc516405
F src/pager.c e71458a9fff80fd54589f7566dd3b85434814c43 F src/pager.c 872b3807172f24d46413d9b765b9af6020da443a
F src/pager.h 11852d044c86cf5a9d6e34171fb0c4fcf1f6265f F src/pager.h 11852d044c86cf5a9d6e34171fb0c4fcf1f6265f
F src/parse.y bcd46d43fbd23a22b8c020a3eb1806b794794ed5 F src/parse.y bcd46d43fbd23a22b8c020a3eb1806b794794ed5
F src/pcache.c 1dae135b70a029f81ed66f6e9b5d0db91480d5d0 F src/pcache.c 1dae135b70a029f81ed66f6e9b5d0db91480d5d0
@@ -741,7 +741,7 @@ 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 672f81d693a03f80f5ae60bfefacd8a349e76746 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
P 866216c0b6ba23b66483046fb402ddbe4f9a7b14 P e5165c80abfdba0ad74e1042e4c94fe00d4b3308
R f0f2c963235ce625a4a037d3c6a52b51 R b4fdc5081eb8c32bbe893361356d85e8
U drh U drh
Z 1f9c03c3abcdedba3e2389b156b0c0c2 Z a3c81fe414979381903477f6ab6cc886

2
manifest.uuid
View File

@@ -1 +1 @@
e5165c80abfdba0ad74e1042e4c94fe00d4b3308 4a924b475aa0f7f2f69caed0adc2e60d29c47f21

5
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.617 2009/07/24 21:23:16 drh Exp $ ** @(#) $Id: pager.c,v 1.618 2009/07/25 00:10:46 drh Exp $
*/ */
#ifndef SQLITE_OMIT_DISKIO #ifndef SQLITE_OMIT_DISKIO
#include "sqliteInt.h" #include "sqliteInt.h"
@@ -2406,6 +2406,8 @@ static void pagerReportSize(Pager *pPager){
*/ */
int sqlite3PagerSetPagesize(Pager *pPager, u16 *pPageSize, int nReserve){ int sqlite3PagerSetPagesize(Pager *pPager, u16 *pPageSize, int nReserve){
int rc = pPager->errCode; int rc = pPager->errCode;
assert( pPager->dbSize==0 );
assert( sqlite3PcacheRefCount(pPager->pPCache)==0 );
if( rc==SQLITE_OK ){ if( rc==SQLITE_OK ){
u16 pageSize = *pPageSize; u16 pageSize = *pPageSize;
assert( pageSize==0 || (pageSize>=512 && pageSize<=SQLITE_MAX_PAGE_SIZE) ); assert( pageSize==0 || (pageSize>=512 && pageSize<=SQLITE_MAX_PAGE_SIZE) );
@@ -4109,7 +4111,6 @@ static int pager_open_journal(Pager *pPager){
int sqlite3PagerBegin(Pager *pPager, int exFlag, int subjInMemory){ int sqlite3PagerBegin(Pager *pPager, int exFlag, int subjInMemory){
int rc = SQLITE_OK; int rc = SQLITE_OK;
assert( pPager->state!=PAGER_UNLOCK ); assert( pPager->state!=PAGER_UNLOCK );
assert( pPager->useJournal );
pPager->subjInMemory = (u8)subjInMemory; pPager->subjInMemory = (u8)subjInMemory;
if( pPager->state==PAGER_SHARED ){ if( pPager->state==PAGER_SHARED ){
assert( pPager->pInJournal==0 ); assert( pPager->pInJournal==0 );