From 7286c598963bcec929f44c3a75ff0b257acaf1cd Mon Sep 17 00:00:00 2001
From: drh <>
Date: Wed, 26 Jul 2023 13:17:43 +0000
Subject: [PATCH] Change the debugging "json_parse(X)" function so that it
 shows a more complete description of the JsonParse object on standard output
 and returns the mimified JSON.  Former behavior was to return the text of a
 decode of the aNode array.

FossilOrigin-Name: 1bf85d4e388714a88f8940dcdec353c3e0267456697eff6963d34637912aecc9
---
 manifest          |  14 ++++----
 manifest.uuid     |   2 +-
 src/json.c        |  80 ++++++++++++++++++++++++----------------------
 test/fuzzdata6.db | Bin 1785856 -> 1785856 bytes
 4 files changed, 50 insertions(+), 46 deletions(-)

diff --git a/manifest b/manifest
index 490099b0ad..f0b7ab99fd 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C More\scomment\simprovements\sin\sjson.c.\s\sDo\snot\srun\sjsonLookup()\sfollowing\nan\sOOM\serror.
-D 2023-07-26T11:53:14.698
+C Change\sthe\sdebugging\s"json_parse(X)"\sfunction\sso\sthat\sit\sshows\sa\smore\ncomplete\sdescription\sof\sthe\sJsonParse\sobject\son\sstandard\soutput\sand\sreturns\nthe\smimified\sJSON.\s\sFormer\sbehavior\swas\sto\sreturn\sthe\stext\sof\sa\sdecode\nof\sthe\saNode\sarray.
+D 2023-07-26T13:17:43.116
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -598,7 +598,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 c784b923a8aaa5cb514c135a74d77aec1b5c9e1cbd63764adb10d44cc678bb6e
+F src/json.c 512bc389b42c68b34571ca532afb0f4bb235b1fc11ea5c9a4f6850c64fa12ab4
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 176d6b2cb18a6ad73b133db17f6fc351c4d9a2d510deebdb76c22bde9cfd1465
 F src/main.c 512b1d45bc556edf4471a845afb7ba79e64bd5b832ab222dc195c469534cd002
@@ -1131,7 +1131,7 @@ F test/fuzzdata2.db 128b3feeb78918d075c9b14b48610145a0dd4c8d6f1ca7c2870c7e425f5b
 F test/fuzzdata3.db c6586d3e3cef0fbc18108f9bb649aa77bfc38aba
 F test/fuzzdata4.db b502c7d5498261715812dd8b3c2005bad08b3a26e6489414bd13926cd3e42ed2
 F test/fuzzdata5.db e35f64af17ec48926481cfaf3b3855e436bd40d1cfe2d59a9474cb4b748a52a5
-F test/fuzzdata6.db 92a80e4afc172c24f662a10a612d188fb272de4a9bd19e017927c95f737de6d7
+F test/fuzzdata6.db b8725a5f5cf7a3b7241a9038e57ca7e7cc8c3f4d86b44bd770617bda245ab2b0
 F test/fuzzdata7.db 0166b56fd7a6b9636a1d60ef0a060f86ddaecf99400a666bb6e5bbd7199ad1f2
 F test/fuzzdata8.db f6c2f2af4deaaae0ddb3310d509c2659990794aa653dc501b80a0534c3493f80
 F test/fuzzer1.test 3d4c4b7e547aba5e5511a2991e3e3d07166cfbb8
@@ -2044,8 +2044,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 bac953a80d1a541e7a12aef00c86c002133859237143ad670b39ea19799a8900
-R 968cb2bde9a2ab88d10bb801ca2ea188
+P cd5fda8c2e354da7458b7c1a82ff18c5946f8dab16095bb0293bec57f6804f17
+R ecfa3d900e8af899b83f6d4944c0b5ca
 U drh
