From: dan <Dan Kennedy>
Date: Fri, 17 May 2024 14:26:32 +0000 (+0000)
Subject: Merge branches "fix-onerow-opt", "faster-openread", "fts5-delay-tokenizer" and "enhan... 
X-Git-Tag: version-3.47.0~393^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c83386cbe562129e342a3b1dec7410b00351e35f;p=thirdparty%2Fsqlite.git

Merge branches "fix-onerow-opt", "faster-openread", "fts5-delay-tokenizer" and "enhanced-raise", each containing minor enhancements prepared for 3.47, into this branch.

FossilOrigin-Name: 6dc6472175bccbed15ebf6811c209d1a0b5fad60158fb32040210f2cdae916a6
---

c83386cbe562129e342a3b1dec7410b00351e35f
diff --cc manifest
index ea1aa1987f,2c7cfc8e18,ce12661dbc,3cb7a0d73a,1546c38dec..7e356796ed
--- a/manifest
+++ b/manifest
@@@@@@ -1,5 -1,5 -1,5 -1,5 -1,5 +1,5 @@@@@@
-    C Add\sextra\stests\sfor\sthe\serror\smessages\sgenerated\sby\ssqlite3_declare_vtab()\swhen\spassed\ssomething\sother\sthan\sa\swell-formed\sCREATE\sTABLE\sstatement.
-    D 2024-05-16T16:22:51.903
 -   C Allow\sarbitrary\sexpressions\sas\sthe\ssecond\sargument\sto\sRAISE().
 -   D 2024-05-08T17:42:13.761
  -  C Optimize\squeries\sagainst\sfts5vocab(row)\stables\sthat\sdo\suse\sthe\s"cnt"\scolumn.
  -  D 2024-05-14T19:41:19.118
   - C Optimization\sin\sthe\simplementation\sof\sOP_OpenRead\sand\sOP_OpenWrite
   - D 2024-05-12T00:26:08.975
    -C Fix\sa\sproblem\sin\swhere.c\spreventing\sSQLite\sfrom\sidentifying\ssome\sONEROW\sscans,\sleading\sto\s(slightly)\ssub-optimal\sbyte-code.
    -D 2024-05-17T13:56:38.514
+++++C Merge\sbranches\s"fix-onerow-opt",\s"faster-openread",\s"fts5-delay-tokenizer"\sand\s"enhanced-raise",\seach\scontaining\sminor\senhancements\sprepared\sfor\s3.47,\sinto\sthis\sbranch.
+++++D 2024-05-17T14:26:32.984
     F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
     F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
     F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@@@@ -704,9 -703,9 -703,9 -703,9 -704,9 +704,9 @@@@@@ F src/date.c 126ba2ab10aeb2e7ba6e089b5f
     F src/dbpage.c 80e46e1df623ec40486da7a5086cb723b0275a6e2a7b01d9f9b5da0f04ba2782
     F src/dbstat.c 3b677254d512fcafd4d0b341bf267b38b235ccfddbef24f9154e19360fa22e43
     F src/delete.c cb766727c78e715f9fb7ec8a7d03658ed2a3016343ca687acfcec9083cdca500
- ---F src/expr.c f7bad20d2f74005f1f876e7fbb627222ea28250e44b296b047403720c5c21818
 -   F src/expr.c dff4775b9aa9e6a397b37dda601207c6c0024df8cb5ec43e66fd07f5efd9bd6c
+++++F src/expr.c 50e71ed518f1b1ba8401006922a309e200d205b2ca5b93d6fd8a006a336dbf67
     F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
- ---F src/fkey.c a47610f0a5c6cb0ad79f8fcef039c01833dec0c751bb695f28dc0ec6a4c3ba00
+ +++F src/fkey.c 852f93c0ef995e0c2b8983059a2b97151c194cc8259e21f5bc2b7ac508348c2a
     F src/func.c 283d4f3b2751a1d9339fd93a8a013d1948fd5f4474a3cab0955eb4fafd445d0f
     F src/global.c 61a419dd9e993b9be0f91de4c4ccf322b053eb829868e089f0321dd669be3b90
     F src/hash.c 9ee4269fb1d6632a6fecfb9479c93a1f29271bddbbaf215dd60420bcb80c7220
