Performance optimization in the JSON parser.

FossilOrigin-Name: 68d191f40e708962ec88e0c245b4496bc4a671300484b1cc0f3fc7e6d199a6e6

diff --git a/manifest b/manifest
index 05817d816e8e9cb12eed3bd8fce0a96e3104bea5..6df01a3cfa0a3217616d96cf65ade32e1390c8c8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C JSON\scache\sis\snow\smore\seffective.
-D 2023-12-01T18:49:02.694
+C Performance\soptimization\sin\sthe\sJSON\sparser.
+D 2023-12-01T22:01:26.348
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -688,7 +688,7 @@ F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
 F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 F src/insert.c 3f0a94082d978bbdd33c38fefea15346c6c6bffb70bc645a71dc0f1f87dd3276
-F src/json.c 3556e879386b0af1c542ed13ebb2f58c48d3b8b3ab13a96ab77ad2a9493cc715
+F src/json.c d524f2f13338f84327641edd5b422252d7c93a4f7fc57f083a0d41c767561554
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
 F src/main.c 1b89f3de98d1b59fec5bac1d66d6ece21f703821b8eaa0d53d9604c35309f6f9
@@ -2145,9 +2145,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 25ed295f300fea6185104a73721076bccd2b2a6e411c78564266fa6dca4ff70c 1fdbc39521f63aedc6f08ecaafa54ea467b8c6316a692a18ad01eecbf22a0977
-R bed96169a434a08ba8168cff3e09a739
-T +closed 1fdbc39521f63aedc6f08ecaafa54ea467b8c6316a692a18ad01eecbf22a0977
+P 443a3f3a8e64d81cad8300a30e2cc57c4e39f69b5669ac8b550c590ae9f1134a
+R a25493165248fa490fe7a3cb972ea0d2
 U drh
-Z 38a6916a5a09665f20ec73466c161c5c
+Z 51cb7fe7cb06e4de05d17231c2159ec6
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index caad1123490335f893cc6e0f54dd68532c058845..0d822e57d7314fb46cd358edaf9100a142ad4bf0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-443a3f3a8e64d81cad8300a30e2cc57c4e39f69b5669ac8b550c590ae9f1134a
\ No newline at end of file
+68d191f40e708962ec88e0c245b4496bc4a671300484b1cc0f3fc7e6d199a6e6
\ No newline at end of file

diff --git a/src/json.c b/src/json.c
index 08e0f4fb635840a92ed17e7de36574ddb22979f9..3ae88be9d4c1e4637be737e51524adf417641249 100644 (file)
--- a/src/json.c
+++ b/src/json.c
@@ -1366,7 +1366,6 @@ json_parse_restart:
   case '\'': {
     u8 opcode;
     char cDelim;
-    int nn;
     pParse->hasNonstd = 1;
     opcode = JSONB_TEXT;
     goto parse_string;
@@ -1375,12 +1374,7 @@ json_parse_restart:
     opcode = JSONB_TEXT;
   parse_string:
     cDelim = z[i];
-    nn = pParse->nJson;
     for(j=i+1; 1; j++){
-      if( j>=nn ){
-        pParse->iErr = j;
-        return -1;
-      }
       if( jsonIsOk[(unsigned char)z[j]] ) continue;
       c = z[j];
       if( c==cDelim ){