-Z 8edd1e3712b3e1a50841b71b7e4dc709
+Z 621bef24d346a4651dc554beab6ec135
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 979f3c9801..fa90aa429f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cd5fda8c2e354da7458b7c1a82ff18c5946f8dab16095bb0293bec57f6804f17
\ No newline at end of file
+1bf85d4e388714a88f8940dcdec353c3e0267456697eff6963d34637912aecc9
\ No newline at end of file
diff --git a/src/json.c b/src/json.c
index 5deeb6acba..9eb2302684 100644
--- a/src/json.c
+++ b/src/json.c
@@ -118,7 +118,12 @@ static const char * const jsonType[] = {
 #define JNODE_JSON5   0x40  /* Node contains JSON5 enhancements */
 
 
-/* A single node of parsed JSON
+/* A single node of parsed JSON.  An array of these nodes describes
+** a parse of JSON + edits.
+**
+** Use the json_parse() SQL function (available when compiled with
+** -DSQLITE_DEBUG) to see a dump of complete JsonParse objects, including
+** a complete listing and decoding of the array of JsonNodes.
 */
 struct JsonNode {
   u8 eType;              /* One of the JSON_ type values */
@@ -2283,7 +2288,7 @@ static void jsonRemoveAllNulls(JsonNode *pNode){
 ** SQL functions used for testing and debugging
 ****************************************************************************/
 
-#if 0  /* One for debugging.  zero normally */
+#if SQLITE_DEBUG
 /*
 ** Print N node entries.
 */
@@ -2299,12 +2304,15 @@ static void jsonDebugPrintNodeEntries(
     }else{
       zType = jsonType[aNode[i].eType];
     }
+    printf("node %4u: %-7s n=%-5d", i, zType, aNode[i].n);
     if( (aNode[i].jnFlags & ~JNODE_LABEL)!=0 ){
-      printf("node %4u: %-7s %02x n=%-5d",
-             i, zType, aNode[i].jnFlags, aNode[i].n);
-    }else{
-      printf("node %4u: %-7s    n=%-5d",
-             i, zType, aNode[i].n);
+      u8 f = aNode[i].jnFlags;
+      if( f & JNODE_RAW )     printf(" RAW");
+      if( f & JNODE_ESCAPE )  printf(" ESCAPE");
+      if( f & JNODE_REMOVE )  printf(" REMOVE");
+      if( f & JNODE_REPLACE ) printf(" REPLACE");
+      if( f & JNODE_APPEND )  printf(" APPEND");
+      if( f & JNODE_JSON5 )   printf(" JSON5");
     }
     switch( aNode[i].eU ){
       case 1:  printf(" zJContent=[%.*s]\n",
@@ -2316,6 +2324,10 @@ static void jsonDebugPrintNodeEntries(
     }
   }
 }
+#endif /* SQLITE_DEBUG */
+
+
+#if 0  /* 1 for debugging.  0 normally.  Requires -DSQLITE_DEBUG too */
 static void jsonDebugPrintParse(JsonParse *p){
   jsonDebugPrintNodeEntries(p->aNode, p->nNode);
 }
@@ -2330,45 +2342,37 @@ static void jsonDebugPrintNode(JsonNode *pNode){
 
 #ifdef SQLITE_DEBUG
 /*
-** The json_parse(JSON) function returns a string which describes
-** a parse of the JSON provided.  Or it returns NULL if JSON is not
-** well-formed.
+** SQL function:   json_parse(JSON)
+**
+** Parse JSON using jsonParseCached().  Then print a dump of that
+** parse on standard output.  Return the mimified JSON result, just
+** like the json() function.
 */
 static void jsonParseFunc(
   sqlite3_context *ctx,
   int argc,
   sqlite3_value **argv
 ){
-  JsonString s;       /* Output string - not real JSON */
-  JsonParse x;        /* The parse */
-  u32 i;
+  JsonParse *p;        /* The parse */
 
   assert( argc==1 );
-  if( jsonParse(&x, ctx, (char*)sqlite3_value_text(argv[0]), 0) ) return;
-  jsonParseFindParents(&x);
-  jsonInit(&s, ctx);
-  for(i=0; i<x.nNode; i++){
-    const char *zType;
-    if( x.aNode[i].jnFlags & JNODE_LABEL ){
-      assert( x.aNode[i].eType==JSON_STRING );
-      zType = "label";
-    }else{
-      zType = jsonType[x.aNode[i].eType];
-    }
-    jsonPrintf(100, &s,"node %3u: %7s n=%-4d up=%-4d",
-               i, zType, x.aNode[i].n, x.aUp[i]);
-    assert( x.aNode[i].eU==0 || x.aNode[i].eU==1 );
-    if( x.aNode[i].u.zJContent!=0 ){
-      assert( x.aNode[i].eU==1 );
-      jsonAppendChar(&s, ' ');
-      jsonAppendRaw(&s, x.aNode[i].u.zJContent, x.aNode[i].n);
-    }else{
-      assert( x.aNode[i].eU==0 );
-    }
-    jsonAppendChar(&s, '\n');
-  }
-  jsonParseReset(&x);
-  jsonResult(&s);
+  p = jsonParseCached(ctx, argv[0], ctx, 0);
+  if( p==0 ) return;
+  printf("nNode     = %u\n", p->nNode);
+  printf("nAlloc    = %u\n", p->nAlloc);
+  printf("nJson     = %d\n", p->nJson);
+  printf("nAlt      = %d\n", p->nAlt);
+  printf("nErr      = %u\n", p->nErr);
+  printf("oom       = %u\n", p->oom);
+  printf("hasNonstd = %u\n", p->hasNonstd);
+  printf("bOwnsJson = %u\n", p->bOwnsJson);
+  printf("useMod    = %u\n", p->useMod);
+  printf("hasMod    = %u\n", p->hasMod);
+  printf("nJPRef    = %u\n", p->nJPRef);
+  printf("iSubst    = %u\n", p->iSubst);
+  printf("iHold     = %u\n", p->iHold);
+  jsonDebugPrintNodeEntries(p->aNode, p->nNode);
+  jsonReturnJson(p, p->aNode, ctx, 1);
 }
 
 /*
diff --git a/test/fuzzdata6.db b/test/fuzzdata6.db
index b1424c21e4194f352629d4d08b7b88d16ea0d1ee..67076d0026aca74aa3984260ecd3371006966501 100644
GIT binary patch
delta 2927
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

delta 3034
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