Simplification and optimization of the JSON parser.

FossilOrigin-Name: f5ec9485119a2a6cb33eb864c7ca9b41d4a2ed08ab6ad9a6b0dd9358ab253576

diff --git a/manifest b/manifest
index 54838edff6576ddc483fe9b5ad818bbd3402537a..07d971dc385bd17b2c9ae08bb3da69df1cfdafcf 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Unroll\sa\sloop\sin\sthe\sparser\sfor\sa\sperformance\sincrease.
-D 2023-12-02T01:38:53.624
+C Simplification\sand\soptimization\sof\sthe\sJSON\sparser.
+D 2023-12-02T13:36:52.119
 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 5363d3a9e6d4f8a77b735f279aedc0139f5ba4a1c6dff5052cc8b8f31012d9ef
+F src/json.c 73558b9dca8f326045c42350bd8274c9a9a6489cdb145b2208a8fc7e50a04247
 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 285633da6d188547e52f07779e209c9e5f3dc33ce0668e14858f3337889ef4b8
-R 5a9d6175e86127f56f06090dd3d036f6
+P a6dc29e4d5e13949e0fcd9d5dde575c2670eb10a230ab9df3806fc8c3016c540
+R d65ba1fc2a2f76e7b171a7dc72bb1070
 U drh
-Z 9e063f5d4d8d31b6e06beb4f188d0a08
+Z b0de3fe3c23565cae5077bfe62fcd8b8
 # Remove this line to create a well-formed Fossil manifest.

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

diff --git a/src/json.c b/src/json.c
index 62e3d652fd3528f91f98bf0fbf593987ac181afb..af8f461d46f67414b1c7712487cbbd40087efb5f 100644 (file)
--- a/src/json.c
+++ b/src/json.c
@@ -1064,38 +1064,39 @@ static int jsonBlobAppendOneByte(JsonParse *pParse, u8 c){
   return 0;
 }
 
-/* Append bytes.  Return 1 if an error occurs.
+/* Slow version of jsonBlobAppendNode() that first resizes the
+** pParse->aBlob structure.
 */
