]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Merge the latest trunk enhancements into the json-opt branch.
authordrh <>
Mon, 24 Jul 2023 12:37:23 +0000 (12:37 +0000)
committerdrh <>
Mon, 24 Jul 2023 12:37:23 +0000 (12:37 +0000)
FossilOrigin-Name: 00bfc4918be49ac74a3e7851c88ab7ec226e6a37853f8ad4c77f758751960456

1  2 
manifest
manifest.uuid
src/json.c

diff --cc manifest
index 715018c3619b17d2ab1e1ec997f17a2d76f4c64d,ef9ea0e9d6221f42853ff1b75b4a2147be7436af..552d7e205ed4a33db29025187262e2ca38c740d9
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C More\sinfrastructure\schanges\stowards\simproving\sJSON\scache\sperformance.\nIncremental\scheck-in.
- D 2023-07-21T11:09:53.138
 -C When\swriting\sthe\sfilename\sheader\sin\sa\sopfs-sahpool\sfile,\sensure\sthat\sall\sremaining\sbytes\sin\sthat\spart\sof\sthe\sheader\sare\szeroed\sout\sto\savoid\sthe\sdownstream\sproblems\sreported\sin\s[forum:d50ec48a293988a5|forum\spost\sd50ec48a293988a5].
 -D 2023-07-23T22:14:41.081
++C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sjson-opt\sbranch.
++D 2023-07-24T12:37:23.834
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@@ -597,7 -598,7 +598,7 @@@ F src/hash.h 3340ab6e1d13e725571d7cee6d
  F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6
  F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
  F src/insert.c 3f0a94082d978bbdd33c38fefea15346c6c6bffb70bc645a71dc0f1f87dd3276
- F src/json.c 3bdc8916ee1acf47f63373278b7913befea89fc8f4bfc0299ae9a2b34b35ee07
 -F src/json.c 46ea5566e1363f4f353db79b0378c2bf8ffdf9d4667daee3df67b14669767bed
++F src/json.c d34d10ea1520bb71ee69c500deb4a20847a57b4c59c1ecb807c935f53c870885
  F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
  F src/loadext.c 176d6b2cb18a6ad73b133db17f6fc351c4d9a2d510deebdb76c22bde9cfd1465
  F src/main.c 512b1d45bc556edf4471a845afb7ba79e64bd5b832ab222dc195c469534cd002
@@@ -2043,8 -2044,8 +2044,8 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P e384163a4763c10b5838cbf28f9c4d8ea799bbbed6e890e8aa91b2bd1458646d
- R 35c799f493c52a97264947f70c69a12e
 -P d2e602cda44bf35e76167143262b4f91826d25780d0e095e680a31d5dedb2018
 -R 47af828f435c00e0fb124001796bea21
 -U stephan
 -Z 3f8f8cf2fbd99e80728947340dd883ad
++P 1955e66cfc4614df97b8d68b0e662f309513d62dc8aeec71af5a54e66b79c707 c1b080e39397c983c13a5e79303223827de7b4946c18a79396851ec1814782f3
++R 2ab9518ef262a1aca9fe7f6a2ac934e0
 +U drh
- Z 7b5e59d8c6f3a8847c09c081e8b2a5bc
++Z 40e6676e6b6212e46c825865d3333a87
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index b1ca498e2252cc73a7e8f736281cc7e60f0e00a9,9921927a14a08cbb5cf29a7833dc68ddd6ca5e44..37810abc34d9c68567adeb23c2a71709f52721dc
@@@ -1,1 -1,1 +1,1 @@@
- 1955e66cfc4614df97b8d68b0e662f309513d62dc8aeec71af5a54e66b79c707
 -c1b080e39397c983c13a5e79303223827de7b4946c18a79396851ec1814782f3
++00bfc4918be49ac74a3e7851c88ab7ec226e6a37853f8ad4c77f758751960456
diff --cc src/json.c
Simple merge