From: drh <>
Date: Mon, 29 Sep 2025 19:57:43 +0000 (+0000)
Subject: Change the name to SQLITE_DBSTATUS_TEMPBUF_SPILL.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8f6b797a1b74aa6f8831171cb6c6db32c2682b03;p=thirdparty%2Fsqlite.git
Change the name to SQLITE_DBSTATUS_TEMPBUF_SPILL.
FossilOrigin-Name: 4a60a9c63534f5d2f16af2c3c6581abe7ecf7adfdb39f17e557e73997ae03396
---
diff --git a/manifest b/manifest
index 767b734bd4..18b1576ffa 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sdbstatus-spill\sbranch
-D 2025-09-29T18:48:00.358
+C Change\sthe\sname\sto\sSQLITE_DBSTATUS_TEMPBUF_SPILL.
+D 2025-09-29T19:57:43.996
F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -648,7 +648,7 @@ F ext/wasm/sql/000-mandelbrot.sql 775337a4b80938ac8146aedf88808282f04d02d983d826
F ext/wasm/sql/001-sudoku.sql 35b7cb7239ba5d5f193bc05ec379bcf66891bce6f2a5b3879f2f78d0917299b5
F ext/wasm/test-opfs-vfs.html 1f2d672f3f3fce810dfd48a8d56914aba22e45c6834e262555e685bce3da8c3f
F ext/wasm/test-opfs-vfs.js 1618670e466f424aa289859fe0ec8ded223e42e9e69b5c851f809baaaca1a00c
-F ext/wasm/tester1-worker.c-pp.html 883881eeac14eeeecc8ff22acf9fe0f18a97cacb48be08ebb0bae891ceded584 w ext/wasm/tester1-worker.html
+F ext/wasm/tester1-worker.c-pp.html 883881eeac14eeeecc8ff22acf9fe0f18a97cacb48be08ebb0bae891ceded584
F ext/wasm/tester1.c-pp.html 949920126dcf477925d8d540093d9cc374d3ab4c4ddee920c1dcadcf37917306
F ext/wasm/tester1.c-pp.js 23fc1223e75228f054148eeb8469ad114e9b2881b9f437fa291b8da06d021ce3
F ext/wasm/tests/opfs/concurrency/index.html 657578a6e9ce1e9b8be951549ed93a6a471f4520a99e5b545928668f4285fb5e
@@ -737,13 +737,13 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
F src/resolve.c f8d1d011aba0964ff1bdccd049d4d2c2fec217efd90d202a4bb775e926b2c25d
F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
F src/select.c b95181711d59c36d9789e67f76c4cfec64b99f9629a50be5e6566e117b87d957
-F src/shell.c.in cfe13eb367679f21eae6534280ca43da5ea8393f89cc1e8b070c9a935ab886e5
-F src/sqlite.h.in 9fca8150225467bef7a1c378f00f5ef8f795e20cb450df67f82963e62fafcbe3
+F src/shell.c.in 944385e810b405d1d4909ff3d9fd6878459109d766487de57c5476fc636a1f5d
+F src/sqlite.h.in be2291e90d8327107c5806c8044e465a6c2ef57e0ba323cce33b733f7f009f39
F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
F src/sqlite3ext.h 3f0c4ed6934e7309a61c6f3c30f70a30a5b869f785bb3d9f721a36c5e4359126
F src/sqliteInt.h ff99ddb847558f9a087eceb93909fd1e9644f3397fffdcf7a26cc3ffa82b0c78
F src/sqliteLimit.h fe70bd8983e5d317a264f2ea97473b359faf3ebb0827877a76813f5cf0cdc364
-F src/status.c 34ccabc1bca527e800c1924fb926aa09b5828605c1431a4cf0eb5b8a549982b0
+F src/status.c d19dea65cdd7005b5a05a28949b9bf3c6b3922defd07957bdd97178e11a44aaa
F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
F src/tclsqlite.c 3c604c49e6cf4211960a9ddb9505280fd22cde32175f40884c641c0f5a286036
F src/tclsqlite.h 614b3780a62522bc9f8f2b9fb22689e8009958e7aa77e572d0f3149050af348a
@@ -772,7 +772,7 @@ F src/test_intarray.c 3fcf8ca7bb5c8776ea83f6aa9b66f8df0d1f37a99207b0097c8486f9c1
F src/test_intarray.h 6c3534641108cd1bea517a8e117dcba237081310a29a4c35bd2190caa8972293
F src/test_journal.c a0b9709b2f12b1ec819eea8a1176f283bca6d688a6d4a502bd6fd79786f4e287
F src/test_loadext.c 337056bae59f80b9eb00ba82088b39d0f4fe6dfd
-F src/test_malloc.c 50966e2967750115c4d06b6943c64da552577e4f3d060e6953efed8d66aff2c4
+F src/test_malloc.c 55e2b5398f6e184300d91278b8a84768f6a740735adc030411181945d5276da0
F src/test_md5.c 811a45330c9391933360f998156a8907ee29909c828ab83ac05d329942cbea8f
F src/test_multiplex.c 82f0aa8eee629b6949782cfab8782ed35a9b56dc80d12877af52147f304d22b8
F src/test_multiplex.h f0ff5b6f4462bfd46dac165d6375b9530d08089b7bcbe75e88e0926110db5363
@@ -1038,7 +1038,7 @@ F test/dblwidth-a.sql eb4141518610e52f931a55a984310075e98dc31eee5a28ae806b1e3537
F test/dbpage.test 63fab1eb026bada121107e53436fa749bbf83281dc9dea17af422f7a5c0f289f
F test/dbpagefault.test ea39de2ca86041a9c6df1135645180a76d0a8da93ac159e2fafe38e39636530b
F test/dbstatus.test 4a4221a883025ffd39696b3d1b3910b928fb097d77e671351acb35f3aed42759
-F test/dbstatus2.test b9c73a59b6f5abd8de6086550114a3ee3228ef13888756e8f074d9b9264ddbaa
+F test/dbstatus2.test 28dffdc7c7b700c04fdf4f237e7e46eef4b0ead28879434358d161e45f5fc875
F test/decimal.test a11b87a2c3294eb4c11b55f3168aeac63d683fa8ada35921a6ec1d511eff7648
F test/default.test c7124864cded213a3f118bc7e2e26f34b7c36dfa26cf6945cc8b7f5db1191277
F test/delete.test 2686e1c98d552ef37d79ad55b17b93fe96fad9737786917ce3839767f734c48f
@@ -2169,8 +2169,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 4c1118ba40172af61d9304dec7a9c7344566e6a5963a317880ad232bebb40176 ae303dab2f534e2c5132112b61fa5a097e7010fd8b652badee669fbe9df5cf53
-R 8e867532a4eb31d2511af86b87eb92ea
+P cb604efdb40da95a759e2eeb9d73608859a94acde9d9782ca82757d3a1c15303
+R 44a17949ad19c28e191bb515d6911a97
U drh
-Z 8098974d574c7d6df358efb09ed78cae
+Z 1a3aee299427390bc288bdacd51b5191
# Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 0060e551e9..5045c332e5 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cb604efdb40da95a759e2eeb9d73608859a94acde9d9782ca82757d3a1c15303
+4a60a9c63534f5d2f16af2c3c6581abe7ecf7adfdb39f17e557e73997ae03396
diff --git a/src/shell.c.in b/src/shell.c.in
index c58c5d7394..2bc03e7279 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -3505,7 +3505,8 @@ static int display_stats(
sqlite3_fprintf(out,
"Page cache misses: %d\n", iCur);
iHiwtr64 = iCur64 = -1;
- sqlite3_db_status64(db, SQLITE_DBSTATUS_SPILL, &iCur64, &iHiwtr64, 0);
+ sqlite3_db_status64(db, SQLITE_DBSTATUS_TEMPBUF_SPILL, &iCur64, &iHiwtr64,
+ 0);
iHiwtr = iCur = -1;
sqlite3_db_status(db, SQLITE_DBSTATUS_CACHE_WRITE, &iCur, &iHiwtr, 1);
sqlite3_fprintf(out,
@@ -3516,7 +3517,8 @@ static int display_stats(
"Page cache spills: %d\n", iCur);
sqlite3_fprintf(out,
"Temporary data spilled to disk: %lld\n", iCur64);
- sqlite3_db_status64(db, SQLITE_DBSTATUS_SPILL, &iCur64, &iHiwtr64, 1);
+ sqlite3_db_status64(db, SQLITE_DBSTATUS_TEMPBUF_SPILL, &iCur64, &iHiwtr64,
+ 1);
iHiwtr = iCur = -1;
sqlite3_db_status(db, SQLITE_DBSTATUS_SCHEMA_USED, &iCur, &iHiwtr, bReset);
sqlite3_fprintf(out,
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 2bf16be3b2..ecf499a8cc 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -9031,8 +9031,8 @@ int sqlite3_db_status64(sqlite3*,int,sqlite3_int64*,sqlite3_int64*,int);
** highwater mark associated with SQLITE_DBSTATUS_CACHE_WRITE is always 0.
**
** ^(There is overlap between the quantities measured by this parameter
-** (SQLITE_DBSTATUS_CACHE_WRITE) and SQLITE_DBSTATUS_SPILL. Resetting one
-** will reduce the other.)^
+** (SQLITE_DBSTATUS_CACHE_WRITE) and SQLITE_DBSTATUS_TEMPBUF_SPILL.
+** Resetting one will reduce the other.)^
**
**
** [[SQLITE_DBSTATUS_CACHE_SPILL]] ^(
SQLITE_DBSTATUS_CACHE_SPILL
@@ -9049,7 +9049,7 @@ int sqlite3_db_status64(sqlite3*,int,sqlite3_int64*,sqlite3_int64*,int);
** all foreign key constraints (deferred or immediate) have been
** resolved.)^ ^The highwater mark is always 0.
**
-** [[SQLITE_DBSTATUS_SPILL] ^(SQLITE_DBSTATUS_SPILL
+** [[SQLITE_DBSTATUS_TEMPBUF_SPILL] ^(SQLITE_DBSTATUS_TEMPBUF_SPILL
** ^(This parameter returns the number of bytes written to temporary
** files on disk that could have been kept in memory had sufficient memory
** been available. This value includes writes to intermediate tables that
@@ -9058,8 +9058,8 @@ int sqlite3_db_status64(sqlite3*,int,sqlite3_int64*,sqlite3_int64*,int);
** ^The highwater mark is always 0.
**
** ^(There is overlap between the quantities measured by this parameter
-** (SQLITE_DBSTATUS_SPILL) and SQLITE_DBSTATUS_CACHE_WRITE. Resetting one
-** will reduce the other.)^
+** (SQLITE_DBSTATUS_TEMPBUF_SPILL) and SQLITE_DBSTATUS_CACHE_WRITE.
+** Resetting one will reduce the other.)^
**
**
*/
@@ -9076,7 +9076,7 @@ int sqlite3_db_status64(sqlite3*,int,sqlite3_int64*,sqlite3_int64*,int);
#define SQLITE_DBSTATUS_DEFERRED_FKS 10
#define SQLITE_DBSTATUS_CACHE_USED_SHARED 11
#define SQLITE_DBSTATUS_CACHE_SPILL 12
-#define SQLITE_DBSTATUS_SPILL 13
+#define SQLITE_DBSTATUS_TEMPBUF_SPILL 13
#define SQLITE_DBSTATUS_MAX 13 /* Largest defined DBSTATUS */
diff --git a/src/status.c b/src/status.c
index 6f79fe36fc..5a64e68209 100644
--- a/src/status.c
+++ b/src/status.c
@@ -387,7 +387,7 @@ int sqlite3_db_status64(
** stored in memory, had sufficient memory been available.
** The *pHighwater is always set to zero.
*/
- case SQLITE_DBSTATUS_SPILL: {
+ case SQLITE_DBSTATUS_TEMPBUF_SPILL: {
u64 nRet = 0;
if( db->aDb[1].pBt ){
Pager *pPager = sqlite3BtreePager(db->aDb[1].pBt);
diff --git a/src/test_malloc.c b/src/test_malloc.c
index 1d1f9d04f8..68b2c367da 100644
--- a/src/test_malloc.c
+++ b/src/test_malloc.c
@@ -1368,7 +1368,7 @@ static int SQLITE_TCLAPI test_db_status(
{ "DEFERRED_FKS", SQLITE_DBSTATUS_DEFERRED_FKS },
{ "CACHE_USED_SHARED", SQLITE_DBSTATUS_CACHE_USED_SHARED },
{ "CACHE_SPILL", SQLITE_DBSTATUS_CACHE_SPILL },
- { "SPILL", SQLITE_DBSTATUS_SPILL },
+ { "TEMPBUF_SPILL", SQLITE_DBSTATUS_TEMPBUF_SPILL },
};
Tcl_Obj *pResult;
if( objc!=4 ){
diff --git a/test/dbstatus2.test b/test/dbstatus2.test
index cca606755e..d8cdc9609b 100644
--- a/test/dbstatus2.test
+++ b/test/dbstatus2.test
@@ -42,7 +42,7 @@ proc db_spill {db {reset 0}} {
}
proc db_temp_spill {db {reset 0}} {
- sqlite3_db_status $db SPILL $reset
+ sqlite3_db_status $db TEMPBUF_SPILL $reset
}
do_test 1.1 {