@@@@@@ -749,13 -748,13 -748,13 -748,13 -749,13 +749,13 @@@@@@ F src/pcache.h 1497ce1b823cf00094bb0cf3
     F src/pcache1.c 602acb23c471bb8d557a6f0083cc2be641d6cafcafa19e481eba7ef4c9ca0f00
     F src/pragma.c 52bfbf6dfd668b69b5eb9bd1186e3a67367c8453807150d6e75239229924f684
     F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 -   F src/prepare.c 371f6115cb69286ebc12c6f2d7511279c2e47d9f54f475d46a554d687a3b312c
 +   F src/prepare.c d99931f45416652895e502328ca49fe782cfc4e1ebdcda13b3736d991ebf42ce
     F src/printf.c 8b250972305e14b365561be5117ed0fd364e4fd58968776df1ce64c6280b90f9
     F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 --- F src/resolve.c 8816212645e4e9bdf3cc2f2d298304f388d699f8fab47f3a5712ef5bbc5b6ccc
 +++ F src/resolve.c 6adf4bf10151bca046f3206ae8ff07dbf90b49de20bea49197f010276f5f494d
     F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 -   F src/select.c 04178566d0188be7de471064ced8cec1d407920726cb49b609486282d78faf56
 -   F src/shell.c.in 0354ca51eee5fbf6af394a7ef9f5ef6823ef45b743db65431f6777e4d5be2199
  -- F src/select.c ce81687d769b174aa547b8216a34fabc9cafc05789b615494ab78dc2c1e799fa
 +++ F src/select.c 1a841c38974d45cf15a7611398479182b61ad4c187423c380741d8b1688fe607
 +   F src/shell.c.in 8f2406e4e8d726452e48058d117f52e86b789f47435157b0418fb06c631349b6
     F src/sqlite.h.in 32389e0d584551b300d0157881336162c14315a424cbf385c0d65eb7c2e31f7b
     F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
     F src/sqlite3ext.h 3f046c04ea3595d6bfda99b781926b17e672fd6d27da2ba6d8d8fc39981dcb54
@@@@@@ -824,7 -823,7 -823,7 -823,7 -824,7 +824,7 @@@@@@ F src/upsert.c 2e60567a0e9e8520c18671b3
     F src/utf.c f23165685a67b4caf8ec08fb274cb3f319103decfb2a980b7cfd55d18dfa855e
     F src/util.c 4d6d7ebfe6772a1b950c97bbb1d1a72ad4874617ec498ab8aa73b7f5a43e44bb
     F src/vacuum.c 604fcdaebe76f3497c855afcbf91b8fa5046b32de3045bab89cc008d68e40104
- - -F src/vdbe.c 3b1793c5d2235ae89b01ef051a33d7d2ad3704c71799653b112686735ad401ff
 -   F src/vdbe.c 2fdfe0535fa517fb4590144121c040c5703db318e7479d6d62ba6ab2e699e001
   - F src/vdbe.c cddb27d049602441e635e5301d5c6301af287fd8298fa3cfd71fbd4497c80364
+++++F src/vdbe.c 2448b34ff095efa5a8d9dd525c4c0842ef7226e44b68fe8df1053ee9894aa5fd
     F src/vdbe.h c2d78d15112c3fc5ab87f5e8e0b75d2db1c624409de2e858c3d1aafb1650bb4f
     F src/vdbeInt.h 949669dfd8a41550d27dcb905b494f2ccde9a2e6c1b0b04daa1227e2e74c2b2c
     F src/vdbeapi.c 80235ac380e9467fec1cb0883354d841f2a771976e766995f7e0c77f845406df
@@@@@@ -939,7 -938,7 -938,7 -938,7 -939,7 +939,7 @@@@@@ F test/bestindex8.test b63a4f171a2c83d4
     F test/bestindex9.test 1a4b93db117fd8abe74ae9be982f86aa72f01e60cd4ac541e6ede39673a451a0
     F test/bestindexA.test e1b5def6b190797cacf008e6815ffb78fb30261999030d60a728d572eef44c7f
     F test/bestindexB.test 328b97b69cd1a20928d5997f9ecb04d2e00f1d18e19ab27f9e9adb44d7bc51ce
 - - F test/bestindexC.test c14a8c8639b6825b0efa1ae693f34ec04f41a46e3056e7063d6e0f46bf4ff692
  -  F test/bestindexC.test a2d4ab909e17bb58fe4d66a394460e713620c7b2964b450bc82216c171d264a2
 +++ F test/bestindexC.test 9e6f184be080fd9c4605a7e5c7097eed1a259372f9af78151c37b072a9086f86
     F test/between.test b9a65fb065391980119e8a781a7409d3fcf059d89968279c750e190a9a1d5263
     F test/bigfile.test aa74f4e5db51c8e54a1d9de9fa65d01d1eb20b59
     F test/bigfile2.test 1b489a3a39ae90c7f027b79110d6b4e1dbc71bfc
