Remove the pager_lookup() function since it is redundant with

sqlite3PagerLookup().

FossilOrigin-Name: 54164ce47cfc3ad5dd8797114e4ba78811f23bef

diff --git a/manifest b/manifest
index bfef72eb6a1393b064c25c59fa6879f994669dd8..3c6bec475e322f224637afa9099f431ad540fffc 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sthe\sname\sof\sthe\sVdbeMemRelease()\smacro\sto\sVdbeMemReleaseExtern()\sto\nmore\saccurately\sreflect\swhat\sit\sdoes.\s\sPerformance\senhancement\sto\sthe\nsqlite3VdbeMemRelease()\sfunction.
-D 2014-08-25T11:20:27.189
+C Remove\sthe\spager_lookup()\sfunction\ssince\sit\sis\sredundant\swith\s\nsqlite3PagerLookup().
+D 2014-08-25T11:33:41.726
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -211,7 +211,7 @@ F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
 F src/os_unix.c bd7df3094a60915c148517504c76df4fca24e542
 F src/os_win.c d067fce558a5032e6e6afe62899e5397bf63cf3e
 F src/os_win.h 09e751b20bbc107ffbd46e13555dc73576d88e21
-F src/pager.c c831b0df879114915c08dc5a0188f9f22c48403b
+F src/pager.c 53cc5e9d73afb74add79f49755c8ee240fbdbef7
 F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
 F src/parse.y 22d6a074e5f5a7258947a1dc55a9bf946b765dd0
 F src/pcache.c da602c5447051705cab41604bf3276815eb569d0
@@ -1188,7 +1188,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 0c7e1b875a14ff9d71af7bb125a0272a23d57353
-R 3449942ddb4a22bfe8e7f1684bd27e8b
+P 3ca5846da7da5e08192a4c96288197be3b7ab6f7
+R e183e353a27fb2d0c63a06eeb0b66e97
 U drh
-Z c7041d8c52f909d88b499b4a5f3227aa
+Z 12acde8fd951a315f106f1112e06c5c6

diff --git a/manifest.uuid b/manifest.uuid
index 725161693a49fab338741d3335bcfbbfd2eb5af6..698dca573d674c72aad6dc2139c698b883158141 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3ca5846da7da5e08192a4c96288197be3b7ab6f7
\ No newline at end of file
+54164ce47cfc3ad5dd8797114e4ba78811f23bef
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index 4a178a2985c4336af3db9a8f824376a311fbf7d6..8930ce862c67b9ff8eb7ed317ede0a563cfaa9b0 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -1677,21 +1677,6 @@ static int writeMasterJournal(Pager *pPager, const char *zMaster){
   return rc;
 }
 
-/*
-** Find a page in the hash table given its page number. Return
-** a pointer to the page or NULL if the requested page is not 
-** already in memory.
-*/
-static PgHdr *pager_lookup(Pager *pPager, Pgno pgno){
-  PgHdr *p = 0;                     /* Return value */
-
-  /* It is not possible for a call to PcacheFetch() with createFlag==0 to
-  ** fail, since no attempt to allocate dynamic memory will be made.
-  */
-  (void)sqlite3PcacheFetch(pPager->pPCache, pgno, 0, &p);
-  return p;
-}
-
 /*
 ** Discard the entire contents of the in-memory page-cache.
 */
@@ -1984,7 +1969,7 @@ static int pager_end_transaction(Pager *pPager, int hasMaster, int bCommit){
 #ifdef SQLITE_CHECK_PAGES
   sqlite3PcacheIterateDirty(pPager->pPCache, pager_set_pagehash);
   if( pPager->dbSize==0 && sqlite3PcacheRefCount(pPager->pPCache)>0 ){
-    PgHdr *p = pager_lookup(pPager, 1);
+    PgHdr *p = sqlite3PagerLookup(pPager, 1);
     if( p ){
       p->pageHash = 0;
       sqlite3PagerUnrefNotNull(p);
@@ -2263,7 +2248,7 @@ static int pager_playback_one_page(
   if( pagerUseWal(pPager) ){
     pPg = 0;
   }else{
-    pPg = pager_lookup(pPager, pgno);
+    pPg = sqlite3PagerLookup(pPager, pgno);
   }
   assert( pPg || !MEMDB );
   assert( pPager->eState!=PAGER_OPEN || pPg==0 );
@@ -5434,7 +5419,6 @@ DbPage *sqlite3PagerLookup(Pager *pPager, Pgno pgno){
   assert( pPager!=0 );
   assert( pgno!=0 );
   assert( pPager->pPCache!=0 );
-  assert( pPager->eState>=PAGER_READER && pPager->eState!=PAGER_ERROR );
   sqlite3PcacheFetch(pPager->pPCache, pgno, 0, &pPg);
   return pPg;
 }
@@ -5833,7 +5817,7 @@ static SQLITE_NOINLINE int pagerWriteLargeSector(PgHdr *pPg){
           sqlite3PagerUnrefNotNull(pPage);
         }
       }
-    }else if( (pPage = pager_lookup(pPager, pg))!=0 ){
+    }else if( (pPage = sqlite3PagerLookup(pPager, pg))!=0 ){
       if( pPage->flags&PGHDR_NEED_SYNC ){
         needSync = 1;
       }
@@ -5850,7 +5834,7 @@ static SQLITE_NOINLINE int pagerWriteLargeSector(PgHdr *pPg){
   if( rc==SQLITE_OK && needSync ){
     assert( !MEMDB );
     for(ii=0; ii<nPage; ii++){
-      PgHdr *pPage = pager_lookup(pPager, pg1+ii);
+      PgHdr *pPage = sqlite3PagerLookup(pPager, pg1+ii);
       if( pPage ){
         pPage->flags |= PGHDR_NEED_SYNC;
         sqlite3PagerUnrefNotNull(pPage);
@@ -6782,7 +6766,7 @@ int sqlite3PagerMovepage(Pager *pPager, DbPage *pPg, Pgno pgno, int isCommit){
   ** for the page moved there.
   */
   pPg->flags &= ~PGHDR_NEED_SYNC;
-  pPgOld = pager_lookup(pPager, pgno);
+  pPgOld = sqlite3PagerLookup(pPager, pgno);
   assert( !pPgOld || pPgOld->nRef==1 );
   if( pPgOld ){
     pPg->flags |= (pPgOld->flags&PGHDR_NEED_SYNC);