Remove the sqlite3PagerUseWal() routine which was made obsolete by

the [81629ba91475938b6ad] change.

FossilOrigin-Name: 4331b4990cbc1221d94fadd376dfc6efe83f67836aef00912126da4c924bf659

diff --git a/manifest b/manifest
index 7f6626f4a76958c2b78d3c8a6283b967b31ec07a..9b2b20eef79108b4c467109cf0455b18f38b40f9 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\ssimple\stest\scase\sfor\sLemon.\s\sAlways\sinclude\sassert.h\sin\sthe\nLemon-generated\sparser.
-D 2018-11-27T14:34:33.784
+C Remove\sthe\ssqlite3PagerUseWal()\sroutine\swhich\swas\smade\sobsolete\sby\nthe\s[81629ba91475938b6ad]\schange.
+D 2018-11-27T14:41:07.113
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 15f0851eb3754e37de848d5f8ab24146cf677b44ac38353a2c23e39c999aa422
@@ -493,8 +493,8 @@ F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
 F src/os_unix.c f6e91b8fd82af7afbfd073c4974ad6cdb8e62d9f65ceddb45167835a0567fdc0
 F src/os_win.c 85d9e532d0444ab6c16d7431490c2e279e282aa0917b0e988996b1ae0de5c5a0
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
-F src/pager.c ff1757f5bb5adb756f22e44c02b235e1d228c6d2c14ae4ea405f2eac7bb0f046
-F src/pager.h 1bffa1ba8a742f8b6485ace9fdbceb0924a15c589a0fb86338ce7ed75130b232
+F src/pager.c d26741248d2f171d19161c83ea315d265c3eda227a54f7e35d5fe5fdf07ef1d9
+F src/pager.h 217921e81eb5fe455caa5cda96061959706bcdd29ddb57166198645ef7822ac3
 F src/parse.y 6840fe7c0b5eb4dd25ee5d075213bc8255ed4c0678d71bfb6744d0520d91c179
 F src/pcache.c 696a01f1a6370c1b50a09c15972bc3bee3333f8fcd1f2da8e9a76b1b062c59ee
 F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
@@ -1779,7 +1779,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 c6dfc59eb12a02d35b708b5d94239377c79f688fa572f72bad51a157b1bf599c
-R 2339dd4ac4a954f22713351e7a3601c7
+P 9c9c46dcbe92aeabe3d5675bb69681b6dfd53798bc67e6a2ceba67ed3c4fb0af
+R a7ef9f84b50ea057396ea8848fef5c6d
 U drh
-Z 4edb575ad89b443e91df3129c4c760e1
+Z aee2ea0c5680faa8e1dea218ef6a8fe1

diff --git a/manifest.uuid b/manifest.uuid
index bb86762c48044b6b3c22ad75941ed456eff134cb..c8c2064003074867f961a41c4eb49ace020a44ea 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9c9c46dcbe92aeabe3d5675bb69681b6dfd53798bc67e6a2ceba67ed3c4fb0af
\ No newline at end of file
+4331b4990cbc1221d94fadd376dfc6efe83f67836aef00912126da4c924bf659
\ No newline at end of file

diff --git a/src/pager.c b/src/pager.c
index 5d5c2e3fb5d93c049b3aa26d17fe65f0782b7a39..cbf990b294dc83b8340312c0d2ff4583fadc9c43 100644 (file)
--- a/src/pager.c
+++ b/src/pager.c
@@ -849,19 +849,6 @@ int sqlite3PagerDirectReadOk(Pager *pPager, Pgno pgno){
 }
 #endif
 
-/*
-** Return true if this pager uses a write-ahead log to read page pgno.
-** Return false if the pager reads pgno directly from the database.
-*/
-#if !defined(SQLITE_OMIT_WAL) && defined(SQLITE_DIRECT_OVERFLOW_READ)
-int sqlite3PagerUseWal(Pager *pPager, Pgno pgno){
-  u32 iRead = 0;
-  int rc;
-  if( pPager->pWal==0 ) return 0;
-  rc = sqlite3WalFindFrame(pPager->pWal, pgno, &iRead);
-  return rc || iRead;
-}
-#endif
 #ifndef SQLITE_OMIT_WAL
 # define pagerUseWal(x) ((x)->pWal!=0)
 #else

diff --git a/src/pager.h b/src/pager.h
index 1b8136e7459eaaddfa555779ef2a2189117a93c6..de96dc551537e8addc2b4f49136f93f0bfcc3a8d 100644 (file)
--- a/src/pager.h
+++ b/src/pager.h
@@ -179,9 +179,6 @@ int sqlite3PagerSharedLock(Pager *pPager);
   int sqlite3PagerWalCallback(Pager *pPager);
   int sqlite3PagerOpenWal(Pager *pPager, int *pisOpen);
   int sqlite3PagerCloseWal(Pager *pPager, sqlite3*);
-# ifdef SQLITE_DIRECT_OVERFLOW_READ
-  int sqlite3PagerUseWal(Pager *pPager, Pgno);
-# endif
 # ifdef SQLITE_ENABLE_SNAPSHOT
   int sqlite3PagerSnapshotGet(Pager *pPager, sqlite3_snapshot **ppSnapshot);
   int sqlite3PagerSnapshotOpen(Pager *pPager, sqlite3_snapshot *pSnapshot);
@@ -189,8 +186,6 @@ int sqlite3PagerSharedLock(Pager *pPager);
   int sqlite3PagerSnapshotCheck(Pager *pPager, sqlite3_snapshot *pSnapshot);
   void sqlite3PagerSnapshotUnlock(Pager *pPager);
 # endif
-#else
-# define sqlite3PagerUseWal(x,y) 0
 #endif
 
 #ifdef SQLITE_DIRECT_OVERFLOW_READ