From: stephan <stephan@noemail.net>
Date: Fri, 2 Dec 2022 08:38:04 +0000 (+0000)
Subject: Roll back the SQLITE_DEFAULT_PAGE_SIZE part of [c260895faacb34] because kvvfs does... 
X-Git-Tag: version-3.41.0~332
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=20f0128acc16b44519933d0ab6ff9373b647227f;p=thirdparty%2Fsqlite.git

Roll back the SQLITE_DEFAULT_PAGE_SIZE part of [c260895faacb34] because kvvfs does not work at all with a page size of 8kb.

FossilOrigin-Name: 7eec635562f65592121d7ff0a31a7b4ff6cdfe38e657f326302ef851b3b37c3f
---

diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index 1edaec390a..0e8aabd1a5 100644
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -65,10 +65,13 @@
 # define SQLITE_DEFAULT_CACHE_SIZE -16384
 #endif
 #if !defined(SQLITE_DEFAULT_PAGE_SIZE)
-/* OPFS performance is improved with a page size of 8k instead
-** of 4k. kvvfs, OTOH, likely suffers from that. Peformance
-** with 16k is equivalent to 8k. */
-# define SQLITE_DEFAULT_PAGE_SIZE 8196 /*4096*/
+/*
+** OPFS performance is improved with a page size of 8kb instead of
+** 4kb. Performance with 16kb is equivalent to 8kb.
+**
+** However... kvvfs doesn't work at all with 8kb!
+*/
+# define SQLITE_DEFAULT_PAGE_SIZE 4096 /* 8196 */
 #endif
 #ifndef SQLITE_DEFAULT_UNIX_VFS
 # define SQLITE_DEFAULT_UNIX_VFS "unix-none"
diff --git a/manifest b/manifest
index d8a09a5f4d..9d66ae5b1e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C sqlite3-wasm.c:\scode\slegibility\sand\scoding\sstyle\stweaks.\sIncrease\sSQLITE_DEFAULT_PAGE_SIZE\sfrom\s4k\sto\s8k,\sas\sthat\simproves\sOPFS\sspeedtest1\sperformance\sby\sroughly\s12%.
-D 2022-12-02T08:29:03.564
+C Roll\sback\sthe\sSQLITE_DEFAULT_PAGE_SIZE\spart\sof\s[c260895faacb34]\sbecause\skvvfs\sdoes\snot\swork\sat\sall\swith\sa\spage\ssize\sof\s8kb.
+D 2022-12-02T08:38:04.930
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -512,7 +512,7 @@ F ext/wasm/api/sqlite3-opfs-async-proxy.js 9963c78bf6e5ccb5ba28e8597851bd9d980e8
 F ext/wasm/api/sqlite3-vfs-helper.js 4ad4faf02e1524bf0296be8452c00b5708dce6faf649468d0377e26a0b299263
 F ext/wasm/api/sqlite3-vfs-opfs.c-pp.js 654f37fd6312d3bb0d067b21ad42f9dcfd629fd34ace892e67e06143a65dc6d0
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c 3fb517065417bfddf9f49b73cf1f8af1d8d50fbb295c484e77359e5ed6e14a21
+F ext/wasm/api/sqlite3-wasm.c 4ee44cc6934a4aa904c7f70043c33a560dfa369bea10cafd505ded15aadd8692
 F ext/wasm/api/sqlite3-worker1-promiser.js 0c7a9826dbf82a5ed4e4f7bf7816e825a52aff253afbf3350431f5773faf0e4b
 F ext/wasm/api/sqlite3-worker1.js 1e54ea3d540161bcfb2100368a2fc0cad871a207b8336afee1c445715851ec54
 F ext/wasm/batch-runner.html 4deeed44fe41496dc6898d9fb17938ea3291f40f4bfb977e29d0cef96fbbe4c8
@@ -2065,8 +2065,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 75f610d3a4cf3d972220f9abc27cdf5990451e3835ceb9cf66973934004dfc5c
-R 476dae20eba5ae2d14fd70169918f0cd
+P c260895faacb3458c557778630756d02a8520c0f1864bddcf86cdd27ef4a42bd
+R 8883779dc6cb9fbc583e811dbb56f056
 U stephan
-Z e6e64ad365153ec68f24a3bd7c94c825
+Z eb61cb45b5ecf451015b257eeb20fb82
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index cdd727ce41..84dc7436da 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c260895faacb3458c557778630756d02a8520c0f1864bddcf86cdd27ef4a42bd
\ No newline at end of file
+7eec635562f65592121d7ff0a31a7b4ff6cdfe38e657f326302ef851b3b37c3f
\ No newline at end of file