From: drh <drh@noemail.net>
Date: Fri, 14 Jan 2011 15:17:55 +0000 (+0000)
Subject: Fix comments, including some documentation comments, in the page cache
X-Git-Tag: version-3.7.5~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=94e7bd55bd94ad33a6eb7bfab6016800d64af3d7;p=thirdparty%2Fsqlite.git

Fix comments, including some documentation comments, in the page cache
logic.  No code changes.

FossilOrigin-Name: c80e9c1a0dc0e501b209874e147e1cb1348cb4a4
---

diff --git a/install-sh b/install-sh
old mode 100644
new mode 100755
diff --git a/manifest b/manifest
index 8a3f1a33f1..8c4edfea74 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,8 @@
-C Fix\sa\sbug\sin\stest\scode\s(test_vfs.c).
-D 2011-01-14T11:51:28
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+C Fix\scomments,\sincluding\ssome\sdocumentation\scomments,\sin\sthe\spage\scache\nlogic.\s\sNo\scode\schanges.
+D 2011-01-14T15:17:55.081
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in de6498556d536ae60bb8bb10e8c1ba011448658c
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -97,7 +100,7 @@ F ext/rtree/rtree_util.tcl 06aab2ed5b826545bf215fff90ecb9255a8647ea
 F ext/rtree/sqlite3rtree.h 1af0899c63a688e272d69d8e746f24e76f10a3f0
 F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
 F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
-F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
+F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F main.mk 05d0f3475dd331896bd607cfb45c5e21b94589ad
 F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
@@ -167,7 +170,7 @@ F src/pager.h 0ea59db2a33bc6c2c02cae34de33367e1effdf76
 F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58
 F src/pcache.c 09d38c44ab275db581f7a2f6ff8b9bc7f8c0faaa
 F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050
-F src/pcache1.c e9578a3beac26f229ee558a4e16c863f2498185f
+F src/pcache1.c 306389ff1a9677fc93533c3100b728c43cc007c0
 F src/pragma.c 8a6cd3c787f882fa44f6490d2411fc26839ce8f3
 F src/prepare.c c8b877b80721d70b68053fd9ae30ec6d63eeeadc
 F src/printf.c 37e8bfd4c5a04eae4960adbe776b0f1fc4cad674
@@ -176,7 +179,7 @@ F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
 F src/select.c 8a7ba246b0b4bb45df7fbc52681728a0e3deaaa7
 F src/shell.c 83c6f0cc5a79a081c7b9ddfe4f557b47e0bad976
-F src/sqlite.h.in 90674938b3da90bc8c652d3cc8919bb5e59fca3a
+F src/sqlite.h.in e93b13af0879dcc56471fc7639dc8efa7d0de832
 F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
 F src/sqliteInt.h 3ef5fc89a4c9755a08a68de107493785a284e27c
 F src/sqliteLimit.h a17dcd3fb775d63b64a43a55c54cb282f9726f44
@@ -589,7 +592,7 @@ F test/permutations.test c0ce0f3b741dd92a6d4c2671dbacba4b92dd81eb
 F test/pragma.test fdfc09067ea104a0c247a1a79d8093b56656f850
 F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
 F test/printf.test 05970cde31b1a9f54bd75af60597be75a5c54fea
-F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301 x
+F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301
 F test/ptrchng.test ef1aa72d6cf35a2bbd0869a649b744e9d84977fc
 F test/quick.test 1681febc928d686362d50057c642f77a02c62e57
 F test/quota.test ddafe133653093eb9a99ccd6264884ae43f9c9b8
@@ -870,7 +873,7 @@ F tool/genfkey.test 4196a8928b78f51d54ef58e99e99401ab2f0a7e5
 F tool/lemon.c dfd81a51b6e27e469ba21d01a75ddf092d429027
 F tool/lempar.c 01ca97f87610d1dac6d8cd96ab109ab1130e76dc
 F tool/mkkeywordhash.c d2e6b4a5965e23afb80fbe74bb54648cd371f309
-F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e x
+F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
 F tool/mksqlite3c.tcl e0db70c2c52b0e3d0867ca931229e5b90ffe7837
 F tool/mksqlite3h.tcl d76c226a5e8e1f3b5f6593bcabe5e98b3b1ec9ff
@@ -895,7 +898,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P b0add45abc9929c5b8d1124879bc3e8acf2ab7c7
-R b67b9c989bcea8b245d245dba2997a91
-U dan
-Z 95ee84a38eb35f38451c4014903841ae
+P 772a3845f8ef5cd3131992c45f6ce607977820f3
+R 19decadc1bc3a350efa2fd91ea550cbd
+U drh
+Z 2bc94824009661f8875e8f0813b34047
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFNMGkmoxKgR168RlERAivDAJwPBpJmw1CdPhCpfZB/zXbwtqt3ygCfQMOh
+gcVN8uEte2YWEkQzdZ2raXY=
+=99H9
+-----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index 6744ad0de4..5b938e8c39 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-772a3845f8ef5cd3131992c45f6ce607977820f3
\ No newline at end of file
+c80e9c1a0dc0e501b209874e147e1cb1348cb4a4
\ No newline at end of file
diff --git a/src/pcache1.c b/src/pcache1.c
index abf57dc34d..2485ffa097 100644
--- a/src/pcache1.c
+++ b/src/pcache1.c
@@ -688,11 +688,7 @@ static void pcache1Unpin(sqlite3_pcache *p, void *pPg, int reuseUnlikely){
     pcache1RemoveFromHash(pPage);
     pcache1FreePage(pPage);
   }else{
-    /* Add the page to the global LRU list. Normally, the page is added to
-    ** the head of the list (last page to be recycled). However, if the 
-    ** reuseUnlikely flag passed to this function is true, the page is added
-    ** to the tail of the list (first page to be recycled).
-    */
+    /* Add the page to the global LRU list. */
     if( pcache1.pLruHead ){
       pcache1.pLruHead->pLruPrev = pPage;
       pPage->pLruNext = pcache1.pLruHead;
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 79a1e0810c..27121072ad 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -5737,7 +5737,7 @@ typedef struct sqlite3_pcache sqlite3_pcache;
 ** If the requested page is already in the page cache, then the page cache
 ** implementation must return a pointer to the page buffer with its content
 ** intact.  If the requested page is not already in the cache, then the
-** behavior of the cache implementation should use the value of the createFlag
+** cache implementation should use the value of the createFlag
 ** parameter to help it determined what action to take:
 **
 ** <table border=1 width=85% align=center>
diff --git a/test/progress.test b/test/progress.test
old mode 100755
new mode 100644
diff --git a/tool/mkopts.tcl b/tool/mkopts.tcl
old mode 100755
new mode 100644