@@@@@@ -2191,8 -2189,11 -2190,8 -2190,11 -2191,11 +2191,15 @@@@@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
     F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
     F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
     F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-    P 1ec2961a0341619ae88832942b52606b3246fc0de07ca6da0300e4bfc656ecf0
-    R 3e80a1a8d16383b10a9edc0a3a535e00
 -   P 42d67c6fed3a5f21d7b71515aca471ba61d387e620022735a2e7929fa3a237cf
 -   R 2f3bd2a16acd125a41b6775ce57250d9
 -   T *branch * enhanced-raise
 -   T *sym-enhanced-raise *
  -  P c0c91e306c252ce1b398e92ab958e2a3de0fc43db05cfdffc548380654fc9f13
  -  R c8ee37ea6d4a33968236083c174d19e7
   - P c6fd70b3c23fa00eaac9286d4a67e5c8ac76f926c11c220250c34032647bedc1
   - R 94b8709f5c282eb8bc9897cb13e98353
   - T *branch * faster-openread
   - T *sym-faster-openread *
    -P 5fa0c2a026f0467af3a76ea80cee8168b7a49553c350f642d1dff02ff9e7aeed
    -R 2eb5df88e143b963f30ca5abd4335fa3
    -T *branch * fix-onerow-opt
    -T *sym-fix-onerow-opt *
+++++P 5fa0c2a026f0467af3a76ea80cee8168b7a49553c350f642d1dff02ff9e7aeed 003e1c8c27824cb917b3869bdf9000f32ff0b6887a2aff8516712cfe865cf34d 96a591c202cb4218999ece3de063bf466b6fd81bd23383893f3913ecb52dda36 3a256a1667b15702dc5048fdf2fdba9c1e551106ce8cf391360f156fab35ecc5 b41e71208abcdf988f57c3fd7e6a372bbaf442c32a8e2c051beb8d45c8001e0f
+++++R e8336e7694086906c728a80981692620
+++++T *branch * pending-3.46
+++++T *sym-pending-3.46 *
+++++T +closed 003e1c8c27824cb917b3869bdf9000f32ff0b6887a2aff8516712cfe865cf34d
+++++T +closed 3a256a1667b15702dc5048fdf2fdba9c1e551106ce8cf391360f156fab35ecc5
+++++T +closed 96a591c202cb4218999ece3de063bf466b6fd81bd23383893f3913ecb52dda36
+++++T +closed b41e71208abcdf988f57c3fd7e6a372bbaf442c32a8e2c051beb8d45c8001e0f
+ +  T -sym-trunk *
 - - U drh
 -   Z 0fd130dec139b10d531d7d8015ffe4ed
   - Z 9b80a9cf5df794917ed8b64261d9c345
 + + U dan
-    Z 4379dfd9de0672673743bdb6b799c4de
  -  Z 493cbd0a2ca537422c58bc5b9554c10a
    -Z 4e3116b49700fa7a9c75b5f5cd140ab3
+++++Z c49a8bf6544e23e44208d0244df34726
     # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 5851bda00f,6014fe7714,84c463d5a0,d67b982a54,d7af65ac77..62d545716c
--- a/manifest.uuid
+++ b/manifest.uuid
@@@@@@ -1,1 -1,1 -1,1 -1,1 -1,1 +1,1 @@@@@@
-    5fa0c2a026f0467af3a76ea80cee8168b7a49553c350f642d1dff02ff9e7aeed
 -   003e1c8c27824cb917b3869bdf9000f32ff0b6887a2aff8516712cfe865cf34d
  -  96a591c202cb4218999ece3de063bf466b6fd81bd23383893f3913ecb52dda36
   - 3a256a1667b15702dc5048fdf2fdba9c1e551106ce8cf391360f156fab35ecc5
    -b41e71208abcdf988f57c3fd7e6a372bbaf442c32a8e2c051beb8d45c8001e0f
+++++6dc6472175bccbed15ebf6811c209d1a0b5fad60158fb32040210f2cdae916a6