mirror of
https://github.com/tursodatabase/libsql.git
synced 2025-05-13 05:53:15 +00:00
* Remove unused elements from the json_tree() cursor. FossilOrigin-Name: 914a50117d477b2cd30d58388fb8d1b71ff7ff6842ba025f38efc6e9647d06d0 * Same results as the legacy JsonNode implementation on a small set of test cases. FossilOrigin-Name: c3da4b079a1a15a4c0b1a6e71f876648b1d9eb32eddc67b9946c2475c7b6d085 * Fix corner-case error conditions. FossilOrigin-Name: ec23d34ab75e1d7e9366e59c633e0d30def8759f6d4717583ebeb4c90aeccf0d * All tests passing. FossilOrigin-Name: b5a5660ca22437640c9bf32c44d92c76a7293dafcbaf4fa6a4c171128d64871d * Give the json_valid() function an optional second argument that determines what is meant by "valid". FossilOrigin-Name: a4e19ad43dac81e7655ec03ff69bb99d1d02b0c227034c90fb41415fd4793fe3 * Enhance the (SQLITE_DEBUG-only) json_parse() routine so that it shows a decoding of JSONB when given a BLOB argument. FossilOrigin-Name: af267868562e0799ad691dccad05f17afbc34d609eede8c55f57d209290246ef * In SQLITE_ENABLE_SETLK_TIMEOUT builds, use blocking locks in place of sleep() when opening a read-transaction. FossilOrigin-Name: a51ef39998e25e86bd0600e71d15011b12e05f4319608018293bdaecb09e8c97 * Have SQLITE_ENABLE_SETLK_TIMEOUT builds block when locking a read-lock slot. FossilOrigin-Name: f797baf47cf7859cfd8ce248f4f3087af4551a7040af990333426e5a7c269504 * Add untested (#ifdefed-out) code for the MergePatch algorithm against JSONB. Add (and test) the jsonBlobEdit() routine that is needed by the new MergePatch. FossilOrigin-Name: 4d353387fc10e1038cfdd86e66007bf728c231a928e588897bbee0fbfe76f225 * More aggressive use of jsonBlobEdit(). Improvements to the MergePatch implementation sketch. FossilOrigin-Name: fbca9570fd2e1465739e4d3a8d9bb40fad594fd78ab49b2cb34efa27ebdd8361 * The json_patch() code for JSONB compiles and works sometimes, but there are still issues. Incremental check-in. FossilOrigin-Name: e0099464a0045a04f4ccf29bc2b8325fc8c7f39ccf4847e74818f928c9153588 * All legacy tests are passing. FossilOrigin-Name: 2c436806b8d5f57de99c00f6154b038454fb9ae427d00d7b4a46ab9c7c69bcb9 * Handle an SQLITE_BUSY_TIMEOUT error if one occurs while attempting a shared lock on a read-lock slot. FossilOrigin-Name: 5fbf3906d272df3eb981f67455eb35f649ad2774cba9fc3f077b28d9bef3f0cb * The json_remove() function now uses only JSONB, never JsonNodes, internally. FossilOrigin-Name: b69786e746ae2b927b64d9871fd120b7f8f06cc53739fd46a4da51aa16cf8576 * Attempt to get json_extract() working with pure JSONB only, and without the use of JsonNode. Mostly working, but there are some differences from legacy in corner cases. FossilOrigin-Name: 8c324af1eca27e86adc45622af4f3b06a67a3f968596ac58aa7434b1f6f05f3c * Preserve flexibility in the format of the RHS of -> and ->> operators found in legacy. FossilOrigin-Name: 6231ec43adb7436195eb1497de39a6c13c6b4f1c5032e6ea52515d214e61fdbc * Do not set the J subtype when the output is JSONB. FossilOrigin-Name: 4f106b64fe8988435872806bd0a6c223b61f53af0dd1c47c847bb4eec4e03e27 * Convert the json_array_length() function to use JSONB instead of JsonNodes. FossilOrigin-Name: 5ab790736d943e08f097efcee5cfbf0d83c65b0a53f273060330ba719affa5e5 * The assertion change at check-in [7946c79567b0ccd3] is insufficient to fix the problem of a Table object being deleted out from under the OP_VCheck opcode. We need to reference count the Table, which is accomplished here. FossilOrigin-Name: cad269d5e274443c39203a56603b991accc0399135d436996fc039d1d28ec9db * In the recovery extension, if a payload size is unreasonably large, it is probably corrupt, so truncate it. FossilOrigin-Name: 988c3179e978a3a6d42541e9c7a2ab98150383671810926503376ed808f150ff * Fix signed integer overflow in fts5. FossilOrigin-Name: 60e46c7ec68fd8caaed960ca06d98fb06855b2d0bb860dd2fb7b5e89a5e9c7b4 * The json_patch() function now operates exclusively on JSONB. This patch also includes improvements to JSONB debug printing routines. FossilOrigin-Name: fee19d0098242110d2c44ec7b9620c1210ef3f87913305f66ec85d277dd96ab6 * Convert the json_error_position() routine to use only JSONB internally. FossilOrigin-Name: e7a8ba35bff6fde55827f978de5b343b6c134c7fa53827f5c63915a9dc2598ad * Convert json_insert(), json_replace(), json_set() to use JSONB internally. Mostly working, but some corner cases are still not quite right. FossilOrigin-Name: 99c8f6bd5c9a31b6d00f92e383bec8a8235ed553916ad59adbb1b7663f6ebff1 * Update some OPFS-related help text in WASM tests. Minor cleanups in speedtest1-worker.js. FossilOrigin-Name: 263f6d3a7784ef7d032dbf7a3265aca8dd70bf50797f28f6b2e8ddb6a301f83a * New test cases for insert/set/replace with paths that indicate substructure that does not yet exist. FossilOrigin-Name: 146c717c51940b2139befc45ac74e7a1c36ef3c32fd3cfe35b334488eebe6298 * New JSON test cases showing insert or set with missing substructure. FossilOrigin-Name: 6802b6459d0d16c961ff41d240a6c88287f197d8f609090f79308707490a49c2 * Simplification of the new JSON insert/set test cases. FossilOrigin-Name: 04c0d5644372446c924a2e31a26edf51ddc563a1990d170b0ed4739e3e8b239b * Enhance json_set() and json_insert() so that they create missing substructure. FossilOrigin-Name: cc7a641ab5ae739d31c24f0ad0caeb15a481a63fa8f13720718ea922c25862ff * Convert json_type() to use JSONB internally. FossilOrigin-Name: 83074835b900ce85cf67059e674ce959801505c37592671af25ca0af7ed483f1 * Add a basic batch-mode SQL runner for the SAH Pool VFS, for use in comparing it against WebSQL. Bring the WebSQL batch runner up to date, noting that it cannot run without addition of an "origin trial" activation key from Google because that's now the only way to enable WebSQL in Chrome (that part is not checked in because that key is private). Minor code-adjacent cleanups. FossilOrigin-Name: 883990e7938c1f63906300a6113f0fadce143913b7c384e8aeb5f886f0be7c62 * Convert json_valid() over to using only JSONB as its internal format. FossilOrigin-Name: 7b5756fa6d00b093bf083a8d7a5ef5485f7a09e4eac473785c8380688f861a1b * Remove all trace of JsonNode from the JSON implementation. The JSONB format is used as the internal binary encoding for searching and editing. FossilOrigin-Name: 11ebb5f712cc7a515e2e0f2be8c1d71de20c97fe5b74c4f4d72c84fd21182d35 * First attempt to get the JSON text-to-binary cache working. All test cases pass, but the cache seems not to help much. FossilOrigin-Name: 25ed295f300fea6185104a73721076bccd2b2a6e411c78564266fa6dca4ff70c * Cache is working better, but does not preserve the hasJson5 flag. FossilOrigin-Name: a12add7ab9f5aee5bb2ede0c4d22e599dd28f7a107dce72b2ea48ef92d233e8a * Fix up the JSON cache to work better. FossilOrigin-Name: 1fdbc39521f63aedc6f08ecaafa54ea467b8c6316a692a18ad01eecbf22a0977 * Different approach to querying a tokendata=1 table. Saves cpu and memory. FossilOrigin-Name: c523f40895866e6fc979a26483dbea8206126b4bbdf4b73b77263c09e13c855e * Remove old code for tokendata=1 queries. FossilOrigin-Name: b0a489e8e1bf0290c2117ab32d78b1cc7d67bcb226b55ec044c8367ebde3815b * Performance optimization in the JSON parser. FossilOrigin-Name: 68d191f40e708962ec88e0c245b4496bc4a671300484b1cc0f3fc7e6d199a6e6 * Fix harmless compiler warnings and enhance performance the parser. FossilOrigin-Name: 285633da6d188547e52f07779e209c9e5f3dc33ce0668e14858f3337889ef4b8 * Unroll a loop in the parser for a performance increase. FossilOrigin-Name: a6dc29e4d5e13949e0fcd9d5dde575c2670eb10a230ab9df3806fc8c3016c540 * Remove a NEVER that can be true if a virtual table column is declared to have a DEFAULT. See [forum:/forumpost/3d4de8917627d058|forum post 3d4de8917627d058]. FossilOrigin-Name: 8abc2ccaf8106f20243568cd7fa74174386eb85d7ea381201e97e2fd527033e0 * Simplification and optimization of the JSON parser. FossilOrigin-Name: f5ec9485119a2a6cb33eb864c7ca9b41d4a2ed08ab6ad9a6b0dd9358ab253576 * Performance optimization in jsonAppendString(). FossilOrigin-Name: fdf00e96239c73fb67e2acecc5b95f55a1fc51c3deed4512613c0d6070ce5805 * Minor fix to the header comment on jsonXlateTextToBlob(). FossilOrigin-Name: c3677ba410208c07b711f5f526eb5cf039a8eee49f632c7ae04fa55cdfbb9058 * Fix potential unsigned integer underflow in jsonAppendString(). FossilOrigin-Name: d2fba2cbdc3870d34228c1a9446eced884325acc183900d7dd0b96132570fb4a * Do not allow a JsonParse object to be considered "editable" after an OOM. FossilOrigin-Name: c6bacf57bd6fe0fee00c9d41163a270b60997c20659949971bbf5c6c62622bfe * Protect a memcpy() against OOM conditions. FossilOrigin-Name: 26144d1c25ae0435db568009ba05e485d23d146f2b1f29f3a426c87860316aed * Ensure that tokendata=1 queries avoid loading large doclists for queries like "common AND uncommon", just as tokendata=0 queries do. FossilOrigin-Name: 7bda09ab404a110d57449e149a3281fca8dc4cacf7bd9832ea2a1356ad20fe8e * Take extra care to ensure that JSONB values that are in cache are actually owned by the JSON subsystem, and that ownership of such values is not handed back to the bytecode engine. FossilOrigin-Name: 1304534001e9ef66c6b12752b69d790bfa3427cc803f87cc48ca22ae12df0fdf * When tokendata=1 queries require multiple segment-cursors, allow those cursors to share a single array of in-memory tombstone pages. FossilOrigin-Name: e0175d07e4094db5ea4b0378a5ff480dafb6ba9da86a113fa767c4c89c3c866f * Fix harmless compiler warnings. Refactor some identifier names for clearer presentation. FossilOrigin-Name: 7e3941502789c5afaf19b08112f464abf5e3cba7f92fc9290af2a0f96127ad9a * Code and comment cleanup. Everything should work the same. FossilOrigin-Name: c640754df0d3ffdad994745f0d0e10c8f19f424b87f6a6e6e269491a0350b950 * Fix various compiler warnings and other problems with the new code on this branch. FossilOrigin-Name: 3a623cfa173b4035c759cb84985d11d8727053beb383648503987d6ab15c0ef0 * Fix harmless compiler warnings reported by MSVC. FossilOrigin-Name: 419652c0c82980bd043584dcd2976f91dfff7b926b216d597698299850b855c0 * Implement strict JSONB checking in the json_valid() function. FossilOrigin-Name: 0f26d38880fcbc207abcc94dbc170a7428bab1b4f0b7731aaf5bee0224000994 * Minor code changes for consistency and to simplify testing. FossilOrigin-Name: df272bd837910ad9e03e222716a1201a601399664365f1dcf73d5932372518ed * Do not let bad hexadecimal digits in malformed JSONB cause an assertion fault. FossilOrigin-Name: 8dec1ba1e5076ff596756e00c1e2ada0245f168a503dd1cadadf848331acfac3 * Enable incorrect JSONB to be rendered into text without hitting an assertion for a bad whitespace escape in a string. FossilOrigin-Name: 4d6a9a217df6792b41766b774fb0c0553b45f9104c26a0955bf4a30862d7d7bf * Ensure that OOM conditions in the generation of the "bad JSON path" error message result in an SQLITE_NOMEM error. FossilOrigin-Name: aa0e02b5c26a2ef3d6216a0ed8bc01382be43173485f898cb63f2a8c559f2e74 * Avoid problems when the path argument to json_tree() contains embedded U+0000 characters. FossilOrigin-Name: 9f055091af01a5dddba1a7e9868ad030c8f206237e1569215cb161e53e54aa71 * Remove dead code. Improved reporting of errors in JSON inputs. FossilOrigin-Name: 2eaa738e6b5c1b67b3e57c868d9c3a30eea38a0b3b8b02482f06d57a45b10921 * Back off on the use of strlen() for situations where sqlite3_value_bytes() will work as well, for performance. FossilOrigin-Name: 79fb54fbb8b9c30f47cdbd437d24a21542716241e822749e5e28c9fbc449bfa8 * Better pre-scan size estimations for objects in the JSON parser resulting in fewer reallocations and memmove operations. FossilOrigin-Name: 526b27f90897f5e35dfff7257daf6c4ce4798d649b09b8aecfb02df0449e3c51 * Repair issues and inefficiencies found during testing. FossilOrigin-Name: ae973cb1515f9d76409c92a2ca2ffd6b71f32b0b490a4886770e7c1b90f12611 * Add tests for using tokendata=1 and contentless_delete=1 together. FossilOrigin-Name: a2506b8c9718054912270055638204753c4156bbc115e55194e6df9d7e76cb10 * Two new NEVER macros. FossilOrigin-Name: 52632c92cb06faf0e804654b3490fd6c199521107bd30c8fcbc3a2a5a488098f * Remove reachable ALWAYS and NEVER macros. FossilOrigin-Name: f601de3eeabd85993c1f5ee96b62de6fdabbeae2fe8950e00d08feb48d42c498 * Fix bug in xInstToken() causing the wrong token to be returned. FossilOrigin-Name: da78d07e77cbc783fbc725758911c230fd6a1c1885d9576125de955dcc2bd37f * Continuing simplifications and code cleanup. FossilOrigin-Name: ddf92b5059a9106753fd18b82ba8daa269a62af947561c460790107b83416f0b * Fix a problem with the xInstCount() API and "ORDER BY rank" queries. FossilOrigin-Name: 317a50563d9e8586fda136e513727241b414e7267d50a06571c8ebd0eae710bc * Fix memory leak in new code on this branch. FossilOrigin-Name: ebc160b9a05568df66f86e30804399ee29d34b44a60c57e062f98cb92826353f * Fixes for xInstToken() with tokendata=0 tables. And with prefix queries. FossilOrigin-Name: 78fbb71598b1ca756acc078253880a1d0f7983a5a26b9efc683e6488122505a1 * Fix errors in rendering JSON5 escape sequences embedded in JSONB. FossilOrigin-Name: f1a51ae3863557526a51c6e98e71fcdf4f1ed14a36212b3c90f7408f926345e4 * Do not make the input JSONB editable in json_remove() if there are no PATH argument. FossilOrigin-Name: 66594544f3ba9977475a3e3f74404eb2b2fb845053b28bd24c2b52c7df94e9d7 * Fixes to error handling in json_array_length(). FossilOrigin-Name: aa85df2d26b74c171c55bde19ef17c4f11f40b8af7181bbf7162f87cdea7e88b * Add further tests for xInstToken(). FossilOrigin-Name: 8582707f16133f003a6687f68cbea03d4eb6c2a0e2e07746b7cace0c44e84fa4 * Rename the internal routine jsonMergePatchBlob() to just jsonMergePatch(). FossilOrigin-Name: ebf667b616235bb64b83832008342ba5e7b10b2c170d7cebc431f040fef7ecfb * Fix OOM and corrupt JSONB handling in json_patch(). FossilOrigin-Name: 1910feb0b7d5cc2b810c3322f6cca281d8730182d30d162bd7bb56800979ea91 * Use an assert() to fix a harmless static analyzer warning. FossilOrigin-Name: a249ca657e624028bc6b3d2c2bcedd7162d118addb7d62ce519920cecebf1860 * Clean up the JSONB performance test script. FossilOrigin-Name: 905301075a7fc1010ee7e754867b1b698c9b8576d50e98125def32a5dfb7ee9d * Small performance gain by unwinding the string literal delimiter search loop in the JSON parser by one more level. FossilOrigin-Name: 4c587feac153e8ebe526559ec3d254f545f81e8d1ed3126f91a5ff25ec4aa72e * Use strspn() to accelerate whitespace bypass in the JSON parser. FossilOrigin-Name: 843197df08352bdff4b87be91d160e574572aded0d0c66142fd960000c0b4701 * Miscellaneous comment cleanup and typo fixes. FossilOrigin-Name: 59446dc0bd0091572122a3c8b4653d7a2dc867d16c4a5919f79b81bc3a673ce3 * Further tests for the new code on this branch. FossilOrigin-Name: 59d008b6c23ab900377bc696ee19381feb7614bac80546eae361e401c3620c4e * Use extra assert() statement to silence harmless static analyzer warnings. FossilOrigin-Name: 174c2b2eef5fecd96a5fc89b81032fe81f7801f12097cea10e7e7f0a02114813 * README.md typo fix reported in the forum and update all links from http: to https:. FossilOrigin-Name: 5c48acdbb44185b352b54911a57a6986d6c7e624bdeba2af48b985d29f0292bf * Increased rigor in comparisons between object labels in JSON. FossilOrigin-Name: 2bc86d145fccc07107b7753cb1a69122676d4096fe59c454497bd81a6142d45e * The rule for the RHS of the ->> and -> operators when the RHS does not begin with $ is that it must be (1) all digits, or (2) all alphanumerics, or (3) contained within [..] or else it will become a quoted label. FossilOrigin-Name: 0e059a546ec11fa5c6d007bd65c249ee2422f1facbdb2792c53e0bc0ccc97e14 * Test cases for object label matching with escape sequences. FossilOrigin-Name: c6f2aa38e95b7888650cfa7bb773b18a28e01d883033ac77be6d504ffe417d18 * In CLI, move -interactive flag handling back to arg-loop pass 2. FossilOrigin-Name: 63cb05a862532d2d56e9e81fe32ced09bf58f03146587a118f11c2a84e195e69 * Fix the routine that determines the json_tree.path value for the first row so that it correctly takes into account escape sequences in the path argument. FossilOrigin-Name: b9243ee8a37c62eb8848e765bd4af83bc1b3d3eb24fb4268a1357ad1f8b2e1fb * Correctly handle 8-byte sizes in the JSONB format. [forum:/forumpost/283daf08e91183fc|Forum post 283daf08e91183fc]. FossilOrigin-Name: 73d390f39c0bbbc017e01544e4d43c76761f2599bd57f900131c706270dfd202 * Update documentation comments in fts5.h. FossilOrigin-Name: 38c50e22c98607e6c1fd78d7615cda534773b6d4fd85c712b54749fcd7af0c83 * Work around LLVM's newfound hatred of function pointer casts. [forum:/forumpost/1a7d257346636292|Forum post 1a7d257346636292]. FossilOrigin-Name: ec0ae4030968c782af48d1c776351c14b2ada21d40aeb97915f33df30706e18f * Fix compiler warning about shadowed variable in fts5_index.c. FossilOrigin-Name: ee70e4c1c9c41617850228e48d8df44f105cf2fbbe789340ceca6f27ad6ce5eb * Improved detection of corrupt JSONB in the jsonReturnFromBlob() function. FossilOrigin-Name: b014736c1f80ccc46fb4b24ac04310a6ce5cb5b6653665efff366cb3bc742257 * Add ALWAYS() on branches added in [ec0ae4030968c782] that are always true. FossilOrigin-Name: 451cef8609e96dd9244818adc5c6f240544694bcb4ae620e88f90e403e59d70f * Rework the jsonEachPathLength() routine in json_tree() so that it is less susceptible to problems due to goofy object labels. FossilOrigin-Name: 858b76a00e8ff55215f7a2e6a4cd77fc4d4f98dea7224cd90488744f5ce246a4 * Different fix for the fts5 COMMIT-following-OOM problem first fixed by [fba3129d]. This one does not cause problems if an fts5 table is renamed and then dropped within the same transaction. FossilOrigin-Name: d8c6b246944934a7a6e027b3f5b986fd64a19dd5c5c5175f4ea8586da59a6764 * Fix a problem with handling OOM and other errors in fts5 when querying tokendata=1 tables. FossilOrigin-Name: bc911ab5953532956510c199be72b1d3c556f2d0ddbd7fc0ae6f5f917b337b48 * Fix a null-pointer dereference in fts5 tokendata=1 code. FossilOrigin-Name: d69fa8f0504887f968d9a190ecb889ddb40bb1b56d0d4479f9819c106aec719b * Avoid an assert() failure when querying an fts5vocab table that accesses a tokendata=1 fts5 table with corrupt %_data records. FossilOrigin-Name: 386ba9e20423fb2f623d6adc9d3c310fb1b135f54a1dad15ef3b593d97886926 * Ensure an fts5vocab table never uses a special tokendata=1 merge cursor. FossilOrigin-Name: 1e26510e83b40c9bd2e8bfa2a0e81f2cb915e78fed773204ef537683e48b61dc * Avoid dropping an error code in new fts5 tokendata=1 code. FossilOrigin-Name: a66596e33dc9aa4bab2ec3ff45546e1321d0a11bdc764f8381b315292ca92423 * Fix a harmless compiler warning about "confusing indentation". FossilOrigin-Name: 34f9e9a8c4bea13f60f43062e25cd7d9422f2e7f5b371ed0ddadc9abeb3ca256 * Fix a potential problem RCStr access on a JsonString object that is not really and RCStr. Fuzzer/UBSAN find. FossilOrigin-Name: d2f2174ce2cc89606034e158149a2d05fc3627ec4d5cdb772add7a2250f29d78 * Fix a harmless UBSAN warning. FossilOrigin-Name: 1503cba6d17e9bade7a5c103ddd23241ff4741f9a2e3032ffe2987af243dae65 * Fix a potential use of uninitialized value in json_valid() with 2nd argument of 8. FossilOrigin-Name: fa102036fe46eeb71b7df3e265be1935ae5c78e0b939b08841bcfb8abadbc77a * Work toward enhanced functionality for json_valid() with deep checking of the JSONB (second argument has bit 0x08). FossilOrigin-Name: c370d573198b151767f04e91bf8baa4ae0076751ae468c5709742a0b0ed16770 * Add SQLITE_TESTCTRL_VALIDATE_JSONB, which if enabled under SQLITE_DEBUG causes cross-checking of generate JSONB. FossilOrigin-Name: b410a4db74a650003539ffaaea18519d5159b504daac47db6a4874b730f40ac8 * Rename the new test-control to SQLITE_TESTCTRL_JSON_SELFCHECK. Make it so that the current value of the setting can be interrogated. FossilOrigin-Name: 7aff1d9a4cb17ecd5abab21ab032f35a78741dd641ddd8cbcc85fc4a81a0707d * Activate JSON_SELFCHECK within fuzzcheck. FossilOrigin-Name: 4d14e733bb521aed65e98533969d2303738232ae87dab70fdf7962e6513195f5 * json_valid(*,8) allows minus-signs on hexadecimal literals. FossilOrigin-Name: c0d7f4520d839a268b3fd2474d0897a9832aa608bd6238b3e287fabecf07a350 * json_error_position() now uses jsonValidityCheck() to find the approximate position of an error in a JSONB blob. FossilOrigin-Name: c3d60cf7028a333b825d5b89516945a73e0c158ac81d8bcc117d21bfd98602c8 * The json_error_position() function now reports an approximate byte offset to the problem in a JSONB if there is a problem. FossilOrigin-Name: 80d5d94dff6a2d2557039be3d7d47c1a6003c4b98defe0bd411acfeb963ad5dd * Validity checking of text nodes in JSONB. FossilOrigin-Name: fa5160687c2f970d407e8af73c246f7cd806bb4ce35f29a79ac534a8646a6c8e * Improvements to JSONB validation - catch more cases where the input does not conform to spec. FossilOrigin-Name: be1864eac4eb75cc30bf98f73092c8608467f4bd956240df6a0cbea9f1e09e85 * Add NEVER to two unreachable branches in JSON. FossilOrigin-Name: c96ebb086feb89341565cc52b970ae7799ce1327fe1ad4fc790f1b0dcaa6e229 * Worker1 Promiser API: when multiple db connections are active then use the requested connection instead of always the first-opened connection. Bug reported in [forum:894c330e7f23b177|forum post 894c330e7f23b177]. FossilOrigin-Name: 194276e18e0268829061c09317e7f9f527a703eb45f1755ff1dd30bd99dc1b68 * Fix the JSON object label comparison object so that it works correctly even if the label ends with escaped whitespace. FossilOrigin-Name: 4d5353cadd7b7c5f105bc197f3ec739e2d041472d6b3e939654c9f9cfc2749ae * Improvements to UTF8 handling, and especially the handling of invalid UTF8, in the JSON routines. FossilOrigin-Name: 1b229c1101d6c384a30f343c5e47b471ab084b2d8e81170eb8f642afc1c67e3b * Bug fix in the JSONB validator. dbsqlfuzz ac6fa521a08609a642198e7decf64180e750b3c4 FossilOrigin-Name: 3e940a6a08b0a0434650cd3d8dd286e09ad8ab805b0a4d515e57bba5d3608577 * Avoid invoking sqlite3ExprColUsage() on an unresolve column reference. dbsqlfuzz fc34aa62df4de103705d11b807074687ffafbda5. FossilOrigin-Name: ac9314c0e335694b48c613145f5397247bb88c51806cd0dc3ed4ec306db4bbad * In CLI, fix .read inability to open 2GB+ files on WIN32. FossilOrigin-Name: 56c80a62d2e033d64ba5d545ae9cbe3ed7c9d046c0a3fafb6cfa2f0b562d1ef0 * Pass subtype information through the aggregate ORDER BY sorter for aggregate functions that use subtype information. FossilOrigin-Name: 3536f4030eab6d650b7ed729d2f71eb6cc3b5fbe16b4e96b99008d66522aaccb * Improve the error message returned by an fts5 'rebuild' command on an external content table if there is a problem with the content table or view. FossilOrigin-Name: 0fbf4b8a58fde1c187908934da6f59999b146f32e07ac255cc531c5c4d7007fd * Fix harmless compiler warnings in JSON and FTS5. FossilOrigin-Name: 90135efccfeb1046f002bfcbd8dfec9a1a3b40cbe1b5c714ae065b06368e354f * Add assert()s to FTS5 to fix static analyzer warnings. FossilOrigin-Name: 27d4a89a5ff96b7b7fc5dc9650e1269f7c7edf91de9b9aafce40be9ecc8b95e9 * Use SQLITE_STRICT_SUBTYPE=1 by default for the JNI and WASM builds unless they're explicitly built with SQLITE_STRICT_SUBTYPE=0. FossilOrigin-Name: 990211357badf0ab08bd34cf6d25b58849d0fd8503e289c1839fc837a74e1909 * Correct --enable-sab flag in ext/wasm/GNUmakefile to fix a silent alhttpd args-parsing error. FossilOrigin-Name: 7b9b757d872a31395b0f6454e2309a6a4664b8bdd8749f6a15371cbe72c05b60 * Avoid running the "no_mutex_try" tests with SQLITE_ENABLE_SETLK_TIMEOUT builds as part of the release test. FossilOrigin-Name: 6b4e1344a28c213cbe8fb97f7f3f6688de93fb73ed96bf460ff74c959da1a712 * Do not run test script fts5origintest4.test with either "memsubsys1" or "mmap" permutations. FossilOrigin-Name: 05a63d9603ef42cbee6dadff72d97583a9c78e549f70e9a808534d5c1ae7c28a * Fix a new JSON test case so that it works even if SQLITE_OMIT_VIRTUALTABLE is defined. FossilOrigin-Name: b995aae510888a9746b46545d176a0885d4738e1f1bc0b7ad7937ed023efd7d6 * Add mention of --buildonly and --dryrun to the testrunner.tcl usage screen. FossilOrigin-Name: 23b92d915c12ee768857e2c3c961832f390cad9b53b8bcfc2b97664baab25bb7 * Avoid expiring prepared statements in the middle of an integrity-check. FossilOrigin-Name: 88beb48472da4667c0727c8ebabe046ea526450ff837fe789d041ed3f1ff105e * In the count-of-view optimization, deferring freeing obsolete parts of the parse tree, on the off-chance that some other part of the code might be holding a pointer to those parts. FossilOrigin-Name: da442578856c87137eb1677d9b13b7c1cf15828cc41d4756572b278060f69bae * New test case based on Chromium bug report 1511689. FossilOrigin-Name: 2c7ef4b4d215f99f8d6787adb64e2037ae96e5dd6cb49c8b81634249f5e1b328 * Enable SQLITE_STRICT_SUBTYPE for default builds of the shell, fuzzcheck, and testfixture. FossilOrigin-Name: 5a0c517ed7e46c0f8a3db752cf5b9f8010c60f35084606abe9e7c1c4f993b4a7 * Enhancements to the "randomjson.c" extension. Automatically load that extension into fuzzcheck. FossilOrigin-Name: 70620405ab01d6a5d38bafa9ae175fd6e4eabaf2efb7854734278dafd7b05c99 * Enhancements to ext/misc/randomjson.c. FossilOrigin-Name: a4e6d1f86f3a502e4170f5a90031e269e48363e95114a66b84d373e3ce0b2704 * Bug fix in the randomjson.c extension. FossilOrigin-Name: 1f3a33df530dbe330ea8b14a69369b807b413b25a167d1a3938f8f0faf97cc91 * Ensure that all object labels for individual objects generated by randomjson.c are unique. FossilOrigin-Name: 29c46aca231b3f1e997ef306a5a651408185bf3ad09ab9fc1fe21ed18caa4d02 * Add randomjson.c to testfixture. Use it for a new set of invariant tests against JSON functions. FossilOrigin-Name: f1c040606bfe784804134d8f3ca130908fad5212b47e3c32792baab977470943 * Ensure that the insert/delete size delta on JSONB objects in the JSON cache are always set to zero. FossilOrigin-Name: 4b4581668a908473dbf1322a3e98bc7cca122998c44518ea183af7f0d1ba9f95 * Fix JSON to JSONB translation so that it deals correctly with Infinity and NaN. FossilOrigin-Name: 178cb84f36bdb45ba17511900d6d8ea8dfa14912fc5bf7094a20348174a36c95 * Add NEVER() to an unfalsifiable branch. FossilOrigin-Name: 9a0c67db366d38a0b0741f6a1ae333cf27cfe6f6b7c6eed94bdec9686f9f9f8a * New JSON invariant test cases. FossilOrigin-Name: a6a1367b0bf364b1a2e20e153c5f4a578624b8846f9ec0b7c9c3cba0ea2ec346 * Remove a stray comment in the JSON code. FossilOrigin-Name: 6618bdf0679405b43911ea8cd94050b12a5dc469f3dfe4759ee3ff850a55229e * Extra ALWAYS() macros to verify state in the sqlite3ExprCanBeNull() routine. FossilOrigin-Name: be19b84c9f3fe127165809908add148dbe9a827a55608b0490de7e69b7f7f191 * Always make the sqlite_dbdata virtual table available in the CLI. FossilOrigin-Name: e5fd3b32ad87586a7413570e568c9c1859a37a4f836cca074126471b125fb682 * When unable to resolve an identifier, change the Expr node into TK_NULL rather than TK_COLUMN, to prevent any downstream misuse of the non-existent column. dbsqlfuzz 71869261db80a95e4733afa10ff5724bf3c78592. FossilOrigin-Name: d2e6117e4f97ab98b01deb5fcad5520f8181d00bed8d904d34963c01d73df857 * Test case for the previous check-in. FossilOrigin-Name: df5a07e1a5122e08c2fa6076ac08adb2820f997ee11dd88b84863666899dfb57 * Ignore COLLATE operators when determining whether the result of a subexpression should be shallow-copied or deep-copied. FossilOrigin-Name: 34ae36a45e814bed7c8340412c7ef3fc849b82357656d0eb5f0f805e59d846d0 * Add ALWAYS() and NEVER() on branches made unreachable by recent changes. FossilOrigin-Name: c50e6c2ace49d0928b05cbfd877c621e9a0f77dc4e056ccb1dbe5cf118a00d00 * More precise computation of the size of data structures in the query planner. Response to [forum:/forumpost/7d8685d49d|Forum post 7d8685d49d]. FossilOrigin-Name: 0c8d88e41167ea92341dd1129be01b596a73f46bdcd5b0dd931441a979c013d0 * Fix harmless compiler warning in the randomjson.c extension. FossilOrigin-Name: debe7060b16669ada7304ffb9bf7616c8fa30bd286d8be871ed17fd6d64a3d4c * On second thought, we don't really need sqlite_dbdata accessible to the CLI. FossilOrigin-Name: 36fe6a61ef8fb393281a5e15119d716521219c7b971fbfd63bdea07d27a78ac9 * Remove redundant conditional from sqlite3ExprCanBeNull(). FossilOrigin-Name: 257f96a2d22c605885fa66220c28cf7dc5941c330bccee3f132b9e7b70d89d30 * In JSON - minor code cleanup and refactoring with a small size reduction and performance increase. FossilOrigin-Name: 215fabda38daecdbd38b1eca5a6aafbc61b6a36a8303f1d7164d5a1138e63134 * Avoid harmless integer overflow in pager status statistics gathering. Response to [forum:/forumpost/7f4cdf23f9|forum post 7f4cdf23f9]. FossilOrigin-Name: 206d8c650d937bc700946c40a82a62ea6bc4a80e5f3fb42d0ae2968de25f0644 * Fix SQLITE_ENABLE_SETLK_TIMEOUT assert() statements in os_unix.c to avoid reading past the end of the unixShmNode.aMutex[] array. FossilOrigin-Name: 029a05cd2928d43d81e4549cce5388c432e2c9e75e3fa0b2fe6e91021b2fb9ac * Add internal core-developer-only documentation of the JSONB format. FossilOrigin-Name: 4d30478863b2a60512010de9ec6e3099bfaf75d4afee20acec536713fe94334d * Add a new comment to debugging output routine sqlite3WhereLoopPrint() to remind us of what the various fields of the debug output mean. No changes to code. FossilOrigin-Name: da5f34fd4052432b1ae27bb12e56b358cdc5c1282653d60ed0f0fe62f727e4ee * Fix a usan complaint about signed integer overflow. FossilOrigin-Name: e65907e0279f4814ec957f0790777d8b94a86926cd27c52442b311b27efc0185 * Update #ifdef checks in pager.c and util.c to account for [0462a2612d1fc1d0] to resolve the build problem reported in [forum:9819032aac|forum post 9819032aac]. FossilOrigin-Name: 0f22d809a1c6c80e381f6bcd931fe4ec36dca0e28d07ab4f4f7f83c813424f60 * Add the -fno-sanitize-recover=undefined to the sanitizer builds used for sdevtest and release testing. To ensure that any test that provokes undefined behaviour fails. FossilOrigin-Name: 89563311adb0ab7c7a3eadb11c2e27fbca50c56fce8ca616628facbc00d72b88 * Change parameters on a debugging function to include "const". FossilOrigin-Name: 94c3e1110c6590261bd30ba317fba4dd94023d69b81a94f4b216cce748fe7489 * Add debugging output routines sqlite3ShowWhereLoop(X) and sqlite3ShowWhereLoopList(X) that can be invoked from a debugger to show a summary of the content of a single WhereLoop object or a list of WhereLoop objects. No change in release builds. FossilOrigin-Name: 5db30bcc338aac1cf081de2deec7e60749ae012e2b6f95ccf745623adb4a31dc * Improvements to the query planner to address the inefficiency described by [forum/forumpost/2568d1f6e6|forum post 2568d1f6e6]. FossilOrigin-Name: 72fcc12cda910a0e3f7875eb3d117b2a5608705c97703985427a02960f1ab5c5 * Avoid signed integer overflow during integrity_check of FTS5. FossilOrigin-Name: 5937df3b25799eceaadfb04d7226c9995d44c8d8edb5ac3ad02af9d7e3570726 * Fix harmless compiler warnings associated with [5db30bcc338aac1c] FossilOrigin-Name: e55d1c2333f35fc20615aa83a7843d08cae7945710a2156d44eee0cc37d90ade * Remove an ALWAYS() added in [c50e6c2ace49d092] because it is sometimes false. dbsqlfuzz c393a4f783d42efd9552772110aff7e5d937f15e. FossilOrigin-Name: b9daf37e57cde12c4de271a2b1995e8e91b6411f8c2e8882e536241929609b3a * Improved handling of malformed unicode within JSON strings. FossilOrigin-Name: e252bdf5f5de26ba8e2bcc6b0ad94121ed6fc4d86c02fe4a2a058ada93747beb * Ensure that the xColumnText(), xQueryPhrase() and xPhraseFirstColumn() APIs all return SQLITE_RANGE if they are passed a bad column or phrase number. FossilOrigin-Name: 1a8a9b1c89519d265869251e8b6d3c5db733f0d3a7dea6c7962811a8f1157dff * Fix a problem in the shell tool (not library) causing an out-of-bounds write if an ".open" command failed, then the user pressed ctrl-c to interrupt a query running on the substitute in-memory database. FossilOrigin-Name: 026618b9e321576f616a32e41329066ba629814170c6cfeef35430343f5003f3 * Enhance the (undocumented, debug-only) json_parse() SQL function so that it returns the text rendering of the JSONB parse of the input, rather than printing the rendering on stdout. FossilOrigin-Name: 056de8d551dcbdf1d162e2db15ed418fa9c786f900cd3972ef8a1dea3f4f3aa1 * Fix harmless compiler warnings in FTS5. FossilOrigin-Name: 3cd5ef44e40570c357f913a9483fa1cd72e7f2827a5ed5826bff99febae213b1 * Performance improvement by unwinding a loop in jsonAppendString(). FossilOrigin-Name: 190ab3c08431a0ba24d76392eab251f5c1792add05e4ec780998b299208eca95 * Update fts5origintext4.test to work with SQLITE_DIRECT_OVERFLOW_READ. FossilOrigin-Name: 15ed002aed12556aeb9bbe537c4ba839f0c95bac65a69d03401b37cc3fd11b92 * Enable SQLITE_DIRECT_OVERFLOW_READ unless it is specifically disabled using the -DSQLITE_DIRECT_OVERFLOW_READ=0 compile-time option. FossilOrigin-Name: 630604a4e604bfb36c31602917bfa8d42c10c82966d0819932bf8f827b9158b8 * Minor doc touchup in the JS bits. FossilOrigin-Name: 8d2120c35425081e2158d6a8a6b083c4adf8d694046b2d98f5fd235520920432 * Use SQLITE_ENABLE_STAT4 in both the WASM and JNI builds. FossilOrigin-Name: 99d11e6d0ae687ff6bac5119027f7b04d5e7185214e79cf8c56289cfa809b0f9 * WASM: various build cleanups and add initial infrastructure for a build which elides the oo1 API and its dependents (worker1 and promiser). Sidebar: an attempt was made to move generation of the build rules to an external script, but the mixed-mode make/script was even less legible than the $(eval) indirection going on in the makefile. FossilOrigin-Name: 563d313163c02b398ae85b7c2ed231019a14e006726f09a7c1f294a58bf4363f * JNI: move the ByteBuffer-using APIs from public to package visibility for the time being because they have UB-inducing possibilities which need to be worked out. Update test code to account for a change in custom FTS5 columntext() impls. FossilOrigin-Name: dc501275fcfab3ad9b6ebbadf7588b225a9dd07a0abac5be83d96f15bfba99e9 * Extra steps taken to avoid using low-quality indexes in a query plan. This branch accomplishes the same end as the nearby enhanced-stat1 branch, but with much less change and hence less risk. FossilOrigin-Name: c030e646262fee43a59b45fdc1630d972f8bf88ac3c142b6bdaf4cbb36695a4f * Remove some unnecessary computations from ANALYZE so that ANALYZE runs with fewer CPU cycles. These changes were spotted while working on the nearby enhanced-stat1 branch. So even if enhanced-stat1 is abandoned, that effort put into it will not have been in vain. FossilOrigin-Name: 5527e8c4abb904b1a438ec1c353d4a960bf82faaf3a2c742af1df7c613850441 * Back out [99d11e6d0ae6] (enabling of STAT4 in WASM/JNI), per /chat discussion. FossilOrigin-Name: cd7929ee2e2c305475fa5a4dff2edaccf90067126ef04a1c2714cf464925453f * Update and clean up the in-makefile docs for ext/wasm. FossilOrigin-Name: 7a7b295e6d7e95ee4a46cc42761895d11700ab295870c5a4380072bb4a5b7099 * Elaborate on the various build flavors used by ext/wasm/. Doc changes only. FossilOrigin-Name: d489232aa492618d4c8e5817addb2323d0ca067742d7140216914239a66fb221 * Increase the default "max_page_count" to its theoretical maximum of 4294967294. FossilOrigin-Name: ffb35f1784a4305b979a850485f57f56938104a3a03f4a7aececde92864c4879 * Fix a problem in fts5 caused by a COMMIT involving fts5 data that immediately follows a ROLLBACK TO that does not. FossilOrigin-Name: 55c61f6a8d6a1bc79497b05669beac5c5397b06382bf24b6bec54845962d219b * Adjust the sqlite3PagerDirectReadOk() routine (part of the SQLITE_DIRECT_OVERFLOW_READ optimization) to use less code and to be more easily testable. FossilOrigin-Name: eed670ea2a9424f7df4eeb01c152fc38f7190a5e39aa891651b28dc91fcdc019 * Back out [b517a52fa36df0a0] which is no longer reachable due to early error detection enhancements in [166e82dd20efbfd3]. FossilOrigin-Name: 704943e96f2620b99260667ac9922c2f72bc3e92e2dfe1d9c2a91c7b704564d9 * Update the sqldiff.exe utility program so that it uses the sqlite3_str string interface, and so that it does console output using the ext/consio extension. FossilOrigin-Name: 4443b7e592da97d1cb1b3b79ed0559452d8057a33aba4d184c2fffbf200e05f5 * Enhance sqlite3_analyzer.exe so that it uses the ext/consio extension. FossilOrigin-Name: 769de0b98e136e4a0945b80216d0c9583c1ccd9de69cb0494875c2300e172646 * Change a constant from decimal to hex to avoid a compiler warning on Mac. FossilOrigin-Name: e3acb8a43ad544fd5b5341058276bd3b61b6bdb6b719790476a90e0de4320f90 * Convert the JSON functions to use lookaside memory allocation whenever feasible, to avoid hitting the global memory allocator mutex. FossilOrigin-Name: a79a244954f728596da3c0e28fa3b887258d1bd831f53881970f418f3fba84c7 * Fix a #ifdef in sqlite3_test_control() that was preventing builds with SQLITE_OMIT_WSD. FossilOrigin-Name: d546a9c94caf7408cc6e4530ec190d3a13fae09dc15b71b03d6369e02ee62abd * Restructure some code to fix what appears to be a false-positive UBSAN warning. FossilOrigin-Name: fe952c12903ea2150880c8bb57cda2efc00ce9fa801568a68c619e0745f30567 * Avoid errors with SQLITE_OMIT_VIRTUALTABLE builds in json106.test and unionall.test. FossilOrigin-Name: 90e8a233549a2d31e6959ce3fec927693b772ab3c0abce65e81d7350d2ca5cc6 * Update extension ext/misc/totext.c to avoid both ubsan warnings and dubious real->integer conversions. FossilOrigin-Name: c626aa108a7a30cef54af8d93ac9e45749568ed38e4e06623a6bad6b4bf6e8ec * Update JSON performance testing procedures for clarity and to describe how to do performance testing of JSONB. FossilOrigin-Name: b115b4f75bc7c4e6d9bab5edf13297f27a36f30083c80d2c502b01208da5dfc0 * Ensure that SQLITE_PROTOCOL is not returned too early when a SQLITE_ENABLE_SETLK_TIMEOUT build fails to open a transaction on a wal mode database in cases where blocking locks are not being used. FossilOrigin-Name: b934a33671d8a0190082ad7e5e68c78fe0c558d102404eafc1de26e4e7d65b92 * Updates to RTREE to facility testing. FossilOrigin-Name: 7a5b42ff74882c58493dc8b710fde73d4ff251f5d42271d84be73ceaabc01698 * Remove an ALWAYS() from RTREE. Dbsqlfuzz found a way to make it false. FossilOrigin-Name: 40f0a29e6dd90fcb969d7c0e49728ba0ee8f31d9e8f502b9a21469620a8ad283 * Minor change to os_unix.c to facilitate 100% MC/DC testing. FossilOrigin-Name: 0dfa7b4da134db281c3c4eddb4569c53a450f955f0af2f410e13db801aff4ea2 * Automatically turn off DEFENSIVE mode in the shell tool when executing scripts generated by the ".dump" command against an empty database. Add a warning to the top of generated ".dump" scripts that populate virtual tables. FossilOrigin-Name: 6e9e96b7e7afb9420110f4b93d10b945c9eadfde5e9c81e59ae9ee8167e75707 * Fix date on new file shell9.test. FossilOrigin-Name: c82da712113d5dcd63b764dbc68842026989627abc840acb4a33f3a4972b832a * Improved resolution of unqualified names in the REINDEX command. [forum:/info/74cd0ceabd|Forum thread 74cd0ceabd]. FossilOrigin-Name: 97709ce2a1f5ae05495e412ca27108048e5b8a63a1e3bca4be13933f7527da7b * Put an SQLITE_ENABLE_SETLK_TIMEOUT branch inside the appropriate ifdef with an assert on the else since the condition is always false if SETLK_TIMEOUT is not available. FossilOrigin-Name: d81e7a036ac5d70b6a6ee6ab7d81e041c1f5fc04b70bcee47e203d521caf7e93 * In fts5, flush the contents of the in-memory hash table whenever the secure-delete option is toggled. This prevents spurious corruption reports under some circumstances. FossilOrigin-Name: ccf552319a62bfb329820a3bc1f490bacbaa6e90694a257fc65a568a605542c3 * Fix a comment in sessions. No functional changes. [forum:/forumpost/8c20dc935b|Forum post 8c20dc935b]. FossilOrigin-Name: b0eb6d3628c1f70399a22d9fd3b79a796bc343adfeba50515440db609565961a * Have the shell tool automatically enable SQLITE_CONFIG_DQS_DDL when executing a ".dump" script against an empty db. FossilOrigin-Name: f47a5f4e0ce078e6cc1183e6cbb3c4013af379b496efae94863a42e5c39928ed * Version 3.45.0 FossilOrigin-Name: 1066602b2b1976fe58b5150777cced894af17c803e068f5918390d6915b46e1d * wasm build: reformulate an awk invocation to account for awks which do not support the -e flag. Problem reported on the forum via a docker-hosted build. FossilOrigin-Name: 90dd51153fd0a6197e2ee49b5492ad120f0bfc324b60651f3d4f47c286887b46 * When backing out a character in a constructed string in JSON, first make sure the string has not been reset by on OOM. FossilOrigin-Name: 950bf9fe7829864e0abe6d71ca0495f346feb5d7943d76c95e55a6b86ea855da * Ensure that the xIntegrity methods of fts3 and fts5 work on read-only databases. FossilOrigin-Name: e79b97369fa740f62f695057d4a2cf8dae48a683982ec879f04a19039c9cb418 * When a JSON input is a blob, but it looks like valid JSON when cast to text, then accept it as valid JSON. This replicates a long-standing bug in the behavior of JSON routines, and thus avoids breaking legacy apps. FossilOrigin-Name: 4c2c1b97dce46a279846380c937ac6de5c367927c6843516641eead7ea6db472 * Bump the version number to 3.45.1 FossilOrigin-Name: 54d34edb89430b266221b7e6eea0afbd2c9dafbe774344469473abc8ad1e13fd * Fix harmless "unused parameter" compiler warning in the new fts3IntegrityMethod implementation. FossilOrigin-Name: 9d459f6b50fb6f995e6284a0815c5e211cacac44aad0b96bf01ba68af97f51fc * In os_unix.c and os_win.c, do not allow xFetch() to return a pointer to a page buffer that is right at the end of the mapped region - if the database is corrupted in a specific way such a page buffer might be overread by several bytes. FossilOrigin-Name: d131cab652ac11795322af13d0b330e7e44ab91587a1a3e73fe7b9a14b2dd531 * Slight adjustment to test results for Windows in mmap1.test due to the previous check-in. FossilOrigin-Name: a8043eaed899285b5cf4aab0c23c3dabb8975910c353cb579fd1f1655db390f6 * Apply the same fix found in [99057383acc8f920] to descending scans. FossilOrigin-Name: 593d6a1c2e9256d797f160e867278414e882a3d04d7fea269bea86965eaa7576 * Automatically disable the DISTINCT optimization during query planning if the ORDER BY clause exceeds 63 terms. FossilOrigin-Name: 6edbdcc02d18727f68f0236e15dde4ecfc77e6f452b522eb4e1e895929b1fb63 * When rendering JSONB back into text JSON, report an error if a zero-length integer or floating-point node is encountered. Otherwise, if the node occurs at the very end of the JSONB, the rendering logic might read one byte past the end of the initialized part of the BLOB byte array. OSSFuzz 66284. FossilOrigin-Name: 3ab08ac75d97ffd9920f5c924362a4819560b40faa8a4f9100068057f5fa420a * Avoid a potential buffer overread when handling corrupt json blobs. FossilOrigin-Name: ac402cc551b2cbe3f8fbbc9c711a04942eab5eeb9d2f4a394e9370d2380427b5 * Detect malformed nested JSONB earlier and stop rendering to avoid long delays. FossilOrigin-Name: ab40e282465c989bf249453d7c6f60072a38b691f579411cdf9aad234b20f0f7 * Version 3.45.1 FossilOrigin-Name: e876e51a0ed5c5b3126f52e532044363a014bc594cfefa87ffb5b82257cc467a --------- Co-authored-by: drh <> Co-authored-by: dan <Dan Kennedy> Co-authored-by: stephan <stephan@noemail.net> Co-authored-by: larrybr <larrybr@noemail.net>
958 lines
27 KiB
C
958 lines
27 KiB
C
/*
|
|
** 2019-04-17
|
|
**
|
|
** The author disclaims copyright to this source code. In place of
|
|
** a legal notice, here is a blessing:
|
|
**
|
|
** May you do good and not evil.
|
|
** May you find forgiveness for yourself and forgive others.
|
|
** May you share freely, never taking more than you give.
|
|
**
|
|
******************************************************************************
|
|
**
|
|
** This file contains an implementation of two eponymous virtual tables,
|
|
** "sqlite_dbdata" and "sqlite_dbptr". Both modules require that the
|
|
** "sqlite_dbpage" eponymous virtual table be available.
|
|
**
|
|
** SQLITE_DBDATA:
|
|
** sqlite_dbdata is used to extract data directly from a database b-tree
|
|
** page and its associated overflow pages, bypassing the b-tree layer.
|
|
** The table schema is equivalent to:
|
|
**
|
|
** CREATE TABLE sqlite_dbdata(
|
|
** pgno INTEGER,
|
|
** cell INTEGER,
|
|
** field INTEGER,
|
|
** value ANY,
|
|
** schema TEXT HIDDEN
|
|
** );
|
|
**
|
|
** IMPORTANT: THE VIRTUAL TABLE SCHEMA ABOVE IS SUBJECT TO CHANGE. IN THE
|
|
** FUTURE NEW NON-HIDDEN COLUMNS MAY BE ADDED BETWEEN "value" AND
|
|
** "schema".
|
|
**
|
|
** Each page of the database is inspected. If it cannot be interpreted as
|
|
** a b-tree page, or if it is a b-tree page containing 0 entries, the
|
|
** sqlite_dbdata table contains no rows for that page. Otherwise, the
|
|
** table contains one row for each field in the record associated with
|
|
** each cell on the page. For intkey b-trees, the key value is stored in
|
|
** field -1.
|
|
**
|
|
** For example, for the database:
|
|
**
|
|
** CREATE TABLE t1(a, b); -- root page is page 2
|
|
** INSERT INTO t1(rowid, a, b) VALUES(5, 'v', 'five');
|
|
** INSERT INTO t1(rowid, a, b) VALUES(10, 'x', 'ten');
|
|
**
|
|
** the sqlite_dbdata table contains, as well as from entries related to
|
|
** page 1, content equivalent to:
|
|
**
|
|
** INSERT INTO sqlite_dbdata(pgno, cell, field, value) VALUES
|
|
** (2, 0, -1, 5 ),
|
|
** (2, 0, 0, 'v' ),
|
|
** (2, 0, 1, 'five'),
|
|
** (2, 1, -1, 10 ),
|
|
** (2, 1, 0, 'x' ),
|
|
** (2, 1, 1, 'ten' );
|
|
**
|
|
** If database corruption is encountered, this module does not report an
|
|
** error. Instead, it attempts to extract as much data as possible and
|
|
** ignores the corruption.
|
|
**
|
|
** SQLITE_DBPTR:
|
|
** The sqlite_dbptr table has the following schema:
|
|
**
|
|
** CREATE TABLE sqlite_dbptr(
|
|
** pgno INTEGER,
|
|
** child INTEGER,
|
|
** schema TEXT HIDDEN
|
|
** );
|
|
**
|
|
** It contains one entry for each b-tree pointer between a parent and
|
|
** child page in the database.
|
|
*/
|
|
|
|
#if !defined(SQLITEINT_H)
|
|
#include "sqlite3.h"
|
|
|
|
typedef unsigned char u8;
|
|
typedef unsigned int u32;
|
|
|
|
#endif
|
|
#include <string.h>
|
|
#include <assert.h>
|
|
|
|
#ifndef SQLITE_OMIT_VIRTUALTABLE
|
|
|
|
#define DBDATA_PADDING_BYTES 100
|
|
|
|
typedef struct DbdataTable DbdataTable;
|
|
typedef struct DbdataCursor DbdataCursor;
|
|
|
|
/* Cursor object */
|
|
struct DbdataCursor {
|
|
sqlite3_vtab_cursor base; /* Base class. Must be first */
|
|
sqlite3_stmt *pStmt; /* For fetching database pages */
|
|
|
|
int iPgno; /* Current page number */
|
|
u8 *aPage; /* Buffer containing page */
|
|
int nPage; /* Size of aPage[] in bytes */
|
|
int nCell; /* Number of cells on aPage[] */
|
|
int iCell; /* Current cell number */
|
|
int bOnePage; /* True to stop after one page */
|
|
int szDb;
|
|
sqlite3_int64 iRowid;
|
|
|
|
/* Only for the sqlite_dbdata table */
|
|
u8 *pRec; /* Buffer containing current record */
|
|
sqlite3_int64 nRec; /* Size of pRec[] in bytes */
|
|
sqlite3_int64 nHdr; /* Size of header in bytes */
|
|
int iField; /* Current field number */
|
|
u8 *pHdrPtr;
|
|
u8 *pPtr;
|
|
u32 enc; /* Text encoding */
|
|
|
|
sqlite3_int64 iIntkey; /* Integer key value */
|
|
};
|
|
|
|
/* Table object */
|
|
struct DbdataTable {
|
|
sqlite3_vtab base; /* Base class. Must be first */
|
|
sqlite3 *db; /* The database connection */
|
|
sqlite3_stmt *pStmt; /* For fetching database pages */
|
|
int bPtr; /* True for sqlite3_dbptr table */
|
|
};
|
|
|
|
/* Column and schema definitions for sqlite_dbdata */
|
|
#define DBDATA_COLUMN_PGNO 0
|
|
#define DBDATA_COLUMN_CELL 1
|
|
#define DBDATA_COLUMN_FIELD 2
|
|
#define DBDATA_COLUMN_VALUE 3
|
|
#define DBDATA_COLUMN_SCHEMA 4
|
|
#define DBDATA_SCHEMA \
|
|
"CREATE TABLE x(" \
|
|
" pgno INTEGER," \
|
|
" cell INTEGER," \
|
|
" field INTEGER," \
|
|
" value ANY," \
|
|
" schema TEXT HIDDEN" \
|
|
")"
|
|
|
|
/* Column and schema definitions for sqlite_dbptr */
|
|
#define DBPTR_COLUMN_PGNO 0
|
|
#define DBPTR_COLUMN_CHILD 1
|
|
#define DBPTR_COLUMN_SCHEMA 2
|
|
#define DBPTR_SCHEMA \
|
|
"CREATE TABLE x(" \
|
|
" pgno INTEGER," \
|
|
" child INTEGER," \
|
|
" schema TEXT HIDDEN" \
|
|
")"
|
|
|
|
/*
|
|
** Connect to an sqlite_dbdata (pAux==0) or sqlite_dbptr (pAux!=0) virtual
|
|
** table.
|
|
*/
|
|
static int dbdataConnect(
|
|
sqlite3 *db,
|
|
void *pAux,
|
|
int argc, const char *const*argv,
|
|
sqlite3_vtab **ppVtab,
|
|
char **pzErr
|
|
){
|
|
DbdataTable *pTab = 0;
|
|
int rc = sqlite3_declare_vtab(db, pAux ? DBPTR_SCHEMA : DBDATA_SCHEMA);
|
|
|
|
(void)argc;
|
|
(void)argv;
|
|
(void)pzErr;
|
|
sqlite3_vtab_config(db, SQLITE_VTAB_USES_ALL_SCHEMAS);
|
|
if( rc==SQLITE_OK ){
|
|
pTab = (DbdataTable*)sqlite3_malloc64(sizeof(DbdataTable));
|
|
if( pTab==0 ){
|
|
rc = SQLITE_NOMEM;
|
|
}else{
|
|
memset(pTab, 0, sizeof(DbdataTable));
|
|
pTab->db = db;
|
|
pTab->bPtr = (pAux!=0);
|
|
}
|
|
}
|
|
|
|
*ppVtab = (sqlite3_vtab*)pTab;
|
|
return rc;
|
|
}
|
|
|
|
/*
|
|
** Disconnect from or destroy a sqlite_dbdata or sqlite_dbptr virtual table.
|
|
*/
|
|
static int dbdataDisconnect(sqlite3_vtab *pVtab){
|
|
DbdataTable *pTab = (DbdataTable*)pVtab;
|
|
if( pTab ){
|
|
sqlite3_finalize(pTab->pStmt);
|
|
sqlite3_free(pVtab);
|
|
}
|
|
return SQLITE_OK;
|
|
}
|
|
|
|
/*
|
|
** This function interprets two types of constraints:
|
|
**
|
|
** schema=?
|
|
** pgno=?
|
|
**
|
|
** If neither are present, idxNum is set to 0. If schema=? is present,
|
|
** the 0x01 bit in idxNum is set. If pgno=? is present, the 0x02 bit
|
|
** in idxNum is set.
|
|
**
|
|
** If both parameters are present, schema is in position 0 and pgno in
|
|
** position 1.
|
|
*/
|
|
static int dbdataBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdx){
|
|
DbdataTable *pTab = (DbdataTable*)tab;
|
|
int i;
|
|
int iSchema = -1;
|
|
int iPgno = -1;
|
|
int colSchema = (pTab->bPtr ? DBPTR_COLUMN_SCHEMA : DBDATA_COLUMN_SCHEMA);
|
|
|
|
for(i=0; i<pIdx->nConstraint; i++){
|
|
struct sqlite3_index_constraint *p = &pIdx->aConstraint[i];
|
|
if( p->op==SQLITE_INDEX_CONSTRAINT_EQ ){
|
|
if( p->iColumn==colSchema ){
|
|
if( p->usable==0 ) return SQLITE_CONSTRAINT;
|
|
iSchema = i;
|
|
}
|
|
if( p->iColumn==DBDATA_COLUMN_PGNO && p->usable ){
|
|
iPgno = i;
|
|
}
|
|
}
|
|
}
|
|
|
|
if( iSchema>=0 ){
|
|
pIdx->aConstraintUsage[iSchema].argvIndex = 1;
|
|
pIdx->aConstraintUsage[iSchema].omit = 1;
|
|
}
|
|
if( iPgno>=0 ){
|
|
pIdx->aConstraintUsage[iPgno].argvIndex = 1 + (iSchema>=0);
|
|
pIdx->aConstraintUsage[iPgno].omit = 1;
|
|
pIdx->estimatedCost = 100;
|
|
pIdx->estimatedRows = 50;
|
|
|
|
if( pTab->bPtr==0 && pIdx->nOrderBy && pIdx->aOrderBy[0].desc==0 ){
|
|
int iCol = pIdx->aOrderBy[0].iColumn;
|
|
if( pIdx->nOrderBy==1 ){
|
|
pIdx->orderByConsumed = (iCol==0 || iCol==1);
|
|
}else if( pIdx->nOrderBy==2 && pIdx->aOrderBy[1].desc==0 && iCol==0 ){
|
|
pIdx->orderByConsumed = (pIdx->aOrderBy[1].iColumn==1);
|
|
}
|
|
}
|
|
|
|
}else{
|
|
pIdx->estimatedCost = 100000000;
|
|
pIdx->estimatedRows = 1000000000;
|
|
}
|
|
pIdx->idxNum = (iSchema>=0 ? 0x01 : 0x00) | (iPgno>=0 ? 0x02 : 0x00);
|
|
return SQLITE_OK;
|
|
}
|
|
|
|
/*
|
|
** Open a new sqlite_dbdata or sqlite_dbptr cursor.
|
|
*/
|
|
static int dbdataOpen(sqlite3_vtab *pVTab, sqlite3_vtab_cursor **ppCursor){
|
|
DbdataCursor *pCsr;
|
|
|
|
pCsr = (DbdataCursor*)sqlite3_malloc64(sizeof(DbdataCursor));
|
|
if( pCsr==0 ){
|
|
return SQLITE_NOMEM;
|
|
}else{
|
|
memset(pCsr, 0, sizeof(DbdataCursor));
|
|
pCsr->base.pVtab = pVTab;
|
|
}
|
|
|
|
*ppCursor = (sqlite3_vtab_cursor *)pCsr;
|
|
return SQLITE_OK;
|
|
}
|
|
|
|
/*
|
|
** Restore a cursor object to the state it was in when first allocated
|
|
** by dbdataOpen().
|
|
*/
|
|
static void dbdataResetCursor(DbdataCursor *pCsr){
|
|
DbdataTable *pTab = (DbdataTable*)(pCsr->base.pVtab);
|
|
if( pTab->pStmt==0 ){
|
|
pTab->pStmt = pCsr->pStmt;
|
|
}else{
|
|
sqlite3_finalize(pCsr->pStmt);
|
|
}
|
|
pCsr->pStmt = 0;
|
|
pCsr->iPgno = 1;
|
|
pCsr->iCell = 0;
|
|
pCsr->iField = 0;
|
|
pCsr->bOnePage = 0;
|
|
sqlite3_free(pCsr->aPage);
|
|
sqlite3_free(pCsr->pRec);
|
|
pCsr->pRec = 0;
|
|
pCsr->aPage = 0;
|
|
}
|
|
|
|
/*
|
|
** Close an sqlite_dbdata or sqlite_dbptr cursor.
|
|
*/
|
|
static int dbdataClose(sqlite3_vtab_cursor *pCursor){
|
|
DbdataCursor *pCsr = (DbdataCursor*)pCursor;
|
|
dbdataResetCursor(pCsr);
|
|
sqlite3_free(pCsr);
|
|
return SQLITE_OK;
|
|
}
|
|
|
|
/*
|
|
** Utility methods to decode 16 and 32-bit big-endian unsigned integers.
|
|
*/
|
|
static u32 get_uint16(unsigned char *a){
|
|
return (a[0]<<8)|a[1];
|
|
}
|
|
static u32 get_uint32(unsigned char *a){
|
|
return ((u32)a[0]<<24)
|
|
| ((u32)a[1]<<16)
|
|
| ((u32)a[2]<<8)
|
|
| ((u32)a[3]);
|
|
}
|
|
|
|
/*
|
|
** Load page pgno from the database via the sqlite_dbpage virtual table.
|
|
** If successful, set (*ppPage) to point to a buffer containing the page
|
|
** data, (*pnPage) to the size of that buffer in bytes and return
|
|
** SQLITE_OK. In this case it is the responsibility of the caller to
|
|
** eventually free the buffer using sqlite3_free().
|
|
**
|
|
** Or, if an error occurs, set both (*ppPage) and (*pnPage) to 0 and
|
|
** return an SQLite error code.
|
|
*/
|
|
static int dbdataLoadPage(
|
|
DbdataCursor *pCsr, /* Cursor object */
|
|
u32 pgno, /* Page number of page to load */
|
|
u8 **ppPage, /* OUT: pointer to page buffer */
|
|
int *pnPage /* OUT: Size of (*ppPage) in bytes */
|
|
){
|
|
int rc2;
|
|
int rc = SQLITE_OK;
|
|
sqlite3_stmt *pStmt = pCsr->pStmt;
|
|
|
|
*ppPage = 0;
|
|
*pnPage = 0;
|
|
if( pgno>0 ){
|
|
sqlite3_bind_int64(pStmt, 2, pgno);
|
|
if( SQLITE_ROW==sqlite3_step(pStmt) ){
|
|
int nCopy = sqlite3_column_bytes(pStmt, 0);
|
|
if( nCopy>0 ){
|
|
u8 *pPage;
|
|
pPage = (u8*)sqlite3_malloc64(nCopy + DBDATA_PADDING_BYTES);
|
|
if( pPage==0 ){
|
|
rc = SQLITE_NOMEM;
|
|
}else{
|
|
const u8 *pCopy = sqlite3_column_blob(pStmt, 0);
|
|
memcpy(pPage, pCopy, nCopy);
|
|
memset(&pPage[nCopy], 0, DBDATA_PADDING_BYTES);
|
|
}
|
|
*ppPage = pPage;
|
|
*pnPage = nCopy;
|
|
}
|
|
}
|
|
rc2 = sqlite3_reset(pStmt);
|
|
if( rc==SQLITE_OK ) rc = rc2;
|
|
}
|
|
|
|
return rc;
|
|
}
|
|
|
|
/*
|
|
** Read a varint. Put the value in *pVal and return the number of bytes.
|
|
*/
|
|
static int dbdataGetVarint(const u8 *z, sqlite3_int64 *pVal){
|
|
sqlite3_uint64 u = 0;
|
|
int i;
|
|
for(i=0; i<8; i++){
|
|
u = (u<<7) + (z[i]&0x7f);
|
|
if( (z[i]&0x80)==0 ){ *pVal = (sqlite3_int64)u; return i+1; }
|
|
}
|
|
u = (u<<8) + (z[i]&0xff);
|
|
*pVal = (sqlite3_int64)u;
|
|
return 9;
|
|
}
|
|
|
|
/*
|
|
** Like dbdataGetVarint(), but set the output to 0 if it is less than 0
|
|
** or greater than 0xFFFFFFFF. This can be used for all varints in an
|
|
** SQLite database except for key values in intkey tables.
|
|
*/
|
|
static int dbdataGetVarintU32(const u8 *z, sqlite3_int64 *pVal){
|
|
sqlite3_int64 val;
|
|
int nRet = dbdataGetVarint(z, &val);
|
|
if( val<0 || val>0xFFFFFFFF ) val = 0;
|
|
*pVal = val;
|
|
return nRet;
|
|
}
|
|
|
|
/*
|
|
** Return the number of bytes of space used by an SQLite value of type
|
|
** eType.
|
|
*/
|
|
static int dbdataValueBytes(int eType){
|
|
switch( eType ){
|
|
case 0: case 8: case 9:
|
|
case 10: case 11:
|
|
return 0;
|
|
case 1:
|
|
return 1;
|
|
case 2:
|
|
return 2;
|
|
case 3:
|
|
return 3;
|
|
case 4:
|
|
return 4;
|
|
case 5:
|
|
return 6;
|
|
case 6:
|
|
case 7:
|
|
return 8;
|
|
default:
|
|
if( eType>0 ){
|
|
return ((eType-12) / 2);
|
|
}
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
/*
|
|
** Load a value of type eType from buffer pData and use it to set the
|
|
** result of context object pCtx.
|
|
*/
|
|
static void dbdataValue(
|
|
sqlite3_context *pCtx,
|
|
u32 enc,
|
|
int eType,
|
|
u8 *pData,
|
|
sqlite3_int64 nData
|
|
){
|
|
if( eType>=0 && dbdataValueBytes(eType)<=nData ){
|
|
switch( eType ){
|
|
case 0:
|
|
case 10:
|
|
case 11:
|
|
sqlite3_result_null(pCtx);
|
|
break;
|
|
|
|
case 8:
|
|
sqlite3_result_int(pCtx, 0);
|
|
break;
|
|
case 9:
|
|
sqlite3_result_int(pCtx, 1);
|
|
break;
|
|
|
|
case 1: case 2: case 3: case 4: case 5: case 6: case 7: {
|
|
sqlite3_uint64 v = (signed char)pData[0];
|
|
pData++;
|
|
switch( eType ){
|
|
case 7:
|
|
case 6: v = (v<<16) + (pData[0]<<8) + pData[1]; pData += 2;
|
|
case 5: v = (v<<16) + (pData[0]<<8) + pData[1]; pData += 2;
|
|
case 4: v = (v<<8) + pData[0]; pData++;
|
|
case 3: v = (v<<8) + pData[0]; pData++;
|
|
case 2: v = (v<<8) + pData[0]; pData++;
|
|
}
|
|
|
|
if( eType==7 ){
|
|
double r;
|
|
memcpy(&r, &v, sizeof(r));
|
|
sqlite3_result_double(pCtx, r);
|
|
}else{
|
|
sqlite3_result_int64(pCtx, (sqlite3_int64)v);
|
|
}
|
|
break;
|
|
}
|
|
|
|
default: {
|
|
int n = ((eType-12) / 2);
|
|
if( eType % 2 ){
|
|
switch( enc ){
|
|
#ifndef SQLITE_OMIT_UTF16
|
|
case SQLITE_UTF16BE:
|
|
sqlite3_result_text16be(pCtx, (void*)pData, n, SQLITE_TRANSIENT);
|
|
break;
|
|
case SQLITE_UTF16LE:
|
|
sqlite3_result_text16le(pCtx, (void*)pData, n, SQLITE_TRANSIENT);
|
|
break;
|
|
#endif
|
|
default:
|
|
sqlite3_result_text(pCtx, (char*)pData, n, SQLITE_TRANSIENT);
|
|
break;
|
|
}
|
|
}else{
|
|
sqlite3_result_blob(pCtx, pData, n, SQLITE_TRANSIENT);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/*
|
|
** Move an sqlite_dbdata or sqlite_dbptr cursor to the next entry.
|
|
*/
|
|
static int dbdataNext(sqlite3_vtab_cursor *pCursor){
|
|
DbdataCursor *pCsr = (DbdataCursor*)pCursor;
|
|
DbdataTable *pTab = (DbdataTable*)pCursor->pVtab;
|
|
|
|
pCsr->iRowid++;
|
|
while( 1 ){
|
|
int rc;
|
|
int iOff = (pCsr->iPgno==1 ? 100 : 0);
|
|
int bNextPage = 0;
|
|
|
|
if( pCsr->aPage==0 ){
|
|
while( 1 ){
|
|
if( pCsr->bOnePage==0 && pCsr->iPgno>pCsr->szDb ) return SQLITE_OK;
|
|
rc = dbdataLoadPage(pCsr, pCsr->iPgno, &pCsr->aPage, &pCsr->nPage);
|
|
if( rc!=SQLITE_OK ) return rc;
|
|
if( pCsr->aPage && pCsr->nPage>=256 ) break;
|
|
sqlite3_free(pCsr->aPage);
|
|
pCsr->aPage = 0;
|
|
if( pCsr->bOnePage ) return SQLITE_OK;
|
|
pCsr->iPgno++;
|
|
}
|
|
|
|
assert( iOff+3+2<=pCsr->nPage );
|
|
pCsr->iCell = pTab->bPtr ? -2 : 0;
|
|
pCsr->nCell = get_uint16(&pCsr->aPage[iOff+3]);
|
|
}
|
|
|
|
if( pTab->bPtr ){
|
|
if( pCsr->aPage[iOff]!=0x02 && pCsr->aPage[iOff]!=0x05 ){
|
|
pCsr->iCell = pCsr->nCell;
|
|
}
|
|
pCsr->iCell++;
|
|
if( pCsr->iCell>=pCsr->nCell ){
|
|
sqlite3_free(pCsr->aPage);
|
|
pCsr->aPage = 0;
|
|
if( pCsr->bOnePage ) return SQLITE_OK;
|
|
pCsr->iPgno++;
|
|
}else{
|
|
return SQLITE_OK;
|
|
}
|
|
}else{
|
|
/* If there is no record loaded, load it now. */
|
|
if( pCsr->pRec==0 ){
|
|
int bHasRowid = 0;
|
|
int nPointer = 0;
|
|
sqlite3_int64 nPayload = 0;
|
|
sqlite3_int64 nHdr = 0;
|
|
int iHdr;
|
|
int U, X;
|
|
int nLocal;
|
|
|
|
switch( pCsr->aPage[iOff] ){
|
|
case 0x02:
|
|
nPointer = 4;
|
|
break;
|
|
case 0x0a:
|
|
break;
|
|
case 0x0d:
|
|
bHasRowid = 1;
|
|
break;
|
|
default:
|
|
/* This is not a b-tree page with records on it. Continue. */
|
|
pCsr->iCell = pCsr->nCell;
|
|
break;
|
|
}
|
|
|
|
if( pCsr->iCell>=pCsr->nCell ){
|
|
bNextPage = 1;
|
|
}else{
|
|
|
|
iOff += 8 + nPointer + pCsr->iCell*2;
|
|
if( iOff>pCsr->nPage ){
|
|
bNextPage = 1;
|
|
}else{
|
|
iOff = get_uint16(&pCsr->aPage[iOff]);
|
|
}
|
|
|
|
/* For an interior node cell, skip past the child-page number */
|
|
iOff += nPointer;
|
|
|
|
/* Load the "byte of payload including overflow" field */
|
|
if( bNextPage || iOff>pCsr->nPage ){
|
|
bNextPage = 1;
|
|
}else{
|
|
iOff += dbdataGetVarintU32(&pCsr->aPage[iOff], &nPayload);
|
|
if( nPayload>0x7fffff00 ) nPayload &= 0x3fff;
|
|
}
|
|
|
|
/* If this is a leaf intkey cell, load the rowid */
|
|
if( bHasRowid && !bNextPage && iOff<pCsr->nPage ){
|
|
iOff += dbdataGetVarint(&pCsr->aPage[iOff], &pCsr->iIntkey);
|
|
}
|
|
|
|
/* Figure out how much data to read from the local page */
|
|
U = pCsr->nPage;
|
|
if( bHasRowid ){
|
|
X = U-35;
|
|
}else{
|
|
X = ((U-12)*64/255)-23;
|
|
}
|
|
if( nPayload<=X ){
|
|
nLocal = nPayload;
|
|
}else{
|
|
int M, K;
|
|
M = ((U-12)*32/255)-23;
|
|
K = M+((nPayload-M)%(U-4));
|
|
if( K<=X ){
|
|
nLocal = K;
|
|
}else{
|
|
nLocal = M;
|
|
}
|
|
}
|
|
|
|
if( bNextPage || nLocal+iOff>pCsr->nPage ){
|
|
bNextPage = 1;
|
|
}else{
|
|
|
|
/* Allocate space for payload. And a bit more to catch small buffer
|
|
** overruns caused by attempting to read a varint or similar from
|
|
** near the end of a corrupt record. */
|
|
pCsr->pRec = (u8*)sqlite3_malloc64(nPayload+DBDATA_PADDING_BYTES);
|
|
if( pCsr->pRec==0 ) return SQLITE_NOMEM;
|
|
memset(pCsr->pRec, 0, nPayload+DBDATA_PADDING_BYTES);
|
|
pCsr->nRec = nPayload;
|
|
|
|
/* Load the nLocal bytes of payload */
|
|
memcpy(pCsr->pRec, &pCsr->aPage[iOff], nLocal);
|
|
iOff += nLocal;
|
|
|
|
/* Load content from overflow pages */
|
|
if( nPayload>nLocal ){
|
|
sqlite3_int64 nRem = nPayload - nLocal;
|
|
u32 pgnoOvfl = get_uint32(&pCsr->aPage[iOff]);
|
|
while( nRem>0 ){
|
|
u8 *aOvfl = 0;
|
|
int nOvfl = 0;
|
|
int nCopy;
|
|
rc = dbdataLoadPage(pCsr, pgnoOvfl, &aOvfl, &nOvfl);
|
|
assert( rc!=SQLITE_OK || aOvfl==0 || nOvfl==pCsr->nPage );
|
|
if( rc!=SQLITE_OK ) return rc;
|
|
if( aOvfl==0 ) break;
|
|
|
|
nCopy = U-4;
|
|
if( nCopy>nRem ) nCopy = nRem;
|
|
memcpy(&pCsr->pRec[nPayload-nRem], &aOvfl[4], nCopy);
|
|
nRem -= nCopy;
|
|
|
|
pgnoOvfl = get_uint32(aOvfl);
|
|
sqlite3_free(aOvfl);
|
|
}
|
|
}
|
|
|
|
iHdr = dbdataGetVarintU32(pCsr->pRec, &nHdr);
|
|
if( nHdr>nPayload ) nHdr = 0;
|
|
pCsr->nHdr = nHdr;
|
|
pCsr->pHdrPtr = &pCsr->pRec[iHdr];
|
|
pCsr->pPtr = &pCsr->pRec[pCsr->nHdr];
|
|
pCsr->iField = (bHasRowid ? -1 : 0);
|
|
}
|
|
}
|
|
}else{
|
|
pCsr->iField++;
|
|
if( pCsr->iField>0 ){
|
|
sqlite3_int64 iType;
|
|
if( pCsr->pHdrPtr>&pCsr->pRec[pCsr->nRec] ){
|
|
bNextPage = 1;
|
|
}else{
|
|
int szField = 0;
|
|
pCsr->pHdrPtr += dbdataGetVarintU32(pCsr->pHdrPtr, &iType);
|
|
szField = dbdataValueBytes(iType);
|
|
if( (pCsr->nRec - (pCsr->pPtr - pCsr->pRec))<szField ){
|
|
pCsr->pPtr = &pCsr->pRec[pCsr->nRec];
|
|
}else{
|
|
pCsr->pPtr += szField;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if( bNextPage ){
|
|
sqlite3_free(pCsr->aPage);
|
|
sqlite3_free(pCsr->pRec);
|
|
pCsr->aPage = 0;
|
|
pCsr->pRec = 0;
|
|
if( pCsr->bOnePage ) return SQLITE_OK;
|
|
pCsr->iPgno++;
|
|
}else{
|
|
if( pCsr->iField<0 || pCsr->pHdrPtr<&pCsr->pRec[pCsr->nHdr] ){
|
|
return SQLITE_OK;
|
|
}
|
|
|
|
/* Advance to the next cell. The next iteration of the loop will load
|
|
** the record and so on. */
|
|
sqlite3_free(pCsr->pRec);
|
|
pCsr->pRec = 0;
|
|
pCsr->iCell++;
|
|
}
|
|
}
|
|
}
|
|
|
|
assert( !"can't get here" );
|
|
return SQLITE_OK;
|
|
}
|
|
|
|
/*
|
|
** Return true if the cursor is at EOF.
|
|
*/
|
|
static int dbdataEof(sqlite3_vtab_cursor *pCursor){
|
|
DbdataCursor *pCsr = (DbdataCursor*)pCursor;
|
|
return pCsr->aPage==0;
|
|
}
|
|
|
|
/*
|
|
** Return true if nul-terminated string zSchema ends in "()". Or false
|
|
** otherwise.
|
|
*/
|
|
static int dbdataIsFunction(const char *zSchema){
|
|
size_t n = strlen(zSchema);
|
|
if( n>2 && zSchema[n-2]=='(' && zSchema[n-1]==')' ){
|
|
return (int)n-2;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
** Determine the size in pages of database zSchema (where zSchema is
|
|
** "main", "temp" or the name of an attached database) and set
|
|
** pCsr->szDb accordingly. If successful, return SQLITE_OK. Otherwise,
|
|
** an SQLite error code.
|
|
*/
|
|
static int dbdataDbsize(DbdataCursor *pCsr, const char *zSchema){
|
|
DbdataTable *pTab = (DbdataTable*)pCsr->base.pVtab;
|
|
char *zSql = 0;
|
|
int rc, rc2;
|
|
int nFunc = 0;
|
|
sqlite3_stmt *pStmt = 0;
|
|
|
|
if( (nFunc = dbdataIsFunction(zSchema))>0 ){
|
|
zSql = sqlite3_mprintf("SELECT %.*s(0)", nFunc, zSchema);
|
|
}else{
|
|
zSql = sqlite3_mprintf("PRAGMA %Q.page_count", zSchema);
|
|
}
|
|
if( zSql==0 ) return SQLITE_NOMEM;
|
|
|
|
rc = sqlite3_prepare_v2(pTab->db, zSql, -1, &pStmt, 0);
|
|
sqlite3_free(zSql);
|
|
if( rc==SQLITE_OK && sqlite3_step(pStmt)==SQLITE_ROW ){
|
|
pCsr->szDb = sqlite3_column_int(pStmt, 0);
|
|
}
|
|
rc2 = sqlite3_finalize(pStmt);
|
|
if( rc==SQLITE_OK ) rc = rc2;
|
|
return rc;
|
|
}
|
|
|
|
/*
|
|
** Attempt to figure out the encoding of the database by retrieving page 1
|
|
** and inspecting the header field. If successful, set the pCsr->enc variable
|
|
** and return SQLITE_OK. Otherwise, return an SQLite error code.
|
|
*/
|
|
static int dbdataGetEncoding(DbdataCursor *pCsr){
|
|
int rc = SQLITE_OK;
|
|
int nPg1 = 0;
|
|
u8 *aPg1 = 0;
|
|
rc = dbdataLoadPage(pCsr, 1, &aPg1, &nPg1);
|
|
if( rc==SQLITE_OK && nPg1>=(56+4) ){
|
|
pCsr->enc = get_uint32(&aPg1[56]);
|
|
}
|
|
sqlite3_free(aPg1);
|
|
return rc;
|
|
}
|
|
|
|
|
|
/*
|
|
** xFilter method for sqlite_dbdata and sqlite_dbptr.
|
|
*/
|
|
static int dbdataFilter(
|
|
sqlite3_vtab_cursor *pCursor,
|
|
int idxNum, const char *idxStr,
|
|
int argc, sqlite3_value **argv
|
|
){
|
|
DbdataCursor *pCsr = (DbdataCursor*)pCursor;
|
|
DbdataTable *pTab = (DbdataTable*)pCursor->pVtab;
|
|
int rc = SQLITE_OK;
|
|
const char *zSchema = "main";
|
|
(void)idxStr;
|
|
(void)argc;
|
|
|
|
dbdataResetCursor(pCsr);
|
|
assert( pCsr->iPgno==1 );
|
|
if( idxNum & 0x01 ){
|
|
zSchema = (const char*)sqlite3_value_text(argv[0]);
|
|
if( zSchema==0 ) zSchema = "";
|
|
}
|
|
if( idxNum & 0x02 ){
|
|
pCsr->iPgno = sqlite3_value_int(argv[(idxNum & 0x01)]);
|
|
pCsr->bOnePage = 1;
|
|
}else{
|
|
rc = dbdataDbsize(pCsr, zSchema);
|
|
}
|
|
|
|
if( rc==SQLITE_OK ){
|
|
int nFunc = 0;
|
|
if( pTab->pStmt ){
|
|
pCsr->pStmt = pTab->pStmt;
|
|
pTab->pStmt = 0;
|
|
}else if( (nFunc = dbdataIsFunction(zSchema))>0 ){
|
|
char *zSql = sqlite3_mprintf("SELECT %.*s(?2)", nFunc, zSchema);
|
|
if( zSql==0 ){
|
|
rc = SQLITE_NOMEM;
|
|
}else{
|
|
rc = sqlite3_prepare_v2(pTab->db, zSql, -1, &pCsr->pStmt, 0);
|
|
sqlite3_free(zSql);
|
|
}
|
|
}else{
|
|
rc = sqlite3_prepare_v2(pTab->db,
|
|
"SELECT data FROM sqlite_dbpage(?) WHERE pgno=?", -1,
|
|
&pCsr->pStmt, 0
|
|
);
|
|
}
|
|
}
|
|
if( rc==SQLITE_OK ){
|
|
rc = sqlite3_bind_text(pCsr->pStmt, 1, zSchema, -1, SQLITE_TRANSIENT);
|
|
}
|
|
|
|
/* Try to determine the encoding of the db by inspecting the header
|
|
** field on page 1. */
|
|
if( rc==SQLITE_OK ){
|
|
rc = dbdataGetEncoding(pCsr);
|
|
}
|
|
|
|
if( rc!=SQLITE_OK ){
|
|
pTab->base.zErrMsg = sqlite3_mprintf("%s", sqlite3_errmsg(pTab->db));
|
|
}
|
|
|
|
if( rc==SQLITE_OK ){
|
|
rc = dbdataNext(pCursor);
|
|
}
|
|
return rc;
|
|
}
|
|
|
|
/*
|
|
** Return a column for the sqlite_dbdata or sqlite_dbptr table.
|
|
*/
|
|
static int dbdataColumn(
|
|
sqlite3_vtab_cursor *pCursor,
|
|
sqlite3_context *ctx,
|
|
int i
|
|
){
|
|
DbdataCursor *pCsr = (DbdataCursor*)pCursor;
|
|
DbdataTable *pTab = (DbdataTable*)pCursor->pVtab;
|
|
if( pTab->bPtr ){
|
|
switch( i ){
|
|
case DBPTR_COLUMN_PGNO:
|
|
sqlite3_result_int64(ctx, pCsr->iPgno);
|
|
break;
|
|
case DBPTR_COLUMN_CHILD: {
|
|
int iOff = pCsr->iPgno==1 ? 100 : 0;
|
|
if( pCsr->iCell<0 ){
|
|
iOff += 8;
|
|
}else{
|
|
iOff += 12 + pCsr->iCell*2;
|
|
if( iOff>pCsr->nPage ) return SQLITE_OK;
|
|
iOff = get_uint16(&pCsr->aPage[iOff]);
|
|
}
|
|
if( iOff<=pCsr->nPage ){
|
|
sqlite3_result_int64(ctx, get_uint32(&pCsr->aPage[iOff]));
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
}else{
|
|
switch( i ){
|
|
case DBDATA_COLUMN_PGNO:
|
|
sqlite3_result_int64(ctx, pCsr->iPgno);
|
|
break;
|
|
case DBDATA_COLUMN_CELL:
|
|
sqlite3_result_int(ctx, pCsr->iCell);
|
|
break;
|
|
case DBDATA_COLUMN_FIELD:
|
|
sqlite3_result_int(ctx, pCsr->iField);
|
|
break;
|
|
case DBDATA_COLUMN_VALUE: {
|
|
if( pCsr->iField<0 ){
|
|
sqlite3_result_int64(ctx, pCsr->iIntkey);
|
|
}else if( &pCsr->pRec[pCsr->nRec] >= pCsr->pPtr ){
|
|
sqlite3_int64 iType;
|
|
dbdataGetVarintU32(pCsr->pHdrPtr, &iType);
|
|
dbdataValue(
|
|
ctx, pCsr->enc, iType, pCsr->pPtr,
|
|
&pCsr->pRec[pCsr->nRec] - pCsr->pPtr
|
|
);
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
return SQLITE_OK;
|
|
}
|
|
|
|
/*
|
|
** Return the rowid for an sqlite_dbdata or sqlite_dptr table.
|
|
*/
|
|
static int dbdataRowid(sqlite3_vtab_cursor *pCursor, sqlite_int64 *pRowid){
|
|
DbdataCursor *pCsr = (DbdataCursor*)pCursor;
|
|
*pRowid = pCsr->iRowid;
|
|
return SQLITE_OK;
|
|
}
|
|
|
|
|
|
/*
|
|
** Invoke this routine to register the "sqlite_dbdata" virtual table module
|
|
*/
|
|
static int sqlite3DbdataRegister(sqlite3 *db){
|
|
static sqlite3_module dbdata_module = {
|
|
0, /* iVersion */
|
|
0, /* xCreate */
|
|
dbdataConnect, /* xConnect */
|
|
dbdataBestIndex, /* xBestIndex */
|
|
dbdataDisconnect, /* xDisconnect */
|
|
0, /* xDestroy */
|
|
dbdataOpen, /* xOpen - open a cursor */
|
|
dbdataClose, /* xClose - close a cursor */
|
|
dbdataFilter, /* xFilter - configure scan constraints */
|
|
dbdataNext, /* xNext - advance a cursor */
|
|
dbdataEof, /* xEof - check for end of scan */
|
|
dbdataColumn, /* xColumn - read data */
|
|
dbdataRowid, /* xRowid - read data */
|
|
0, /* xUpdate */
|
|
0, /* xBegin */
|
|
0, /* xSync */
|
|
0, /* xCommit */
|
|
0, /* xRollback */
|
|
0, /* xFindMethod */
|
|
0, /* xRename */
|
|
0, /* xSavepoint */
|
|
0, /* xRelease */
|
|
0, /* xRollbackTo */
|
|
0, /* xShadowName */
|
|
0 /* xIntegrity */
|
|
};
|
|
|
|
int rc = sqlite3_create_module(db, "sqlite_dbdata", &dbdata_module, 0);
|
|
if( rc==SQLITE_OK ){
|
|
rc = sqlite3_create_module(db, "sqlite_dbptr", &dbdata_module, (void*)1);
|
|
}
|
|
return rc;
|
|
}
|
|
|
|
int sqlite3_dbdata_init(
|
|
sqlite3 *db,
|
|
char **pzErrMsg,
|
|
const sqlite3_api_routines *pApi
|
|
){
|
|
(void)pzErrMsg;
|
|
return sqlite3DbdataRegister(db);
|
|
}
|
|
|
|
#endif /* ifndef SQLITE_OMIT_VIRTUALTABLE */
|