Performance optimization in sqlite3PagerWrite().

FossilOrigin-Name: d4dff10a3d4edf8e1cc77c0a4f185d33f2c2e953

diff --git a/manifest b/manifest
index d6e30ce3d53b160214fbc32a626798f37b8f5133..acfaf94242b8300c2ff935d6dec734875d10798f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Updates\sto\sthe\stokenizer\sfor\sEBCDIC.\s\sNo\schanges\sfor\sstandard\sbuilds.
-D 2016-12-12T01:53:36.933
+C Performance\soptimization\sin\ssqlite3PagerWrite().
+D 2016-12-12T11:05:15.832
 F Makefile.in 7639c6a09da11a9c7c6f2630fc981ee588d1072d
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -375,7 +375,7 @@ F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 F src/os_unix.c 30e2c43e4955db990e5b5a81e901f8aa74cc8820
 F src/os_win.c cf90abd4e50d9f56d2c20ce8e005aff55d7bd8e9
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
-F src/pager.c 865779c0d33a5804aa6acd547600fca64b511b8a
+F src/pager.c b6f38fc2f0da8eafe6ccfbf0b12e228b2ce5fb76
 F src/pager.h d1e944291030351f362a0a7da9b5c3e34e603e39
 F src/parse.y 29153738a7322054359320eb00b5a4cd44389f20
 F src/pcache.c 219fc5238d5c80e2990ab01e1459db3a96866447
@@ -1536,7 +1536,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 57deb1b412e0c328528f2b4d697e326bfd028dca
-R e7e10da8262dc9afb4f067773f04c52f
+P 4fc6580ffa7232aaf751f38f90c45edc8863abe5
+R bc14df45b85bb125e9e5bbeaef507f4a
 U drh
-Z d3ba2fc1770bebb5c69c968ec213ff98
+Z 4c6df250e0c9c71056406dc87d5d9884

diff --git a/manifest.uuid b/manifest.uuid
index dea4c9d35ddb662d5cb610fa142c4b328a930bb4..cdd0155282294b3e7d3d76f52887dd56dc847199 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4fc6580ffa7232aaf751f38f90c45edc8863abe5
\ No newline at end of file
+d4dff10a3d4edf8e1cc77c0a4f185d33f2c2e953
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index aa989f4ef292165130960229f4517339100b600b..9422b800caf03e80b95a97cad9fec262b29e9848 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -5961,11 +5961,11 @@ int sqlite3PagerWrite(PgHdr *pPg){
   assert( (pPg->flags & PGHDR_MMAP)==0 );
   assert( pPager->eState>=PAGER_WRITER_LOCKED );
   assert( assert_pager_state(pPager) );
-  if( pPager->errCode ){
-    return pPager->errCode;
-  }else if( (pPg->flags & PGHDR_WRITEABLE)!=0 && pPager->dbSize>=pPg->pgno ){
+  if( (pPg->flags & PGHDR_WRITEABLE)!=0 && pPager->dbSize>=pPg->pgno ){
     if( pPager->nSavepoint ) return subjournalPageIfRequired(pPg);
     return SQLITE_OK;
+  }else if( pPager->errCode ){
+    return pPager->errCode;
   }else if( pPager->sectorSize > (u32)pPager->pageSize ){
     assert( pPager->tempFile==0 );
     return pagerWriteLargeSector(pPg);