Minor performance optimizations in pager.c.

FossilOrigin-Name: ba9eef5f5293633d1479e1d877bf338edb2a9471

diff --git a/manifest b/manifest
index 029bbd9b381c565d0d56832f628bd91f1c51be60..9713b269fbb8610f49eef4b480fb11480fafe978 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Performance\soptimizations\sfor\ssqlite3VXPrintf().
-D 2013-12-09T19:03:26.813
+C Minor\sperformance\soptimizations\sin\spager.c.
+D 2013-12-09T19:25:28.392
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in e1a9b4258bbde53f5636f4e238c65b7e11459e2b
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -207,7 +207,7 @@ F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_unix.c 60a7b3b23e6fcf83a50d1e320b280b551724e11f
 F src/os_win.c 4323dd0bac4f7a7037fc4cf87fb4692d17f0b108
-F src/pager.c 061d0b41354a8446256f5d765771e2a026ec8ed2
+F src/pager.c 19203eff37c099271189bf8b378a1143847b92e3
 F src/pager.h f094af9f6ececfaa8a1e93876905a4f34233fb0c
 F src/parse.y acee1a9958539e21263362b194594c5255ad2fca
 F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
@@ -1146,7 +1146,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P fbfc075a5a3c9c5c98353f396f9da7f7ec7c1c04
-R b8ab7b74939c13b89c303e9a6e5110d1
+P 9227ad48e1612b32a3a3e9551c49890f93abc0a7
+R 2aecb7bab925cdbd0159d9e849c7e955
 U drh
-Z 3687c2e0d19ee741a7e8e3f49ed7da21
+Z 455daaba8769a2d87fdc74aa6d107f2c

diff --git a/manifest.uuid b/manifest.uuid
index e6e97065a9f7d13e7f858d848f7ab1b6802e9934..c5695949d4b9006a48c193bd7084c13b815788fb 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9227ad48e1612b32a3a3e9551c49890f93abc0a7
\ No newline at end of file
+ba9eef5f5293633d1479e1d877bf338edb2a9471
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index 7f79bd7eca812608acfae76de7ecbb3c26fcdd26..8cbb50ce3c6ed053d564d08163e10246f4446fa5 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -5643,14 +5643,8 @@ static int pager_write(PgHdr *pPg){
        || pPager->eState==PAGER_WRITER_DBMOD
   );
   assert( assert_pager_state(pPager) );
-
-  /* If an error has been previously detected, report the same error
-  ** again. This should not happen, but the check provides robustness. */
-  if( NEVER(pPager->errCode) )  return pPager->errCode;
-
-  /* Higher-level routines never call this function if database is not
-  ** writable.  But check anyway, just for robustness. */
-  if( NEVER(pPager->readOnly) ) return SQLITE_PERM;
+  assert( pPager->errCode==0 );
+  assert( pPager->readOnly==0 );
 
   CHECK_PAGE(pPg);
 
@@ -5779,19 +5773,19 @@ int sqlite3PagerWrite(DbPage *pDbPage){
 
   PgHdr *pPg = pDbPage;
   Pager *pPager = pPg->pPager;
-  Pgno nPagePerSector = (pPager->sectorSize/pPager->pageSize);
 
   assert( (pPg->flags & PGHDR_MMAP)==0 );
   assert( pPager->eState>=PAGER_WRITER_LOCKED );
   assert( pPager->eState!=PAGER_ERROR );
   assert( assert_pager_state(pPager) );
 
-  if( nPagePerSector>1 ){
+  if( pPager->sectorSize > pPager->pageSize ){
     Pgno nPageCount;          /* Total number of pages in database file */
     Pgno pg1;                 /* First page of the sector pPg is located on. */
     int nPage = 0;            /* Number of pages starting at pg1 to journal */
     int ii;                   /* Loop counter */
     int needSync = 0;         /* True if any page has PGHDR_NEED_SYNC */
+    Pgno nPagePerSector = (pPager->sectorSize/pPager->pageSize);
 
     /* Set the doNotSpill NOSYNC bit to 1. This is because we cannot allow
     ** a journal header to be written between the pages journaled by