-static int jsonBlobAppendNBytes(JsonParse *pParse, const u8 *aData, u32 N){
-  if( pParse->nBlob+N > pParse->nBlobAlloc ){
-    return jsonBlobExpandAndAppend(pParse, aData, N);
-  }
-  memcpy(&pParse->aBlob[pParse->nBlob], aData, N);
-  pParse->nBlob += N;
-  return 0;
-}
-
-static void jsonBlobAppendNodeType(JsonParse*,u8,u32);
-static SQLITE_NOINLINE void jsonBlobExpandAndAppendNodeType(
+static void jsonBlobAppendNode(JsonParse*,u8,u32,const void*);
+static SQLITE_NOINLINE void jsonBlobExpandAndAppendNode(
   JsonParse *pParse,
   u8 eType,
-  u32 szPayload
+  u32 szPayload,
+  const void *aPayload
 ){
   if( jsonBlobExpand(pParse, pParse->nBlob+szPayload+9) ) return;
-  jsonBlobAppendNodeType(pParse, eType, szPayload);
+  jsonBlobAppendNode(pParse, eType, szPayload, aPayload);
 }
 
 
-/* Append an node type byte together with the payload size.
+/* Append an node type byte together with the payload size and
+** possibly also the payload.
+**
+** If aPayload is not NULL, then it is a pointer to the payload which
+** is also appended.  If aPayload is NULL, the pParse->aBlob[] array
+** is resized (if necessary) so that it is big enough to hold the
+** payload, but the payload is not appended and pParse->nBlob is left
+** pointing to where the first byte of payload will eventually be.
 */
-static void jsonBlobAppendNodeType(
-  JsonParse *pParse,
-  u8 eType,
-  u32 szPayload
+static void jsonBlobAppendNode(
+  JsonParse *pParse,          /* The JsonParse object under construction */
+  u8 eType,                   /* Node type.  One of JSONB_* */
+  u32 szPayload,              /* Number of bytes of payload */
+  const void *aPayload        /* The payload.  Might be NULL */
 ){
   u8 *a;
   if( pParse->nBlob+szPayload+9 > pParse->nBlobAlloc ){
-    jsonBlobExpandAndAppendNodeType(pParse,eType,szPayload);
+    jsonBlobExpandAndAppendNode(pParse,eType,szPayload,aPayload);
     return;
   }
   a = &pParse->aBlob[pParse->nBlob];
@@ -1119,6 +1120,10 @@ static void jsonBlobAppendNodeType(
     a[4] = szPayload & 0xff;
     pParse->nBlob += 5;
   }
+  if( aPayload ){
+    pParse->nBlob += szPayload;
+    memcpy(&pParse->aBlob[pParse->nBlob-szPayload], aPayload, szPayload);
+  }
 }
 
 /* Change the payload size for the node at index i to be szPayload.
@@ -1230,7 +1235,7 @@ json_parse_restart:
   case '{': {
     /* Parse object */
     iThis = pParse->nBlob;
-    jsonBlobAppendNodeType(pParse, JSONB_OBJECT, (pParse->nJson-i)*2);
+    jsonBlobAppendNode(pParse, JSONB_OBJECT, (pParse->nJson-i)*2, 0);
     if( ++pParse->iDepth > JSON_MAX_DEPTH ){
       pParse->iErr = i;
       return -1;
@@ -1258,8 +1263,7 @@ json_parse_restart:
             k++;
           }
           assert( iBlob==pParse->nBlob );
-          jsonBlobAppendNodeType(pParse, op, k-j);
-          jsonBlobAppendNBytes(pParse, (const u8*)&z[j], k-j);
+          jsonBlobAppendNode(pParse, op, k-j, &z[j]);
           pParse->hasNonstd = 1;
           x = k;
         }else{
@@ -1331,7 +1335,7 @@ json_parse_restart:
   case '[': {
     /* Parse array */
     iThis = pParse->nBlob;
-    jsonBlobAppendNodeType(pParse, JSONB_ARRAY, pParse->nJson - i);
+    jsonBlobAppendNode(pParse, JSONB_ARRAY, pParse->nJson - i, 0);
     iStart = pParse->nBlob;
     if( pParse->oom ) return -1;
     if( ++pParse->iDepth > JSON_MAX_DEPTH ){
@@ -1431,8 +1435,7 @@ json_parse_restart:
       }
       j++;
     }
-    jsonBlobAppendNodeType(pParse, opcode, j-1-i);
-    jsonBlobAppendNBytes(pParse, (const u8*)&z[i+1], j-1-i);
+    jsonBlobAppendNode(pParse, opcode, j-1-i, &z[i+1]);
     return j+1;
   }
   case 't': {
@@ -1507,11 +1510,9 @@ json_parse_restart:
           ){
             pParse->hasNonstd = 1;
             if( z[i]=='-' ){
-              jsonBlobAppendNodeType(pParse, JSONB_FLOAT, 6);
-              jsonBlobAppendNBytes(pParse, (const u8*)"-9e999", 6);
+              jsonBlobAppendNode(pParse, JSONB_FLOAT, 6, "-9e999");
             }else{
-              jsonBlobAppendNodeType(pParse, JSONB_FLOAT, 5);
-              jsonBlobAppendNBytes(pParse, (const u8*)"9e999", 5);
+              jsonBlobAppendNode(pParse, JSONB_FLOAT, 5, "9e999");
             }
             return i + (sqlite3StrNICmp(&z[i+4],"inity",5)==0 ? 9 : 4);
           }
@@ -1592,8 +1593,7 @@ json_parse_restart:
     assert( JSONB_FLOAT+0x01==JSONB_FLOAT5 );
     assert( JSONB_INT+0x02==JSONB_FLOAT );
     if( z[i]=='+' ) i++;
-    jsonBlobAppendNodeType(pParse, JSONB_INT+t, j-i);
-    jsonBlobAppendNBytes(pParse, (const u8*)&z[i], j-i);
+    jsonBlobAppendNode(pParse, JSONB_INT+t, j-i, &z[i]);
     return j;
   }
   case '}': {
@@ -1660,8 +1660,7 @@ json_parse_restart:
       }
       if( sqlite3Isalnum(z[i+nn]) ) continue;
       if( aNanInfName[k].eType==JSONB_FLOAT ){
-        jsonBlobAppendOneByte(pParse, JSONB_FLOAT | 0x50);
-        jsonBlobAppendNBytes(pParse, (const u8*)"9e999", 5);
+        jsonBlobAppendNode(pParse, JSONB_FLOAT, 5, "9e999");
       }else{
         jsonBlobAppendOneByte(pParse, JSONB_NULL);
       }
@@ -2198,7 +2197,7 @@ static u32 jsonLookupBlobStep(
       testcase( pParse->eEdit==JEDIT_INS );
       testcase( pParse->eEdit==JEDIT_SET );
       memset(&ix, 0, sizeof(ix));
-      jsonBlobAppendNodeType(&ix,JSONB_TEXTRAW, nKey);
+      jsonBlobAppendNode(&ix,JSONB_TEXTRAW, nKey, 0);
       memset(&v, 0, sizeof(v));
       if( zPath[i]==0 ){
         v.nBlob = pParse->nIns;
@@ -2563,8 +2562,7 @@ static int jsonFunctionArgToBlob(
           return 1;
         }
       }else{
-        jsonBlobAppendNodeType(pParse, JSONB_TEXTRAW, nJson);
-        jsonBlobAppendNBytes(pParse, (const u8*)zJson, nJson);
+        jsonBlobAppendNode(pParse, JSONB_TEXTRAW, nJson, zJson);
       }
       break;
     }
@@ -2574,8 +2572,7 @@ static int jsonFunctionArgToBlob(
       const char *z = (const char*)sqlite3_value_text(pArg);
       int e = eType==SQLITE_INTEGER ? JSONB_INT : JSONB_FLOAT;
       if( z==0 ) return 1;
-      jsonBlobAppendNodeType(pParse, e, n);
-      jsonBlobAppendNBytes(pParse, (const u8*)z, n);
+      jsonBlobAppendNode(pParse, e, n, z);
       break;
     }
   }