From: drh <drh@noemail.net>
Date: Fri, 20 May 2016 18:09:01 +0000 (+0000)
Subject: Remove the sqlite3PagerClearCache() routine, which does not accomplish anything
X-Git-Tag: version-3.14.0~152
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d20b2a41094ff53858415ad788a09ebfedad01ff;p=thirdparty%2Fsqlite.git

Remove the sqlite3PagerClearCache() routine, which does not accomplish anything
useful.

FossilOrigin-Name: f250166bb3c1b0c58e703b334825cf6210758fda
---

diff --git a/manifest b/manifest
index 72e47730ac..264470f9ab 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Performance\soptimization\sand\ssize\sreduction\son\sthe\sfreeP4()\sroutine.
-D 2016-05-20T15:53:47.755
+C Remove\sthe\ssqlite3PagerClearCache()\sroutine,\swhich\sdoes\snot\saccomplish\sanything\nuseful.
+D 2016-05-20T18:09:01.269
 F Makefile.in f59e0763ff448719fc1bd25513882b0567286317
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 306d73e854b1a92ea06e5d1e637faa5c44de53c7
@@ -319,7 +319,7 @@ F src/alter.c 1bb0709b3048e24217b80ec6bd78a3e99a47c01b
 F src/analyze.c 37fedc80ac966ce1745811746e68e4d8fa64c7fe
 F src/attach.c 771153bd1f4ab0b97a44a13dde2c7e5e1efeba22
 F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
-F src/backup.c f60f0aa55d25d853ffde53d0b0370a7bb7ee41ce
+F src/backup.c 6df65fdd569c901a418887a1a76f82ec35044556
 F src/bitvec.c 3ee4c8b2c94ed3a7377256e18199e6ff5cf33f63
 F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
 F src/btree.c e53a01547d61a3d567daf7a7acc30122fe071aef
@@ -365,8 +365,8 @@ F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
 F src/os_unix.c a9443cdab41d7f3cdf0df3a5aab62fd6e1c9b234
 F src/os_win.c 852fc2ff6084296348ed3739c548b2cf32df394e
 F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
-F src/pager.c 3910579bfbe323dfabed2b95d201159b61b8ef42
-F src/pager.h 329bdf078a4e0a3b35084534d58625d21fd03681
+F src/pager.c c368634b888b1c8740aea83b36bfd266f2443e60
+F src/pager.h 8ab6b6feeee4bc0439bfde7ee59ba99df98b9bc3
 F src/parse.y 10eb2f3fb62341291528c7984498054731f9d31e
 F src/pcache.c 50fb5728dbfb92461f89f8763ff8b60d0dbeba2c
 F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
@@ -1490,7 +1490,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 1a0d05765fa2e69ccd4c98782cf9f5c5b2897719
-R 734aa09fb2d1f30b69a973bc3d2e2b77
+P 4dc56e8684e0c74fb311c7f0ef1c367da8c7bf70
+R f1ca77b965b4fac61acdc31594820a52
 U drh
-Z d36b58bb8581f51b9b8f33e10b0489c2
+Z c5c16d4ca102bc8075809f03a41e82f3
diff --git a/manifest.uuid b/manifest.uuid
index da9f09cbad..e1934ce2a2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4dc56e8684e0c74fb311c7f0ef1c367da8c7bf70
\ No newline at end of file
+f250166bb3c1b0c58e703b334825cf6210758fda
\ No newline at end of file
diff --git a/src/backup.c b/src/backup.c
index 455671a1ad..3df56e5384 100644
--- a/src/backup.c
+++ b/src/backup.c
@@ -784,8 +784,6 @@ int sqlite3BtreeCopyFile(Btree *pTo, Btree *pFrom){
   rc = sqlite3_backup_finish(&b);
   if( rc==SQLITE_OK ){
     pTo->pBt->btsFlags &= ~BTS_PAGESIZE_FIXED;
-  }else{
-    sqlite3PagerClearCache(sqlite3BtreePager(b.pDest));
   }
 
   assert( sqlite3BtreeIsInTrans(pTo)==0 );
diff --git a/src/pager.c b/src/pager.c
index b24267e58a..1ae831d148 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -7157,16 +7157,6 @@ sqlite3_backup **sqlite3PagerBackupPtr(Pager *pPager){
   return &pPager->pBackup;
 }
 
-#ifndef SQLITE_OMIT_VACUUM
-/*
-** Unless this is an in-memory or temporary database, clear the pager cache.
-*/
-void sqlite3PagerClearCache(Pager *pPager){
-  assert( MEMDB==0 || pPager->tempFile );
-  if( pPager->tempFile==0 ) pager_reset(pPager);
-}
-#endif
-
 #ifndef SQLITE_OMIT_WAL
 /*
 ** This function is called when the user invokes "PRAGMA wal_checkpoint",
diff --git a/src/pager.h b/src/pager.h
index 077fcd8b7f..69d3bb4435 100644
--- a/src/pager.h
+++ b/src/pager.h
@@ -203,7 +203,6 @@ const char *sqlite3PagerJournalname(Pager*);
 void *sqlite3PagerTempSpace(Pager*);
 int sqlite3PagerIsMemdb(Pager*);
 void sqlite3PagerCacheStat(Pager *, int, int, int *);
-void sqlite3PagerClearCache(Pager *);
 int sqlite3SectorSize(sqlite3_file *);
 
 /* Functions used to truncate the database file. */