Unroll a loop in the parser for a performance increase.

FossilOrigin-Name: a6dc29e4d5e13949e0fcd9d5dde575c2670eb10a230ab9df3806fc8c3016c540

diff --git a/manifest b/manifest
index 776e83a5e662e9dec032b577734f21d637395404..54838edff6576ddc483fe9b5ad818bbd3402537a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarnings\sand\senhance\sperformance\sthe\sparser.
-D 2023-12-02T01:06:33.225
+C Unroll\sa\sloop\sin\sthe\sparser\sfor\sa\sperformance\sincrease.
+D 2023-12-02T01:38:53.624
 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 58c3ded3bdc94125235a805214016147ecd63f8173cff19a7084c9fb0ea0ff9c
+F src/json.c 5363d3a9e6d4f8a77b735f279aedc0139f5ba4a1c6dff5052cc8b8f31012d9ef
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
 F src/main.c 1b89f3de98d1b59fec5bac1d66d6ece21f703821b8eaa0d53d9604c35309f6f9
@@ -2145,8 +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 68d191f40e708962ec88e0c245b4496bc4a671300484b1cc0f3fc7e6d199a6e6
-R 398de78fe5dea0e1b0bc6535ce40a9fc
+P 285633da6d188547e52f07779e209c9e5f3dc33ce0668e14858f3337889ef4b8
+R 5a9d6175e86127f56f06090dd3d036f6
 U drh
-Z c1eeb98e2ab1260bdea70d2e8aff46bd
+Z 9e063f5d4d8d31b6e06beb4f188d0a08
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index b7c120681c1f9b567bbe2c34c1e3357879299c31..beaced137d36ad756e62559f4b93f56b78a734fc 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-285633da6d188547e52f07779e209c9e5f3dc33ce0668e14858f3337889ef4b8
\ No newline at end of file
+a6dc29e4d5e13949e0fcd9d5dde575c2670eb10a230ab9df3806fc8c3016c540
\ No newline at end of file

diff --git a/src/json.c b/src/json.c
index 6c86d98f2f2cbbaf3392e28f21c30b32931cf512..62e3d652fd3528f91f98bf0fbf593987ac181afb 100644 (file)
--- a/src/json.c
+++ b/src/json.c
@@ -1391,8 +1391,16 @@ json_parse_restart:
     opcode = JSONB_TEXT;
   parse_string:
     cDelim = z[i];
-    for(j=i+1; 1; j++){
-      if( jsonIsOk[(unsigned char)z[j]] ) continue;
+    j = i+1;
+    while( 1 /*exit-by-break*/ ){
+      if( jsonIsOk[(u8)z[j]] ){
+        if( jsonIsOk[(u8)z[j+1]] ){
+          j += 2;
+          continue;
+        }else{
+          j += 1;
+        }
+      }
       c = z[j];
       if( c==cDelim ){
         break;
@@ -1421,6 +1429,7 @@ json_parse_restart:
         pParse->iErr = j;
         return -1;
       }
+      j++;
     }
     jsonBlobAppendNodeType(pParse, opcode, j-1-i);
     jsonBlobAppendNBytes(pParse, (const u8*)&z[i+1], j-1-i);