From 9c10608a2631c9b972f9afdf4bf3fc5d1c9a6b6b Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 6 Jul 2016 18:12:54 +0000 Subject: [PATCH] Change the name of the SQLITE_DBSTATUS_PROPORTIONAL_CACHE_USED to SQLITE_DBSTATUS_CACHE_USED_SHARED. FossilOrigin-Name: d58401ab26c7c5417eb7d540f47d11c4e49edcb2 --- manifest | 21 +++++++++------------ manifest.uuid | 2 +- src/sqlite.h.in | 8 ++++---- src/status.c | 4 ++-- src/test_malloc.c | 2 +- test/dbstatus.test | 4 ++-- 6 files changed, 19 insertions(+), 22 deletions(-) diff --git a/manifest b/manifest index 662bd8b161..f138ba5137 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sthe\sSQLITE_DBSTATUS_PROPORTIONAL_CACHE_USED\ssqlite3_db_status()\sparameter. -D 2016-07-06T10:12:02.240 +C Change\sthe\sname\sof\sthe\sSQLITE_DBSTATUS_PROPORTIONAL_CACHE_USED\sto\sSQLITE_DBSTATUS_CACHE_USED_SHARED. +D 2016-07-06T18:12:54.292 F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a @@ -385,12 +385,12 @@ F src/resolve.c cca3aa77b95706df5d635a2141a4d1de60ae6598 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac F src/select.c f3c6e9065fb34f6a23af27ec7f1f717ffbfc2ee4 F src/shell.c 14ff7f660530a52b117d110ba3390b7b2eb719b6 -F src/sqlite.h.in 801a34f86508662fbfc8e014f03ccf0c8bef0b4c +F src/sqlite.h.in 5e6785f6d2148b20ecd891039b12e9c7b8c552ca F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 98f72cbfe00169c39089115427d06ea05fe4b4a2 F src/sqliteInt.h 2ac73e9fdd138f4607139d9bd6a1e6dcd01837dc F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247 -F src/status.c d92daea3bb48023da57931719f2a2784f5487c0b +F src/status.c 5b18f9526900f61189ab0b83f1ef41d9f871a2ab F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9 F src/tclsqlite.c 25fbbbb97f76dbfd113153fb63f52d7ecfac5dd0 F src/test1.c 08faa045c45b1d3f62c28c93cae955f518317f68 @@ -419,7 +419,7 @@ F src/test_intarray.c 870124b95ec4c645d4eb84f15efb7133528fb1a5 F src/test_intarray.h 9dc57417fb65bc7835cc18548852cc08cc062202 F src/test_journal.c d3b83f2bcb7792c709e57abddc456a2b1818643a F src/test_loadext.c 337056bae59f80b9eb00ba82088b39d0f4fe6dfd -F src/test_malloc.c 20954ab49e09be3433c8d2fd7a8bd0a0f1c76de7 +F src/test_malloc.c 6b27e947eeeb70d11aa65406ed28d749e39b6356 F src/test_multiplex.c eafc567ebe162e36f17b5062285dfe90461cf8e9 F src/test_multiplex.h c08e4e8f8651f0c5e0509b138ff4d5b43ed1f5d3 F src/test_mutex.c dbdfaff8580071f2212a0deae3325a93a737819c @@ -621,7 +621,7 @@ F test/ctime.test 0b995accd44a52914bd4744d5c1b6e1a56c7897c F test/cursorhint.test 7bc346788390475e77a345da2b92270d04d35856 F test/cursorhint2.test 2b45341d32d1aae9991a00ef31ebca339b274255 F test/date.test 984ac1e3e5e031386866f034006148d3972b4a65 -F test/dbstatus.test c0c8752043074ab6479d2560341ae02f072ad3b9 +F test/dbstatus.test 254427f026b55ab6eba99bd8493f4edbc370bb13 F test/dbstatus2.test e93ab03bfae6d62d4d935f20de928c19ca0ed0ab F test/default.test 0cb49b1c315a0d81c81d775e407f66906a2a604d F test/delete.test e1bcdf8926234e27aac24b346ad83d3329ec8b6f @@ -1504,10 +1504,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 724e4cdc25fc80b8face57b3398cd338994fb23c -R 266d0a5d75bc1363b05e057e04a42c8c -T *branch * dbstatus-prop-cache-used -T *sym-dbstatus-prop-cache-used * -T -sym-trunk * +P 118321c8b9d88b8f439c952436f42838c3fc80cb +R 05426ca0e9c055af37d1a3ee4a44f5ae U dan -Z d4bd876af7d67d4b270c7d6acc73f5f1 +Z 090646989586e99cb3699b0e8d3a49b5 diff --git a/manifest.uuid b/manifest.uuid index 412e8ccbff..a57c8f34ac 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -118321c8b9d88b8f439c952436f42838c3fc80cb \ No newline at end of file +d58401ab26c7c5417eb7d540f47d11c4e49edcb2 \ No newline at end of file diff --git a/src/sqlite.h.in b/src/sqlite.h.in index e1d16008f9..55f96dd898 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -6765,8 +6765,8 @@ int sqlite3_db_status(sqlite3*, int op, int *pCur, int *pHiwtr, int resetFlg); ** memory used by all pager caches associated with the database connection.)^ ** ^The highwater mark associated with SQLITE_DBSTATUS_CACHE_USED is always 0. ** -** [[SQLITE_DBSTATUS_PROPORTIONAL_CACHE_USED]] -** ^(
SQLITE_DBSTATUS_PROPORTIONAL_CACHE_USED
+** [[SQLITE_DBSTATUS_CACHE_USED_SHARED]] +** ^(
SQLITE_DBSTATUS_CACHE_USED_SHARED
**
This parameter is similar to DBSTATUS_CACHE_USED, except that if a ** pager cache is shared between two or more connections the bytes of heap ** memory used by that pager cache is divided evenly between the attached @@ -6775,7 +6775,7 @@ int sqlite3_db_status(sqlite3*, int op, int *pCur, int *pHiwtr, int resetFlg); ** value as DBSTATUS_CACHE_USED. Or, if one or more or the pager caches are ** shared, the value returned by this call will be smaller than that returned ** by DBSTATUS_CACHE_USED. ^The highwater mark associated with -** SQLITE_DBSTATUS_PROPORTIONAL_CACHE_USED is always 0. +** SQLITE_DBSTATUS_CACHE_USED_SHARED is always 0. ** ** [[SQLITE_DBSTATUS_SCHEMA_USED]] ^(
SQLITE_DBSTATUS_SCHEMA_USED
**
This parameter returns the approximate number of bytes of heap @@ -6834,7 +6834,7 @@ int sqlite3_db_status(sqlite3*, int op, int *pCur, int *pHiwtr, int resetFlg); #define SQLITE_DBSTATUS_CACHE_MISS 8 #define SQLITE_DBSTATUS_CACHE_WRITE 9 #define SQLITE_DBSTATUS_DEFERRED_FKS 10 -#define SQLITE_DBSTATUS_PROPORTIONAL_CACHE_USED 11 +#define SQLITE_DBSTATUS_CACHE_USED_SHARED 11 #define SQLITE_DBSTATUS_MAX 11 /* Largest defined DBSTATUS */ diff --git a/src/status.c b/src/status.c index bf336dfb46..949908ed23 100644 --- a/src/status.c +++ b/src/status.c @@ -219,7 +219,7 @@ int sqlite3_db_status( ** by all pagers associated with the given database connection. The ** highwater mark is meaningless and is returned as zero. */ - case SQLITE_DBSTATUS_PROPORTIONAL_CACHE_USED: + case SQLITE_DBSTATUS_CACHE_USED_SHARED: case SQLITE_DBSTATUS_CACHE_USED: { int totalUsed = 0; int i; @@ -229,7 +229,7 @@ int sqlite3_db_status( if( pBt ){ Pager *pPager = sqlite3BtreePager(pBt); int nByte = sqlite3PagerMemUsed(pPager); - if( op==SQLITE_DBSTATUS_PROPORTIONAL_CACHE_USED ){ + if( op==SQLITE_DBSTATUS_CACHE_USED_SHARED ){ nByte = nByte / sqlite3BtreeConnectionCount(pBt); } totalUsed += nByte; diff --git a/src/test_malloc.c b/src/test_malloc.c index db34924e6b..37612561eb 100644 --- a/src/test_malloc.c +++ b/src/test_malloc.c @@ -1418,7 +1418,7 @@ static int test_db_status( { "CACHE_MISS", SQLITE_DBSTATUS_CACHE_MISS }, { "CACHE_WRITE", SQLITE_DBSTATUS_CACHE_WRITE }, { "DEFERRED_FKS", SQLITE_DBSTATUS_DEFERRED_FKS }, - { "PROPORTIONAL_CACHE_USED", SQLITE_DBSTATUS_PROPORTIONAL_CACHE_USED }, + { "CACHE_USED_SHARED", SQLITE_DBSTATUS_CACHE_USED_SHARED }, }; Tcl_Obj *pResult; if( objc!=4 ){ diff --git a/test/dbstatus.test b/test/dbstatus.test index fb839b8f13..7bc44353b0 100644 --- a/test/dbstatus.test +++ b/test/dbstatus.test @@ -380,12 +380,12 @@ foreach ::lookaside_buffer_size {0 64 120} { } #------------------------------------------------------------------------- -# The following tests focus on DBSTATUS_PROPORTIONAL_CACHE_USED +# The following tests focus on DBSTATUS_CACHE_USED_SHARED # ifcapable shared_cache { proc do_cacheused_test {tn db res} { set cu [sqlite3_db_status $db SQLITE_DBSTATUS_CACHE_USED 0] - set pcu [sqlite3_db_status $db SQLITE_DBSTATUS_PROPORTIONAL_CACHE_USED 0] + set pcu [sqlite3_db_status $db SQLITE_DBSTATUS_CACHE_USED_SHARED 0] set cu [lindex $cu 1] set pcu [lindex $pcu 1] uplevel [list do_test $tn [list list $cu $pcu] [list {*}$res]] -- 2.39.5