From: stephan Date: Mon, 1 Jan 2024 23:28:02 +0000 (+0000) Subject: Back out [99d11e6d0ae6] (enabling of STAT4 in WASM/JNI), per /chat discussion. X-Git-Tag: version-3.45.0~26 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fe1d8210c74f2c2b29867a0e1af7657fb2178d25;p=thirdparty%2Fsqlite.git Back out [99d11e6d0ae6] (enabling of STAT4 in WASM/JNI), per /chat discussion. FossilOrigin-Name: cd7929ee2e2c305475fa5a4dff2edaccf90067126ef04a1c2714cf464925453f --- diff --git a/ext/jni/src/c/sqlite3-jni.c b/ext/jni/src/c/sqlite3-jni.c index 64a2bef198..5deff19ef1 100644 --- a/ext/jni/src/c/sqlite3-jni.c +++ b/ext/jni/src/c/sqlite3-jni.c @@ -76,9 +76,6 @@ //#ifndef SQLITE_ENABLE_SESSION //# define SQLITE_ENABLE_SESSION 1 //#endif -#ifndef SQLITE_ENABLE_STAT4 -# define SQLITE_ENABLE_STAT4 1 -#endif #ifndef SQLITE_ENABLE_STMTVTAB # define SQLITE_ENABLE_STMTVTAB 1 #endif diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c index 23386c7c70..3e22c799c4 100644 --- a/ext/wasm/api/sqlite3-wasm.c +++ b/ext/wasm/api/sqlite3-wasm.c @@ -122,9 +122,6 @@ #ifndef SQLITE_ENABLE_SESSION # define SQLITE_ENABLE_SESSION 1 #endif -#ifndef SQLITE_ENABLE_STAT4 -# define SQLITE_ENABLE_STAT4 1 -#endif #ifndef SQLITE_ENABLE_STMTVTAB # define SQLITE_ENABLE_STMTVTAB 1 #endif diff --git a/manifest b/manifest index e29e682720..70fb81c936 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C New\slogic\sto\savoid\susing\sindexes\sthat\sANALYZE\shas\sidentified\sas\sof\slittle\npractical\suse.\s\sAlso\sa\sperformance\soptimization\sin\sANALYZE. -D 2024-01-01T19:20:00.840 +C Back\sout\s[99d11e6d0ae6]\s(enabling\sof\sSTAT4\sin\sWASM/JNI),\sper\s/chat\sdiscussion. +D 2024-01-01T23:28:02.565 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -251,7 +251,7 @@ F ext/icu/sqliteicu.h fa373836ed5a1ee7478bdf8a1650689294e41d0c89c1daab26e9ae78a3 F ext/jni/GNUmakefile 59eb05f2a363bdfac8d15d66bed624bfe1ff289229184f3861b95f98a19cf4b2 F ext/jni/README.md d899789a9082a07b99bf30b1bbb6204ae57c060efcaa634536fa669323918f42 F ext/jni/jar-dist.make 030aaa4ae71dd86e4ec5e7c1e6cd86f9dfa47c4592c070d2e35157e42498e1fa -F ext/jni/src/c/sqlite3-jni.c a477b2d0216550cdd6f248c92e4fd666ec2177a350a67417e0b5b9840f52e1c5 +F ext/jni/src/c/sqlite3-jni.c c1292e690a20c7787a63e8d8ac6e2dfed49c97282ed056a7cfda5da461f0b7d8 F ext/jni/src/c/sqlite3-jni.h 913ab8e8fee432ae40f0e387c8231118d17053714703f5ded18202912a8a3fbf F ext/jni/src/org/sqlite/jni/annotation/Experimental.java 8603498634e41d0f7c70f661f64e05df64376562ea8f126829fd1e0cdd47e82b F ext/jni/src/org/sqlite/jni/annotation/NotNull.java 38e7e58a69b26dc100e458b31dfa3b2a7d67bc36d051325526ef1987d5bc8a24 @@ -602,7 +602,7 @@ F ext/wasm/api/sqlite3-opfs-async-proxy.js 8cf8a897726f14071fae6be6648125162b256 F ext/wasm/api/sqlite3-v-helper.js 7daa0eab0a513a25b05e9abae7b5beaaa39209b3ed12f86aeae9ef8d2719ed25 F ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js 595953994aa3ae2287c889c4da39ab3d6f17b6461ecf4bec334b7a3faafddb02 F ext/wasm/api/sqlite3-vfs-opfs.c-pp.js 46c4afa6c50d7369252c104f274ad977a97e91ccfafc38b400fe36e90bdda88e -F ext/wasm/api/sqlite3-wasm.c dbaefda7981050bf9eb413f5b24df648ead09d9a3e796f9ba84d87cb49b5ab80 +F ext/wasm/api/sqlite3-wasm.c f280d4ea917d213ae95668dfcd173a2c2ef21a0a4bf9aeb9fcd0edaf1b21ba4b F ext/wasm/api/sqlite3-worker1-promiser.c-pp.js f234191fe6bf41a5a1e59c9f43ed816e74a522b3d60d3f556f66c3085c448503 F ext/wasm/api/sqlite3-worker1.c-pp.js 5e8706c2c4af2a57fbcdc02f4e7ef79869971bc21bb8ede777687786ce1c92d5 F ext/wasm/batch-runner-sahpool.html e9a38fdeb36a13eac7b50241dfe7ae066fe3f51f5c0b0151e7baee5fce0d07a7 @@ -2156,9 +2156,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P dc501275fcfab3ad9b6ebbadf7588b225a9dd07a0abac5be83d96f15bfba99e9 5527e8c4abb904b1a438ec1c353d4a960bf82faaf3a2c742af1df7c613850441 -R a1cdb8f6aed6a59edfbfbd0410b4be3d -T +closed 5527e8c4abb904b1a438ec1c353d4a960bf82faaf3a2c742af1df7c613850441 -U drh -Z c24671fca6074048f0170b6af71946ea +P bcac937526d9a6ef914a74b4d6757fa91cd74edab871bcd934fde4a2f9b6debd +Q -99d11e6d0ae687ff6bac5119027f7b04d5e7185214e79cf8c56289cfa809b0f9 +R 3bfcbade7baedb397a7149e377c6dcbb +U stephan +Z 7c711e37eafa39916defd330fece0ca3 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 065eb7a539..bf4d9238f0 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -bcac937526d9a6ef914a74b4d6757fa91cd74edab871bcd934fde4a2f9b6debd \ No newline at end of file +cd7929ee2e2c305475fa5a4dff2edaccf90067126ef04a1c2714cf464925453f \ No newline at end of file