From: drh <>
Date: Thu, 27 Oct 2022 14:28:15 +0000 (+0000)
Subject: Automatically set temp_store=MEMORY if the VFS is kvvfs.
X-Git-Tag: version-3.40.0~79
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd6080637c02986f45dd510aff68a96104339b53;p=thirdparty%2Fsqlite.git

Automatically set temp_store=MEMORY if the VFS is kvvfs.

FossilOrigin-Name: a4d40f6346e7eb2a5239684dba86f297358122768a4d4bf6786b6028f4300e04
---

diff --git a/manifest b/manifest
index a40fd6acf7..04ff339ed7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\saccept\sa\sNULL\spointer\sfor\sthe\sfilename\sin\sKVVFS.
-D 2022-10-27T14:00:21.740
+C Automatically\sset\stemp_store=MEMORY\sif\sthe\sVFS\sis\skvvfs.
+D 2022-10-27T14:28:15.302
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -598,7 +598,7 @@ F src/insert.c b972b1642cd0f7d5ae4964d713b65158a7bfa6a6e8786a9e8e57bd9c0b4a896d
 F src/json.c 7749b98c62f691697c7ee536b570c744c0583cab4a89200fdd0fc2aa8cc8cbd6
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 8086232d10e51e183a7f64199815bad1c579896354db69435347665f62f481e9
-F src/main.c b434b8e4aca38419962de3d1c55fb9279807ba6a8802998a427b1635dc8250f6
+F src/main.c 5bf12aca926324eb804de3f38e5231ccd68e238f640c45dadd9756c96a2817af
 F src/malloc.c dfddca1e163496c0a10250cedeafaf56dff47673e0f15888fb0925340a8e3f90
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@ -2052,8 +2052,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P fc5503c8acb085042e877c9de43256a4fee27f63ab35e2ddad18e40734ed00d4
-R 6cb19b2a6a261de50cb8a948672510cf
+P fdecbd3b5bcdeb358015f461ac6c863f12ab180ab4624ed50734e41e557d8186
+R dfc4ed13a64515196293181db6b5de60
 U drh
-Z 79b8e8e87ee4d06cb8ce6f55cae0e30f
+Z 98eb6601307a798f1c90903f8afb0012
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 0445a8d662..f771feb37a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fdecbd3b5bcdeb358015f461ac6c863f12ab180ab4624ed50734e41e557d8186
\ No newline at end of file
+a4d40f6346e7eb2a5239684dba86f297358122768a4d4bf6786b6028f4300e04
\ No newline at end of file
diff --git a/src/main.c b/src/main.c
index e73fe351ca..646683558d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -3395,6 +3395,12 @@ static int openDatabase(
     sqlite3_free(zErrMsg);
     goto opendb_out;
   }
+  assert( db->pVfs!=0 );
+#if defined(SQLITE_OS_KV) || defined(SQLITE_OS_KV_OPTIONAL)
+  if( sqlite3_stricmp(db->pVfs->zName, "kvvfs")==0 ){
+    db->temp_store = 2;
+  }
+#endif
 
   /* Open the backend database driver */
   rc = sqlite3BtreeOpen(db->pVfs, zOpen, db, &db->aDb[0].pBt, 0,