From: stephan Date: Mon, 23 May 2022 01:11:49 +0000 (+0000) Subject: WASM: removed the in64-related bindings, as MDN says that calling a wasm function... X-Git-Tag: version-3.39.0~116 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=71eacead7644d5bcbc1abfbaa022852998b84ae5;p=thirdparty%2Fsqlite.git WASM: removed the in64-related bindings, as MDN says that calling a wasm function which has an int64 type in its signature will currently throw because JS has no 64-bit integer support. Those bindings now use doubles and simply hope that the user doesn't exceed their integer precision (2^53-1, approx 9 quadrillion). FossilOrigin-Name: 392e84828275ec203bc713d3a5d4790852add57539add6b29b5f6de1da2dc97a --- diff --git a/ext/fiddle/sqlite3-api.js b/ext/fiddle/sqlite3-api.js index a8a697301f..1a07e6d544 100644 --- a/ext/fiddle/sqlite3-api.js +++ b/ext/fiddle/sqlite3-api.js @@ -11,8 +11,8 @@ *********************************************************************** This file is intended to be loaded after loading sqlite3.wasm. It - sets one of any number of potential bindings using that API, this - one as closely matching the C-native API as is feasible. + sets up one of any number of potential bindings using that API, this + one as closely matching the C-native API as is feasible in JS. Note that this file is not named sqlite3.js because that file gets generated by emscripten as the JS-glue counterpart of sqlite3.wasm. @@ -49,7 +49,17 @@ - Except where noted in the non-goals, provide a more-or-less complete wrapper to the sqlite3 C API, insofar as WASM feature - parity with C allows for. + parity with C allows for. In fact, provide at least 3... + + - (1) The aforementioned C-style API. (2) An OO-style API on + top of that, designed to run in the same thread (main window or + Web Worker) as the C API. (3) A less-capable wrapper which can + work across the main window/worker boundary, where the sqlite3 API + is one of those and this wrapper is in the other. That + constellation places some considerable limitations on how the API + can be interacted with, but keeping the DB operations out of the + UI thread is generally desirable. + Non-goals: @@ -58,6 +68,9 @@ UTF16-related APIs will not be. They would add a complication to the bindings for no appreciable benefit. + - Supporting old or niche-market platforms. WASM is built for a + modern web and requires modern platforms. + */ (function(namespace){ /* For reference: sql.js does essentially everything we want and @@ -150,8 +163,8 @@ ["sqlite3_bind_blob","number",["number", "number", "number", "number", "number"]], ["sqlite3_bind_double","number",["number", "number", "number"]], ["sqlite3_bind_int","number",["number", "number", "number"]], - [/*Noting that wasm does not currently support 64-bit integers:*/ - "sqlite3_bind_int64","number",["number", "number", "number"]], + /*Noting that JS/wasm combo does not currently support 64-bit integers: + ["sqlite3_bind_int64","number",["number", "number", "number"]],*/ ["sqlite3_bind_null","void",["number"]], ["sqlite3_bind_parameter_count", "number", ["number"]], ["sqlite3_bind_parameter_index","number",["number", "string"]], @@ -165,8 +178,8 @@ ["sqlite3_column_count","number",["number"]], ["sqlite3_column_double","number",["number", "number"]], ["sqlite3_column_int","number",["number", "number"]], - [/*Noting that wasm does not currently support 64-bit integers:*/ - "sqlite3_column_int64","number",["number", "number"]], + /*Noting that JS/wasm combo does not currently support 64-bit integers: + ["sqlite3_column_int64","number",["number", "number"]],*/ ["sqlite3_column_name","string",["number", "number"]], ["sqlite3_column_text","string",["number", "number"]], ["sqlite3_column_type","number",["number", "number"]], @@ -661,7 +674,9 @@ case BindTypes.number: { const m = ((val === (val|0)) ? ((val & 0x00000000/*>32 bits*/) - ? S.sqlite3_bind_int64 + ? S.sqlite3_bind_double + /*It's illegal to bind a 64-bit int + from here*/ : S.sqlite3_bind_int) : S.sqlite3_bind_double); rc = m(stmt._pStmt, ndx, val); @@ -761,13 +776,17 @@ - null or undefined is bound as NULL. - - Numbers are bound as either doubles or integers: int64 if - they are larger than 0xEFFFFFFF, else int32. Booleans are - bound as integer 0 or 1. Note that doubles with no - fractional part are bound as integers. It is not expected - that that distinction is significant for the majority of - clients due to sqlite3's data typing model. This API does - not currently support the BigInt type. + - Numbers are bound as either doubles or integers: doubles + if they are larger than 32 bits, else double or int32, + depending on whether they have a fractional part. (It is, + as of this writing, illegal to call (from JS) a WASM + function which either takes or returns an int64.) + Booleans are bound as integer 0 or 1. It is not expected + the distinction of binding doubles which have no + fractional parts is integers is significant for the + majority of clients due to sqlite3's data typing + model. This API does not currently support the BigInt + type. - Strings are bound as strings (use bindAsBlob() to force blob binding). @@ -929,8 +948,11 @@ switch(undefined===asType ? S.sqlite3_column_type(this._pStmt, ndx) : asType){ - case S.SQLITE_INTEGER: - return S.sqlite3_column_int64(this._pStmt, ndx); + case S.SQLITE_INTEGER:{ + return 0 | S.sqlite3_column_double(this._pStmt, ndx); + /* ^^^^^^^^ strips any fractional part and handles + handles >32bits */ + } case S.SQLITE_FLOAT: return S.sqlite3_column_double(this._pStmt, ndx); case S.SQLITE_TEXT: diff --git a/manifest b/manifest index aff1814a5b..6fcf363395 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C WASM:\san\sarg\shandling\sfix\sfor\sDB.exec({multi:true...}). -D 2022-05-22T22:10:38.293 +C WASM:\sremoved\sthe\sin64-related\sbindings,\sas\sMDN\ssays\sthat\scalling\sa\swasm\sfunction\swhich\shas\san\sint64\stype\sin\sits\ssignature\swill\scurrently\sthrow\sbecause\sJS\shas\sno\s64-bit\sinteger\ssupport.\sThose\sbindings\snow\suse\sdoubles\sand\ssimply\shope\sthat\sthe\suser\sdoesn't\sexceed\stheir\sinteger\sprecision\s(2^53-1,\sapprox\s9\squadrillion). +D 2022-05-23T01:11:49.315 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -64,7 +64,7 @@ F ext/fiddle/fiddle-worker.js c22557b641b47fa1473d3465a4e69fe06b8b09b924955805a4 F ext/fiddle/fiddle.html 657c6c3f860c322fba3c69fa4f7a1209e2d2ce44b4bc65a3e154e3a97c047a7c F ext/fiddle/fiddle.js f9c79164428e96a5909532f18a8bc8f8c8ec4f738bfc09ad3d2a532c2400f9f0 F ext/fiddle/index.md d9c1c308d8074341bc3b11d1d39073cd77754cb3ca9aeb949f23fdd8323d81cf -F ext/fiddle/sqlite3-api.js bf8d382e79ad0b2131734a823a84c530f8115a4265f00dc937a4daca6b20faa9 +F ext/fiddle/sqlite3-api.js afe0b37b579bcc4feaadb6a3a69ed8e9d0d51fd93b3214a00505492b8d1f5ace F ext/fiddle/testing-common.js 53284264504821314f052017b54fa75ab065dcd9cbb754cc8060930498faeee8 F ext/fiddle/testing1.html 68cec1b1c8646a071717e5979f22e4268e6d36d96ba13ad68333351acdbcf1d1 F ext/fiddle/testing1.js d28af2b33a9c1c47668bc74b3b7d4198012a4c62e25dd35550794fcc26be3057 @@ -1967,8 +1967,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 b790c91b85e9cf8eecce86ac1717e8ccd2c3b6b98a1ad6a5d64eefc94ee86f9d -R d56953962e2ee4ada32fbd2e80f7b019 +P 0d6332f706ec5c34cc6a9ff79878f4e10a9ad81b24cc7d743b52168586285811 +R 79562a6f4ad568e3ba19c4e1026944bf U stephan -Z 371bcc2e2a7bddeb441dadf34f671698 +Z 5fc9a3781b7c2550ee7ad879a95eb45a # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index abb2f5111a..7b8ebbf8bd 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -0d6332f706ec5c34cc6a9ff79878f4e10a9ad81b24cc7d743b52168586285811 \ No newline at end of file +392e84828275ec203bc713d3a5d4790852add57539add6b29b5f6de1da2dc97a \ No newline at end of file