From abbdbdfc1f1ea527233c4fdf711c97dc51d9a4ff Mon Sep 17 00:00:00 2001
From: drh <>
Date: Fri, 24 Nov 2023 18:44:00 +0000
Subject: [PATCH 01/10] Incremental progress toward getting json_each() and
 json_tree() to work directly off of a JSONB blob.

FossilOrigin-Name: f8cab41b3bc65af6ff34b481db693d640ea025d09463d50b8e56d855e2abc913
---
 manifest      |  15 +-
 manifest.uuid |   2 +-
 src/json.c    | 483 ++++++++++++++++++++++++++++++++++++--------------
 3 files changed, 356 insertions(+), 144 deletions(-)

diff --git a/manifest b/manifest
index 90ba0620cd..49e3c13317 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sjsonParseReset()\sto\sproperly\sclear\sthe\sJsonParse.aBlob\selement.
-D 2023-11-24T14:25:56.679
+C Incremental\sprogress\stoward\sgetting\sjson_each()\sand\sjson_tree()\sto\swork\ndirectly\soff\sof\sa\sJSONB\sblob.
+D 2023-11-24T18:44:00.124
 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 c6b23115b4561008363346a209b5c8a3538d967b35c63685b2e07dc7de1f1e31
+F src/json.c 1b9cc57728bc3a420bae5f4ae8233dcd2c3a337f00a2467346f7b788aedf1ba0
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
 F src/main.c 1b89f3de98d1b59fec5bac1d66d6ece21f703821b8eaa0d53d9604c35309f6f9
@@ -2145,8 +2145,11 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 7dbc2f496d7a362460bb4c262ecafe5f30e35a8744861163d12c996365c2142f
-R 1676f3ca8710b44ac390888e709fad02
+P ab2644aacf4757a51cf62e05cff6711a0a3605d60502a3dd310887df1b993545
+R b8a3524be145a961ee4bfad02645fa25
+T *branch * jsonb-tree
+T *sym-jsonb-tree *
+T -sym-jsonb *
 U drh
-Z 41b7b01f3bc28811bfbbf765da2aea03
+Z b88ae8be743d3b0432d41e7f9773a471
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 8430a0984f..3afbf02fc8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ab2644aacf4757a51cf62e05cff6711a0a3605d60502a3dd310887df1b993545
\ No newline at end of file
+f8cab41b3bc65af6ff34b481db693d640ea025d09463d50b8e56d855e2abc913
\ No newline at end of file
diff --git a/src/json.c b/src/json.c
index 0eacca3089..fdd2a21d59 100644
--- a/src/json.c
+++ b/src/json.c
@@ -133,6 +133,14 @@
 #define JSONB_ARRAY   11   /* An array */
 #define JSONB_OBJECT  12   /* An object */
 
+/* Human-readalbe names for the JSONB values:
+*/
+static const char * const jsonbType[] = {
+  "null", "true", "false", "integer", "integer", 
+  "real", "real", "text",  "text",    "text",
+  "text", "array", "object"
+};
+
 /*
 ** Growing our own isspace() routine this way is twice as fast as
 ** the library isspace() function, resulting in a 7% overall performance
@@ -4070,7 +4078,8 @@ static void jsonReturnTextJsonFromBlob(
 static void jsonReturnFromBlob(
   JsonParse *pParse,          /* Complete JSON parse tree */
   u32 i,                      /* Index of the node */
-  sqlite3_context *pCtx       /* Return value for this function */
+  sqlite3_context *pCtx,      /* Return value for this function */
+  int textOnly                /* return text JSON.  Disregard user-data */
 ){
   u32 n, sz;
   int rc;
@@ -4217,7 +4226,7 @@ static void jsonReturnFromBlob(
     }
     case JSONB_ARRAY:
     case JSONB_OBJECT: {
-      int flags = SQLITE_PTR_TO_INT(sqlite3_user_data(pCtx));
+      int flags = textOnly ? 0 : SQLITE_PTR_TO_INT(sqlite3_user_data(pCtx));
       if( flags & JSON_BLOB ){
         sqlite3_result_blob(pCtx, &pParse->aBlob[i], sz+n, SQLITE_TRANSIENT);
       }else{
@@ -4280,7 +4289,7 @@ static void jsonExtractFromBlob(
     return;
   }
   if( i<px.nBlob ){
-    jsonReturnFromBlob(&px, i, ctx);
+    jsonReturnFromBlob(&px, i, ctx, 0);
   }else if( i==JSON_BLOB_NOTFOUND ){
     return;  /* Return NULL if not found */
   }else if( i==JSON_BLOB_ERROR ){
@@ -5564,19 +5573,36 @@ static void jsonObjectFinal(sqlite3_context *ctx){
 /****************************************************************************
 ** The json_each virtual table
 ****************************************************************************/
+typedef struct JsonParent JsonParent;
+struct JsonParent {
+  u32 iHead;                 /* Start of object or array */
+  u32 iEnd;                  /* First byte past the end */
+  i64 iKey;                  /* Key for JSONB_ARRAY */
+};
+
 typedef struct JsonEachCursor JsonEachCursor;
 struct JsonEachCursor {
   sqlite3_vtab_cursor base;  /* Base class - must be first */
   u32 iRowid;                /* The rowid */
   u32 iBegin;                /* The first node of the scan */
-  u32 i;                     /* Index in sParse.aNode[] of current row */
+  u32 i;                     /* Index in sParse.aBlob[] of current row */
   u32 iEnd;                  /* EOF when i equals or exceeds this value */
-  u8 eType;                  /* Type of top-level element */
+  u8 eType;                  /* Type of the container for element i */
   u8 bRecursive;             /* True for json_tree().  False for json_each() */
+  u32 nParent;               /* Current nesting depth */
+  u32 nParentAlloc;          /* Space allocated for aParent[] */
+  JsonParent *aParent;       /* Parent elements of i */
   char *zJson;               /* Input JSON */
   char *zRoot;               /* Path by which to filter zJson */
+  sqlite3 *db;               /* Database connection */
   JsonParse sParse;          /* Parse of the input JSON */
 };
+typedef struct JsonEachConnection JsonEachConnection;
+struct JsonEachConnection {
+  sqlite3_vtab base;         /* Base class - must be first */
+  sqlite3 *db;               /* Database connection */
+};
+
 
 /* Constructor for the json_each virtual table */
 static int jsonEachConnect(
@@ -5586,7 +5612,7 @@ static int jsonEachConnect(
   sqlite3_vtab **ppVtab,
   char **pzErr
 ){
-  sqlite3_vtab *pNew;
+  JsonEachConnection *pNew;
   int rc;
 
 /* Column numbers */
@@ -5612,10 +5638,11 @@ static int jsonEachConnect(
      "CREATE TABLE x(key,value,type,atom,id,parent,fullkey,path,"
                     "json HIDDEN,root HIDDEN)");
   if( rc==SQLITE_OK ){
-    pNew = *ppVtab = sqlite3_malloc( sizeof(*pNew) );
+    pNew = (JsonEachConnection*)(*ppVtab = sqlite3_malloc( sizeof(*pNew) ));
     if( pNew==0 ) return SQLITE_NOMEM;
     memset(pNew, 0, sizeof(*pNew));
     sqlite3_vtab_config(db, SQLITE_VTAB_INNOCUOUS);
+    pNew->db = db;
   }
   return rc;
 }
@@ -5628,12 +5655,14 @@ static int jsonEachDisconnect(sqlite3_vtab *pVtab){
 
 /* constructor for a JsonEachCursor object for json_each(). */
 static int jsonEachOpenEach(sqlite3_vtab *p, sqlite3_vtab_cursor **ppCursor){
+  JsonEachConnection *pVtab = (JsonEachConnection*)p;
   JsonEachCursor *pCur;
 
   UNUSED_PARAMETER(p);
   pCur = sqlite3_malloc( sizeof(*pCur) );
   if( pCur==0 ) return SQLITE_NOMEM;
   memset(pCur, 0, sizeof(*pCur));
+  pCur->db = pVtab->db;
   *ppCursor = &pCur->base;
   return SQLITE_OK;
 }
@@ -5653,8 +5682,12 @@ static int jsonEachOpenTree(sqlite3_vtab *p, sqlite3_vtab_cursor **ppCursor){
 static void jsonEachCursorReset(JsonEachCursor *p){
   sqlite3_free(p->zRoot);
   jsonParseReset(&p->sParse);
+  sqlite3DbFree(p->db, p->aParent);
   p->iRowid = 0;
   p->i = 0;
+  p->aParent = 0;
+  p->nParent = 0;
+  p->nParentAlloc = 0;
   p->iEnd = 0;
   p->eType = 0;
   p->zJson = 0;
@@ -5676,45 +5709,106 @@ static int jsonEachEof(sqlite3_vtab_cursor *cur){
   return p->i >= p->iEnd;
 }
 
+/*
+** If the cursor is currently pointing at the label of a object entry,
+** then return the index of the value.  For all other cases, return the
+** current pointer position, which is the value.
+*/
+static int jsonSkipLabel(JsonEachCursor *p){
+  if( p->eType==JSONB_OBJECT ){
+    u32 sz = 0;
+    u32 n = jsonbPayloadSize(&p->sParse, p->i, &sz);
+    return p->i + n + sz;
+  }else{
+    return p->i;
+  }
+}
+
 /* Advance the cursor to the next element for json_tree() */
 static int jsonEachNext(sqlite3_vtab_cursor *cur){
   JsonEachCursor *p = (JsonEachCursor*)cur;
-  if( p->bRecursive ){
-    if( p->sParse.aNode[p->i].jnFlags & JNODE_LABEL ) p->i++;
-    p->i++;
-    p->iRowid++;
-    if( p->i<p->iEnd ){
-      u32 iUp = p->sParse.aUp[p->i];
-      JsonNode *pUp = &p->sParse.aNode[iUp];
-      p->eType = pUp->eType;
-      if( pUp->eType==JSON_ARRAY ){
-        assert( pUp->eU==0 || pUp->eU==3 );
-        testcase( pUp->eU==3 );
-        JSON_VVA( pUp->eU = 3 );
-        if( iUp==p->i-1 ){
-          pUp->u.iKey = 0;
-        }else{
-          pUp->u.iKey++;
+  if( p->sParse.aNode ){
+    /* LEGACY */
+    if( p->bRecursive ){
+      if( p->sParse.aNode[p->i].jnFlags & JNODE_LABEL ) p->i++;
+      p->i++;
+      p->iRowid++;
+      if( p->i<p->iEnd ){
+        u32 iUp = p->sParse.aUp[p->i];
+        JsonNode *pUp = &p->sParse.aNode[iUp];
+        p->eType = pUp->eType;
+        if( pUp->eType==JSON_ARRAY ){
+          assert( pUp->eU==0 || pUp->eU==3 );
+          testcase( pUp->eU==3 );
+          JSON_VVA( pUp->eU = 3 );
+          if( iUp==p->i-1 ){
+            pUp->u.iKey = 0;
+          }else{
+            pUp->u.iKey++;
+          }
+        }
+      }
+    }else{
+      switch( p->eType ){
+        case JSON_ARRAY: {
+          p->i += jsonNodeSize(&p->sParse.aNode[p->i]);
+          p->iRowid++;
+          break;
+        }
+        case JSON_OBJECT: {
+          p->i += 1 + jsonNodeSize(&p->sParse.aNode[p->i+1]);
+          p->iRowid++;
+          break;
+        }
+        default: {
+          p->i = p->iEnd;
+          break;
         }
       }
     }
-  }else{
-    switch( p->eType ){
-      case JSON_ARRAY: {
-        p->i += jsonNodeSize(&p->sParse.aNode[p->i]);
-        p->iRowid++;
-        break;
+    return SQLITE_OK;
+  }else if( p->bRecursive ){
+    u8 x;
+    u8 levelChange = 0;
+    u32 n, sz = 0;
+    u32 i = jsonSkipLabel(p);
+    x = p->sParse.aBlob[i] & 0x0f;
+    n = jsonbPayloadSize(&p->sParse, p->i, &sz);
+    if( x==JSONB_OBJECT || x==JSONB_ARRAY ){
+      JsonParent *pParent;
+      if( p->nParent>=p->nParentAlloc ){
+        JsonParent *pNew;
+        u64 nNew;
+        nNew = p->nParentAlloc*2 + 3;
+        pNew = sqlite3DbRealloc(p->db, p->aParent, sizeof(JsonParent)*nNew);
+        if( pNew==0 ) return SQLITE_NOMEM;
+        p->nParentAlloc = (u32)nNew;
+        p->aParent = pNew;
+        levelChange = 1;
       }
-      case JSON_OBJECT: {
-        p->i += 1 + jsonNodeSize(&p->sParse.aNode[p->i+1]);
-        p->iRowid++;
-        break;
-      }
-      default: {
-        p->i = p->iEnd;
-        break;
+      pParent = &p->aParent[p->nParent++];
+      pParent->iHead = p->i;
+      pParent->iEnd = p->i + n + sz;
+      pParent->iKey = 0;
+    }else{
+      p->i = i + n + sz;
+    }
+    if( p->nParent>0 && p->i >= p->aParent[p->nParent-1].iEnd ){
+      p->nParent--;
+      levelChange = 1;
+    }
+    if( levelChange ){
+      if( p->nParent>0 ){
+        p->eType = p->sParse.aBlob[p->aParent[p->nParent-1].iHead] & 0x0f;
+      }else{
+        p->eType = 0;
       }
     }
+  }else{
+    u32 n, sz = 0;
+    u32 i = jsonSkipLabel(p);
+    n = jsonbPayloadSize(&p->sParse, i, &sz);
+    p->i = i + n + sz;
   }
   return SQLITE_OK;
 }
@@ -5722,7 +5816,7 @@ static int jsonEachNext(sqlite3_vtab_cursor *cur){
 /* Append an object label to the JSON Path being constructed
 ** in pStr.
 */
-static void jsonAppendObjectPathElement(
+static void jsonAppendObjectPathElementOfNode(
   JsonString *pStr,
   JsonNode *pNode
 ){
@@ -5763,18 +5857,23 @@ static void jsonEachComputePath(
     jsonAppendChar(pStr, '$');
     return;
   }
-  iUp = p->sParse.aUp[i];
-  jsonEachComputePath(p, pStr, iUp);
-  pNode = &p->sParse.aNode[i];
-  pUp = &p->sParse.aNode[iUp];
-  if( pUp->eType==JSON_ARRAY ){
-    assert( pUp->eU==3 || (pUp->eU==0 && pUp->u.iKey==0) );
-    testcase( pUp->eU==0 );
-    jsonPrintf(30, pStr, "[%d]", pUp->u.iKey);
-  }else{
-    assert( pUp->eType==JSON_OBJECT );
-    if( (pNode->jnFlags & JNODE_LABEL)==0 ) pNode--;
-    jsonAppendObjectPathElement(pStr, pNode);
+  if( p->sParse.aNode ){
+    /* LEGACY */
+    assert( p->sParse.aUp );
+    iUp = p->sParse.aUp[i];
+    jsonEachComputePath(p, pStr, iUp);
+    pNode = &p->sParse.aNode[i];
+    pUp = &p->sParse.aNode[iUp];
+    if( pUp->eType==JSON_ARRAY ){
+      assert( pUp->eU==3 || (pUp->eU==0 && pUp->u.iKey==0) );
+      testcase( pUp->eU==0 );
+      jsonPrintf(30, pStr, "[%d]", pUp->u.iKey);
+    }else{
+      assert( pUp->eType==JSON_OBJECT );
+      if( (pNode->jnFlags & JNODE_LABEL)==0 ) pNode--;
+      jsonAppendObjectPathElementOfNode(pStr, pNode);
+    }
+    return;
   }
 }
 
@@ -5782,102 +5881,200 @@ static void jsonEachComputePath(
 static int jsonEachColumn(
   sqlite3_vtab_cursor *cur,   /* The cursor */
   sqlite3_context *ctx,       /* First argument to sqlite3_result_...() */
-  int i                       /* Which column to return */
+  int iColumn                 /* Which column to return */
 ){
   JsonEachCursor *p = (JsonEachCursor*)cur;
-  JsonNode *pThis = &p->sParse.aNode[p->i];
-  switch( i ){
-    case JEACH_KEY: {
-      if( p->i==0 ) break;
-      if( p->eType==JSON_OBJECT ){
+  if( p->sParse.aNode!=0 ){
+    /* LEGACY */
+    JsonNode *pThis = &p->sParse.aNode[p->i];
+    switch( iColumn ){
+      case JEACH_KEY: {
+        if( p->i==0 ) break;
+        if( p->eType==JSON_OBJECT ){
+          jsonReturnFromNode(&p->sParse, pThis, ctx, 0);
+        }else if( p->eType==JSON_ARRAY ){
+          u32 iKey;
+          if( p->bRecursive ){
+            if( p->iRowid==0 ) break;
+            assert( p->sParse.aNode[p->sParse.aUp[p->i]].eU==3 );
+            iKey = p->sParse.aNode[p->sParse.aUp[p->i]].u.iKey;
+          }else{
+            iKey = p->iRowid;
+          }
+          sqlite3_result_int64(ctx, (sqlite3_int64)iKey);
+        }
+        break;
+      }
+      case JEACH_VALUE: {
+        if( pThis->jnFlags & JNODE_LABEL ) pThis++;
         jsonReturnFromNode(&p->sParse, pThis, ctx, 0);
-      }else if( p->eType==JSON_ARRAY ){
-        u32 iKey;
-        if( p->bRecursive ){
-          if( p->iRowid==0 ) break;
-          assert( p->sParse.aNode[p->sParse.aUp[p->i]].eU==3 );
-          iKey = p->sParse.aNode[p->sParse.aUp[p->i]].u.iKey;
-        }else{
-          iKey = p->iRowid;
-        }
-        sqlite3_result_int64(ctx, (sqlite3_int64)iKey);
+        break;
       }
-      break;
-    }
-    case JEACH_VALUE: {
-      if( pThis->jnFlags & JNODE_LABEL ) pThis++;
-      jsonReturnFromNode(&p->sParse, pThis, ctx, 0);
-      break;
-    }
-    case JEACH_TYPE: {
-      if( pThis->jnFlags & JNODE_LABEL ) pThis++;
-      sqlite3_result_text(ctx, jsonType[pThis->eType], -1, SQLITE_STATIC);
-      break;
-    }
-    case JEACH_ATOM: {
-      if( pThis->jnFlags & JNODE_LABEL ) pThis++;
-      if( pThis->eType>=JSON_ARRAY ) break;
-      jsonReturnFromNode(&p->sParse, pThis, ctx, 0);
-      break;
-    }
-    case JEACH_ID: {
-      sqlite3_result_int64(ctx,
-         (sqlite3_int64)p->i + ((pThis->jnFlags & JNODE_LABEL)!=0));
-      break;
-    }
-    case JEACH_PARENT: {
-      if( p->i>p->iBegin && p->bRecursive ){
-        sqlite3_result_int64(ctx, (sqlite3_int64)p->sParse.aUp[p->i]);
+      case JEACH_TYPE: {
+        if( pThis->jnFlags & JNODE_LABEL ) pThis++;
+        sqlite3_result_text(ctx, jsonType[pThis->eType], -1, SQLITE_STATIC);
+        break;
       }
-      break;
-    }
-    case JEACH_FULLKEY: {
-      JsonString x;
-      jsonStringInit(&x, ctx);
-      if( p->bRecursive ){
-        jsonEachComputePath(p, &x, p->i);
-      }else{
-        if( p->zRoot ){
-          jsonAppendRaw(&x, p->zRoot, (int)strlen(p->zRoot));
-        }else{
-          jsonAppendChar(&x, '$');
-        }
-        if( p->eType==JSON_ARRAY ){
-          jsonPrintf(30, &x, "[%d]", p->iRowid);
-        }else if( p->eType==JSON_OBJECT ){
-          jsonAppendObjectPathElement(&x, pThis);
-        }
+      case JEACH_ATOM: {
+        if( pThis->jnFlags & JNODE_LABEL ) pThis++;
+        if( pThis->eType>=JSON_ARRAY ) break;
+        jsonReturnFromNode(&p->sParse, pThis, ctx, 0);
+        break;
       }
-      jsonReturnString(&x);
-      break;
-    }
-    case JEACH_PATH: {
-      if( p->bRecursive ){
+      case JEACH_ID: {
+        sqlite3_result_int64(ctx,
+           (sqlite3_int64)p->i + ((pThis->jnFlags & JNODE_LABEL)!=0));
+        break;
+      }
+      case JEACH_PARENT: {
+        if( p->i>p->iBegin && p->bRecursive ){
+          sqlite3_result_int64(ctx, (sqlite3_int64)p->sParse.aUp[p->i]);
+        }
+        break;
+      }
+      case JEACH_FULLKEY: {
         JsonString x;
         jsonStringInit(&x, ctx);
-        jsonEachComputePath(p, &x, p->sParse.aUp[p->i]);
+        if( p->bRecursive ){
+          jsonEachComputePath(p, &x, p->i);
+        }else{
+          if( p->zRoot ){
+            jsonAppendRaw(&x, p->zRoot, (int)strlen(p->zRoot));
+          }else{
+            jsonAppendChar(&x, '$');
+          }
+          if( p->eType==JSON_ARRAY ){
+            jsonPrintf(30, &x, "[%d]", p->iRowid);
+          }else if( p->eType==JSON_OBJECT ){
+            jsonAppendObjectPathElementOfNode(&x, pThis);
+          }
+        }
         jsonReturnString(&x);
         break;
       }
-      /* For json_each() path and root are the same so fall through
-      ** into the root case */
-      /* no break */ deliberate_fall_through
-    }
-    default: {
-      const char *zRoot = p->zRoot;
-      if( zRoot==0 ) zRoot = "$";
-      sqlite3_result_text(ctx, zRoot, -1, SQLITE_STATIC);
-      break;
-    }
-    case JEACH_JSON: {
-      if( p->sParse.isBinary ){
-        sqlite3_result_blob(ctx, p->sParse.aBlob, p->sParse.nBlob,
-                            SQLITE_STATIC);
-      }else{
-        sqlite3_result_text(ctx, p->sParse.zJson, -1, SQLITE_STATIC);
+      case JEACH_PATH: {
+        if( p->bRecursive ){
+          JsonString x;
+          jsonStringInit(&x, ctx);
+          jsonEachComputePath(p, &x, p->sParse.aUp[p->i]);
+          jsonReturnString(&x);
+          break;
+        }
+        /* For json_each() path and root are the same so fall through
+        ** into the root case */
+        /* no break */ deliberate_fall_through
+      }
+      default: {
+        const char *zRoot = p->zRoot;
+        if( zRoot==0 ) zRoot = "$";
+        sqlite3_result_text(ctx, zRoot, -1, SQLITE_STATIC);
+        break;
+      }
+      case JEACH_JSON: {
+        if( p->sParse.isBinary ){
+          sqlite3_result_blob(ctx, p->sParse.aBlob, p->sParse.nBlob,
+                              SQLITE_STATIC);
+        }else{
+          sqlite3_result_text(ctx, p->sParse.zJson, -1, SQLITE_STATIC);
+        }
+        break;
       }
-      break;
     }
+  }else{
+    /* Blob scan */
+    switch( iColumn ){
+      case JEACH_KEY: {
+        if( p->nParent==0 ) break;
+        if( p->eType==JSONB_OBJECT ){
+          jsonReturnFromBlob(&p->sParse, p->i, ctx, 1);
+        }else{
+          assert( p->eType==JSONB_ARRAY );
+          sqlite3_result_int64(ctx, p->aParent[p->nParent-1].iKey);
+        }
+        break;
+      }
+      case JEACH_VALUE: {
+        u32 i = jsonSkipLabel(p);
+        jsonReturnFromBlob(&p->sParse, i, ctx, 1);
+        break;
+      }
+      case JEACH_TYPE: {
+        u32 i = jsonSkipLabel(p);
+        u8 eType = eType = p->sParse.aBlob[i] & 0x0f;
+        sqlite3_result_text(ctx, jsonbType[eType], -1, SQLITE_STATIC);
+        break;
+      }
+      case JEACH_ATOM: {
+        u32 i;
+        if( p->eType>=JSON_ARRAY ) break;
+        i = jsonSkipLabel(p);
+        jsonReturnFromBlob(&p->sParse, i, ctx, 1);
+        break;
+      }
+      case JEACH_ID: {
+        sqlite3_result_int64(ctx, (sqlite3_int64)p->i);
+        break;
+      }
+      case JEACH_PARENT: {
+        if( p->nParent>0 ){
+          sqlite3_result_int64(ctx, p->aParent[p->nParent-1].iHead);
+        }
+        break;
+      }
+      case JEACH_FULLKEY: {
+#if 0
+        JsonString x;
+        jsonStringInit(&x, ctx);
+        if( p->bRecursive ){
+          jsonEachComputePath(p, &x, p->i);
+        }else{
+          if( p->zRoot ){
+            jsonAppendRaw(&x, p->zRoot, (int)strlen(p->zRoot));
+          }else{
+            jsonAppendChar(&x, '$');
+          }
+          if( p->eType==JSON_ARRAY ){
+            jsonPrintf(30, &x, "[%d]", p->iRowid);
+          }else if( p->eType==JSON_OBJECT ){
+            jsonAppendObjectPathElementOfNode(&x, pThis);
+          }
+        }
+        jsonReturnString(&x);
+#endif
+        break;
+      }
+      case JEACH_PATH: {
+#if 0
+        if( p->bRecursive ){
+          JsonString x;
+          jsonStringInit(&x, ctx);
+          jsonEachComputePath(p, &x, p->sParse.aUp[p->i]);
+          jsonReturnString(&x);
+          break;
+        }
+        /* For json_each() path and root are the same so fall through
+        ** into the root case */
+        /* no break */ deliberate_fall_through
+#endif
+        break;
+      }
+      default: {
+        const char *zRoot = p->zRoot;
+        if( zRoot==0 ) zRoot = "$";
+        sqlite3_result_text(ctx, zRoot, -1, SQLITE_STATIC);
+        break;
+      }
+      case JEACH_JSON: {
+        if( p->sParse.isBinary ){
+          sqlite3_result_blob(ctx, p->sParse.aBlob, p->sParse.nBlob,
+                              SQLITE_STATIC);
+        }else{
+          sqlite3_result_text(ctx, p->sParse.zJson, -1, SQLITE_STATIC);
+        }
+        break;
+      }
+    }
+
   }
   return SQLITE_OK;
 }
@@ -5975,16 +6172,28 @@ static int jsonEachFilter(
   UNUSED_PARAMETER(argc);
   jsonEachCursorReset(p);
   if( idxNum==0 ) return SQLITE_OK;
+  memset(&p->sParse, 0, sizeof(p->sParse));
+  p->sParse.nJPRef = 1;
   if( jsonFuncArgMightBeBinary(argv[0]) ){
-    z = (const char*)sqlite3_value_blob(argv[0]);
-    isBinary = 1;
+    u32 i, n, sz;
+    p->sParse.nBlob = sqlite3_value_bytes(argv[0]);
+    p->sParse.aBlob = (u8*)sqlite3_value_blob(argv[0]);
+    if( p->sParse.aBlob==0 ){
+      return SQLITE_NOMEM;
+    }
+    i = p->i = 0;
+    p->iEnd = 0;
+    p->eType = 0;
+    p->nParent = 0;
+    p->sParse.isBinary = 1;
+    n = jsonbPayloadSize(&p->sParse, i, &sz);
+    p->iEnd = i+n+sz;
+    return SQLITE_OK;
   }else{
     z = (const char*)sqlite3_value_text(argv[0]);
     isBinary = 0;
   }
   if( z==0 ) return SQLITE_OK;
-  memset(&p->sParse, 0, sizeof(p->sParse));
-  p->sParse.nJPRef = 1;
   if( sqlite3ValueIsOfClass(argv[0], sqlite3RCStrUnref) ){
     p->sParse.zJson = sqlite3RCStrRef((char*)z);
   }else{

From 5e6500c81c717b74d3910909283fa23dec6139ee Mon Sep 17 00:00:00 2001
From: drh <>
Date: Fri, 24 Nov 2023 21:57:38 +0000
Subject: [PATCH 02/10] Continuing work on json_tree() against a JSONB.

FossilOrigin-Name: 3df891cb11feee65e239ee2506eda34a9688341f05210d7c2e25a05338cb71ad
---
 manifest      | 15 ++++++---------
 manifest.uuid |  2 +-
 src/json.c    | 35 +++++++++++++++++++++++++++++------
 3 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/manifest b/manifest
index 49e3c13317..55cf674438 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Incremental\sprogress\stoward\sgetting\sjson_each()\sand\sjson_tree()\sto\swork\ndirectly\soff\sof\sa\sJSONB\sblob.
-D 2023-11-24T18:44:00.124
+C Continuing\swork\son\sjson_tree()\sagainst\sa\sJSONB.
+D 2023-11-24T21:57:38.322
 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 1b9cc57728bc3a420bae5f4ae8233dcd2c3a337f00a2467346f7b788aedf1ba0
+F src/json.c 699b3fa340c24a10874988b9cbf4a1635b4231569dfaef9e4fd8fb96195406aa
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
 F src/main.c 1b89f3de98d1b59fec5bac1d66d6ece21f703821b8eaa0d53d9604c35309f6f9
@@ -2145,11 +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 ab2644aacf4757a51cf62e05cff6711a0a3605d60502a3dd310887df1b993545
-R b8a3524be145a961ee4bfad02645fa25
-T *branch * jsonb-tree
-T *sym-jsonb-tree *
-T -sym-jsonb *
+P f8cab41b3bc65af6ff34b481db693d640ea025d09463d50b8e56d855e2abc913
+R 12dbc87edffde88122e858181ec1f996
 U drh
-Z b88ae8be743d3b0432d41e7f9773a471
+Z f88095c49473dd89bb79ab974b58607c
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 3afbf02fc8..a401927f74 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f8cab41b3bc65af6ff34b481db693d640ea025d09463d50b8e56d855e2abc913
\ No newline at end of file
+3df891cb11feee65e239ee2506eda34a9688341f05210d7c2e25a05338cb71ad
\ No newline at end of file
diff --git a/src/json.c b/src/json.c
index fdd2a21d59..5823eadc88 100644
--- a/src/json.c
+++ b/src/json.c
@@ -5576,6 +5576,7 @@ static void jsonObjectFinal(sqlite3_context *ctx){
 typedef struct JsonParent JsonParent;
 struct JsonParent {
   u32 iHead;                 /* Start of object or array */
+  u32 iValue;                /* Start of the value */
   u32 iEnd;                  /* First byte past the end */
   i64 iKey;                  /* Key for JSONB_ARRAY */
 };
@@ -5773,7 +5774,7 @@ static int jsonEachNext(sqlite3_vtab_cursor *cur){
     u32 n, sz = 0;
     u32 i = jsonSkipLabel(p);
     x = p->sParse.aBlob[i] & 0x0f;
-    n = jsonbPayloadSize(&p->sParse, p->i, &sz);
+    n = jsonbPayloadSize(&p->sParse, i, &sz);
     if( x==JSONB_OBJECT || x==JSONB_ARRAY ){
       JsonParent *pParent;
       if( p->nParent>=p->nParentAlloc ){
@@ -5784,32 +5785,41 @@ static int jsonEachNext(sqlite3_vtab_cursor *cur){
         if( pNew==0 ) return SQLITE_NOMEM;
         p->nParentAlloc = (u32)nNew;
         p->aParent = pNew;
-        levelChange = 1;
       }
+      levelChange = 1;
       pParent = &p->aParent[p->nParent++];
       pParent->iHead = p->i;
-      pParent->iEnd = p->i + n + sz;
-      pParent->iKey = 0;
+      pParent->iValue = i;
+      pParent->iEnd = i + n + sz;
+      pParent->iKey = -1;
+      p->i = i + n;
     }else{
       p->i = i + n + sz;
     }
-    if( p->nParent>0 && p->i >= p->aParent[p->nParent-1].iEnd ){
+    while( p->nParent>0 && p->i >= p->aParent[p->nParent-1].iEnd ){
       p->nParent--;
       levelChange = 1;
     }
     if( levelChange ){
       if( p->nParent>0 ){
-        p->eType = p->sParse.aBlob[p->aParent[p->nParent-1].iHead] & 0x0f;
+        JsonParent *pParent = &p->aParent[p->nParent-1];
+        u32 i = pParent->iValue;
+        p->eType = p->sParse.aBlob[i] & 0x0f;
       }else{
         p->eType = 0;
       }
     }
+    if( p->eType==JSONB_ARRAY ){
+      assert( p->nParent>0 );
+      p->aParent[p->nParent-1].iKey++;
+    }
   }else{
     u32 n, sz = 0;
     u32 i = jsonSkipLabel(p);
     n = jsonbPayloadSize(&p->sParse, i, &sz);
     p->i = i + n + sz;
   }
+  p->iRowid++;
   return SQLITE_OK;
 }
 
@@ -6022,6 +6032,19 @@ static int jsonEachColumn(
         break;
       }
       case JEACH_FULLKEY: {
+#if 0
+        u32 i;
+        JsonString x;
+        jsonStringInit(&x, ctx);
+        for(i=0; i<p->nParent; i++){
+          jsonPrintf(200,&x,"(%u,%u,%u,%lld)",
+             p->aParent[i].iHead,
+             p->aParent[i].iValue,
+             p->aParent[i].iEnd,
+             p->aParent[i].iKey);
+        }
+        jsonReturnString(&x);
+#endif
 #if 0
         JsonString x;
         jsonStringInit(&x, ctx);

From b7d5cb711ae2cc0906e91de380d0eef8a5b3c363 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sat, 25 Nov 2023 13:40:19 +0000
Subject: [PATCH 03/10] Handle the path argument to json_tree() and
 json_each().

FossilOrigin-Name: fded888469565b2a4687185a926bd23fccfbf167c8bebe6c10696fc7f972f41e
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/json.c    | 53 ++++++++++++++++++++++++++++++++++++++++++++-------
 3 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/manifest b/manifest
index 55cf674438..b7f38de853 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Continuing\swork\son\sjson_tree()\sagainst\sa\sJSONB.
-D 2023-11-24T21:57:38.322
+C Handle\sthe\spath\sargument\sto\sjson_tree()\sand\sjson_each().
+D 2023-11-25T13:40:19.363
 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 699b3fa340c24a10874988b9cbf4a1635b4231569dfaef9e4fd8fb96195406aa
+F src/json.c ff48d52463493f5f40d6e1e14ac3dc9277c40290df140a52bd17e7a562f766ea
 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 f8cab41b3bc65af6ff34b481db693d640ea025d09463d50b8e56d855e2abc913
-R 12dbc87edffde88122e858181ec1f996
+P 3df891cb11feee65e239ee2506eda34a9688341f05210d7c2e25a05338cb71ad
+R 86973d4c807995bd645f2f5dbc7eac48
 U drh
-Z f88095c49473dd89bb79ab974b58607c
+Z e2d0e1a86b5ddc3117954e8a28079ed7
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index a401927f74..555d0938d3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3df891cb11feee65e239ee2506eda34a9688341f05210d7c2e25a05338cb71ad
\ No newline at end of file
+fded888469565b2a4687185a926bd23fccfbf167c8bebe6c10696fc7f972f41e
\ No newline at end of file
diff --git a/src/json.c b/src/json.c
index 5823eadc88..503fff9368 100644
--- a/src/json.c
+++ b/src/json.c
@@ -353,6 +353,7 @@ struct JsonParse {
   u8 eEdit;          /* Edit operation to apply */
   int delta;         /* Size change due to the edit */
   u32 nIns;          /* Number of bytes to insert */
+  u32 iLabel;        /* Location of label if search landed on an object value */
   u8 *aIns;          /* Content to be inserted */
 };
 
@@ -3904,6 +3905,7 @@ static u32 jsonLookupBlobStep(
         memcpy(&pParse->aBlob[iRoot], pParse->aIns, pParse->nIns);
       }
     }
+    pParse->iLabel = iLabel;
     return iRoot;
   }
   if( zPath[0]=='.' ){
@@ -6015,10 +6017,10 @@ static int jsonEachColumn(
         break;
       }
       case JEACH_ATOM: {
-        u32 i;
-        if( p->eType>=JSON_ARRAY ) break;
-        i = jsonSkipLabel(p);
-        jsonReturnFromBlob(&p->sParse, i, ctx, 1);
+        u32 i = jsonSkipLabel(p);
+        if( (p->sParse.aBlob[i] & 0x0f)<JSONB_ARRAY ){
+          jsonReturnFromBlob(&p->sParse, i, ctx, 1);
+        }
         break;
       }
       case JEACH_ID: {
@@ -6204,13 +6206,50 @@ static int jsonEachFilter(
     if( p->sParse.aBlob==0 ){
       return SQLITE_NOMEM;
     }
-    i = p->i = 0;
-    p->iEnd = 0;
-    p->eType = 0;
+    if( idxNum==3 ){
+      zRoot = (const char*)sqlite3_value_text(argv[1]);
+      if( zRoot==0 ) return SQLITE_OK;
+      n = sqlite3_value_bytes(argv[1]);
+      p->zRoot = sqlite3_malloc64( n+1 );
+      if( p->zRoot==0 ) return SQLITE_NOMEM;
+      memcpy(p->zRoot, zRoot, (size_t)n+1);
+      if( zRoot[0]!='$' ){
+        sqlite3_free(cur->pVtab->zErrMsg);
+        cur->pVtab->zErrMsg = jsonPathSyntaxError(zRoot, 0);
+        jsonEachCursorReset(p);
+        return cur->pVtab->zErrMsg ? SQLITE_ERROR : SQLITE_NOMEM;
+      }
+      if( zRoot[1]==0 ){
+        i = p->i = 0;
+        p->eType = 0;
+      }else{
+        i = jsonLookupBlobStep(&p->sParse, 0, p->zRoot+1, 0);
+        if( JSON_BLOB_ISERROR(i) ){
+          p->i = 0;
+          p->eType = 0;
+          p->iEnd = 0;
+          return SQLITE_OK;
+        }
+        if( p->sParse.iLabel ){
+          p->i = p->sParse.iLabel;
+          p->eType = JSONB_OBJECT;
+        }else{
+          p->i = i;
+          p->eType = JSONB_ARRAY;
+        }
+      }
+    }else{
+      i = p->i = 0;
+      p->eType = 0;
+    }
     p->nParent = 0;
     p->sParse.isBinary = 1;
     n = jsonbPayloadSize(&p->sParse, i, &sz);
     p->iEnd = i+n+sz;
+    if( (p->sParse.aBlob[i] & 0x0f)>=JSONB_ARRAY && !p->bRecursive ){
+      p->i += n;
+      p->eType = p->sParse.aBlob[i] & 0x0f;
+    }
     return SQLITE_OK;
   }else{
     z = (const char*)sqlite3_value_text(argv[0]);

From c2474105ca39070a40f53b3c36550c9b169c5469 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sat, 25 Nov 2023 18:11:11 +0000
Subject: [PATCH 04/10] Generate the fullkey and path columns of json_tree().

FossilOrigin-Name: ffaa468ab8871906121df9ee5ef3dc00129a0086ed9c18831ecda69bf7f71455
---
 manifest      |  12 +++---
 manifest.uuid |   2 +-
 src/json.c    | 104 +++++++++++++++++++++++++-------------------------
 3 files changed, 60 insertions(+), 58 deletions(-)

diff --git a/manifest b/manifest
index b7f38de853..af86c512c2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Handle\sthe\spath\sargument\sto\sjson_tree()\sand\sjson_each().
-D 2023-11-25T13:40:19.363
+C Generate\sthe\sfullkey\sand\spath\scolumns\sof\sjson_tree().
+D 2023-11-25T18:11:11.468
 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 ff48d52463493f5f40d6e1e14ac3dc9277c40290df140a52bd17e7a562f766ea
+F src/json.c 9a5ff28f7b55e83b92eeab9285eb4b0132f11526620565e2d5b81fb84d4e8611
 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 3df891cb11feee65e239ee2506eda34a9688341f05210d7c2e25a05338cb71ad
-R 86973d4c807995bd645f2f5dbc7eac48
+P fded888469565b2a4687185a926bd23fccfbf167c8bebe6c10696fc7f972f41e
+R 90c664426338898baffedf8dcba41bea
 U drh
-Z e2d0e1a86b5ddc3117954e8a28079ed7
+Z e9b6e925dfee6d388855b55f2b458a4c
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 555d0938d3..acd1f46af1 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fded888469565b2a4687185a926bd23fccfbf167c8bebe6c10696fc7f972f41e
\ No newline at end of file
+ffaa468ab8871906121df9ee5ef3dc00129a0086ed9c18831ecda69bf7f71455
\ No newline at end of file
diff --git a/src/json.c b/src/json.c
index 503fff9368..c8269436eb 100644
--- a/src/json.c
+++ b/src/json.c
@@ -796,7 +796,6 @@ static void jsonAppendSqlValue(
   }
 }
 
-
 /* Make the text in p (which is probably a generated JSON text string)
 ** the result of the SQL function.
 **
@@ -5580,6 +5579,7 @@ struct JsonParent {
   u32 iHead;                 /* Start of object or array */
   u32 iValue;                /* Start of the value */
   u32 iEnd;                  /* First byte past the end */
+  u32 nPath;                 /* Length of path */
   i64 iKey;                  /* Key for JSONB_ARRAY */
 };
 
@@ -5598,6 +5598,7 @@ struct JsonEachCursor {
   char *zJson;               /* Input JSON */
   char *zRoot;               /* Path by which to filter zJson */
   sqlite3 *db;               /* Database connection */
+  JsonString path;           /* Current path */
   JsonParse sParse;          /* Parse of the input JSON */
 };
 typedef struct JsonEachConnection JsonEachConnection;
@@ -5666,6 +5667,7 @@ static int jsonEachOpenEach(sqlite3_vtab *p, sqlite3_vtab_cursor **ppCursor){
   if( pCur==0 ) return SQLITE_NOMEM;
   memset(pCur, 0, sizeof(*pCur));
   pCur->db = pVtab->db;
+  jsonStringZero(&pCur->path);
   *ppCursor = &pCur->base;
   return SQLITE_OK;
 }
@@ -5685,6 +5687,7 @@ static int jsonEachOpenTree(sqlite3_vtab *p, sqlite3_vtab_cursor **ppCursor){
 static void jsonEachCursorReset(JsonEachCursor *p){
   sqlite3_free(p->zRoot);
   jsonParseReset(&p->sParse);
+  jsonStringReset(&p->path);
   sqlite3DbFree(p->db, p->aParent);
   p->iRowid = 0;
   p->i = 0;
@@ -5701,6 +5704,7 @@ static void jsonEachCursorReset(JsonEachCursor *p){
 static int jsonEachClose(sqlite3_vtab_cursor *cur){
   JsonEachCursor *p = (JsonEachCursor*)cur;
   jsonEachCursorReset(p);
+  
   sqlite3_free(cur);
   return SQLITE_OK;
 }
@@ -5727,6 +5731,39 @@ static int jsonSkipLabel(JsonEachCursor *p){
   }
 }
 
+/*
+** Append the path name for the current element.
+*/
+static void jsonAppendPathName(JsonEachCursor *p){
+  assert( p->nParent>0 );
+  assert( p->eType==JSONB_ARRAY || p->eType==JSONB_OBJECT );
+  if( p->eType==JSONB_ARRAY ){
+    jsonPrintf(30, &p->path, "[%lld]", p->aParent[p->nParent-1].iKey);
+  }else{
+    u32 n, sz = 0, k, i;
+    const char *z;
+    int needQuote = 0;
+    n = jsonbPayloadSize(&p->sParse, p->i, &sz);
+    k = p->i + n;
+    z = (const char*)&p->sParse.aBlob[k];
+    if( sz==0 || !sqlite3Isalpha(z[0]) ){
+      needQuote = 1;
+    }else{
+      for(i=0; i<sz; i++){
+        if( !sqlite3Isalnum(z[i]) ){
+          needQuote = 1;
+          break;
+        }
+      }
+    }
+    if( needQuote ){
+      jsonPrintf(sz+4,&p->path,".\"%.*s\"", sz, z);
+    }else{
+      jsonPrintf(sz+2,&p->path,".%.*s", sz, z);
+    }
+  }
+}
+
 /* Advance the cursor to the next element for json_tree() */
 static int jsonEachNext(sqlite3_vtab_cursor *cur){
   JsonEachCursor *p = (JsonEachCursor*)cur;
@@ -5789,17 +5826,21 @@ static int jsonEachNext(sqlite3_vtab_cursor *cur){
         p->aParent = pNew;
       }
       levelChange = 1;
-      pParent = &p->aParent[p->nParent++];
+      pParent = &p->aParent[p->nParent];
       pParent->iHead = p->i;
       pParent->iValue = i;
       pParent->iEnd = i + n + sz;
       pParent->iKey = -1;
+      pParent->nPath = (u32)p->path.nUsed;
+      if( p->eType && p->nParent ) jsonAppendPathName(p);
+      p->nParent++;
       p->i = i + n;
     }else{
       p->i = i + n + sz;
     }
     while( p->nParent>0 && p->i >= p->aParent[p->nParent-1].iEnd ){
       p->nParent--;
+      p->path.nUsed = p->aParent[p->nParent].nPath;
       levelChange = 1;
     }
     if( levelChange ){
@@ -6034,53 +6075,16 @@ static int jsonEachColumn(
         break;
       }
       case JEACH_FULLKEY: {
-#if 0
-        u32 i;
-        JsonString x;
-        jsonStringInit(&x, ctx);
-        for(i=0; i<p->nParent; i++){
-          jsonPrintf(200,&x,"(%u,%u,%u,%lld)",
-             p->aParent[i].iHead,
-             p->aParent[i].iValue,
-             p->aParent[i].iEnd,
-             p->aParent[i].iKey);
-        }
-        jsonReturnString(&x);
-#endif
-#if 0
-        JsonString x;
-        jsonStringInit(&x, ctx);
-        if( p->bRecursive ){
-          jsonEachComputePath(p, &x, p->i);
-        }else{
-          if( p->zRoot ){
-            jsonAppendRaw(&x, p->zRoot, (int)strlen(p->zRoot));
-          }else{
-            jsonAppendChar(&x, '$');
-          }
-          if( p->eType==JSON_ARRAY ){
-            jsonPrintf(30, &x, "[%d]", p->iRowid);
-          }else if( p->eType==JSON_OBJECT ){
-            jsonAppendObjectPathElementOfNode(&x, pThis);
-          }
-        }
-        jsonReturnString(&x);
-#endif
+        u64 nBase = p->path.nUsed;
+        if( p->nParent ) jsonAppendPathName(p);
+        sqlite3_result_text64(ctx, p->path.zBuf, p->path.nUsed,
+                              SQLITE_TRANSIENT, SQLITE_UTF8);
+        p->path.nUsed = nBase;
         break;
       }
       case JEACH_PATH: {
-#if 0
-        if( p->bRecursive ){
-          JsonString x;
-          jsonStringInit(&x, ctx);
-          jsonEachComputePath(p, &x, p->sParse.aUp[p->i]);
-          jsonReturnString(&x);
-          break;
-        }
-        /* For json_each() path and root are the same so fall through
-        ** into the root case */
-        /* no break */ deliberate_fall_through
-#endif
+        sqlite3_result_text64(ctx, p->path.zBuf, p->path.nUsed,
+                              SQLITE_TRANSIENT, SQLITE_UTF8);
         break;
       }
       default: {
@@ -6209,10 +6213,6 @@ static int jsonEachFilter(
     if( idxNum==3 ){
       zRoot = (const char*)sqlite3_value_text(argv[1]);
       if( zRoot==0 ) return SQLITE_OK;
-      n = sqlite3_value_bytes(argv[1]);
-      p->zRoot = sqlite3_malloc64( n+1 );
-      if( p->zRoot==0 ) return SQLITE_NOMEM;
-      memcpy(p->zRoot, zRoot, (size_t)n+1);
       if( zRoot[0]!='$' ){
         sqlite3_free(cur->pVtab->zErrMsg);
         cur->pVtab->zErrMsg = jsonPathSyntaxError(zRoot, 0);
@@ -6223,7 +6223,7 @@ static int jsonEachFilter(
         i = p->i = 0;
         p->eType = 0;
       }else{
-        i = jsonLookupBlobStep(&p->sParse, 0, p->zRoot+1, 0);
+        i = jsonLookupBlobStep(&p->sParse, 0, zRoot+1, 0);
         if( JSON_BLOB_ISERROR(i) ){
           p->i = 0;
           p->eType = 0;
@@ -6238,9 +6238,11 @@ static int jsonEachFilter(
           p->eType = JSONB_ARRAY;
         }
       }
+      jsonAppendRaw(&p->path, zRoot, sqlite3Strlen30(zRoot));
     }else{
       i = p->i = 0;
       p->eType = 0;
+      jsonAppendRaw(&p->path, "$", 1);
     }
     p->nParent = 0;
     p->sParse.isBinary = 1;

From aea2d2312103e2c63c6433977e6e06a32e2244a4 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sat, 25 Nov 2023 19:28:44 +0000
Subject: [PATCH 05/10] Almost working.  Path is still not exactly right when
 Root is defined on json_tree().

FossilOrigin-Name: 92258246916a9c0d72785964513113848a850dec78bdade8b3f274e410df4e7e
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/json.c    | 10 +++++++++-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/manifest b/manifest
index af86c512c2..8851c060f1 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Generate\sthe\sfullkey\sand\spath\scolumns\sof\sjson_tree().
-D 2023-11-25T18:11:11.468
+C Almost\sworking.\s\sPath\sis\sstill\snot\sexactly\sright\swhen\sRoot\sis\sdefined\son\njson_tree().
+D 2023-11-25T19:28:44.393
 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 9a5ff28f7b55e83b92eeab9285eb4b0132f11526620565e2d5b81fb84d4e8611
+F src/json.c 617eaedbe44c139f0144f04ecbfa240721462f45d76e715eaacc99e172bf43b0
 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 fded888469565b2a4687185a926bd23fccfbf167c8bebe6c10696fc7f972f41e
-R 90c664426338898baffedf8dcba41bea
+P ffaa468ab8871906121df9ee5ef3dc00129a0086ed9c18831ecda69bf7f71455
+R b82a578143acb9c5e1a084b85e2e99b7
 U drh
-Z e9b6e925dfee6d388855b55f2b458a4c
+Z 1f6ed13fcc3b9ce0d1d8c376c125c482
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index acd1f46af1..78ef7d1413 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ffaa468ab8871906121df9ee5ef3dc00129a0086ed9c18831ecda69bf7f71455
\ No newline at end of file
+92258246916a9c0d72785964513113848a850dec78bdade8b3f274e410df4e7e
\ No newline at end of file
diff --git a/src/json.c b/src/json.c
index c8269436eb..2de4c61a12 100644
--- a/src/json.c
+++ b/src/json.c
@@ -6249,8 +6249,16 @@ static int jsonEachFilter(
     n = jsonbPayloadSize(&p->sParse, i, &sz);
     p->iEnd = i+n+sz;
     if( (p->sParse.aBlob[i] & 0x0f)>=JSONB_ARRAY && !p->bRecursive ){
-      p->i += n;
+      p->i = i + n;
       p->eType = p->sParse.aBlob[i] & 0x0f;
+      p->aParent = sqlite3DbMallocZero(p->db, sizeof(JsonParent));
+      if( p->aParent==0 ) return SQLITE_NOMEM;
+      p->nParent = 1;
+      p->nParentAlloc = 1;
+      p->aParent[0].iKey = 0;
+      p->aParent[0].iEnd = p->iEnd;
+      p->aParent[0].iHead = p->i;
+      p->aParent[0].iValue = i;
     }
     return SQLITE_OK;
   }else{

From 796abda53828a776e0d6057406656e4295446002 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sat, 25 Nov 2023 20:59:03 +0000
Subject: [PATCH 06/10] Remove the vestigal JsonNode logic from json_tree() and
 json_each().

FossilOrigin-Name: 66c2ab9ebbf90477742e6be0d30e061d827c409de038f2a5b73479ed9448c4a6
---
 manifest      |  12 +-
 manifest.uuid |   2 +-
 src/json.c    | 552 +++++++++++---------------------------------------
 3 files changed, 124 insertions(+), 442 deletions(-)

diff --git a/manifest b/manifest
index 8851c060f1..1f18d63513 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Almost\sworking.\s\sPath\sis\sstill\snot\sexactly\sright\swhen\sRoot\sis\sdefined\son\njson_tree().
-D 2023-11-25T19:28:44.393
+C Remove\sthe\svestigal\sJsonNode\slogic\sfrom\sjson_tree()\sand\sjson_each().
+D 2023-11-25T20:59:03.008
 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 617eaedbe44c139f0144f04ecbfa240721462f45d76e715eaacc99e172bf43b0
+F src/json.c 211c4e1b8fd886c97d3224105bfef9d4cc04db2e3f1daca1e95c52343df4e85c
 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 ffaa468ab8871906121df9ee5ef3dc00129a0086ed9c18831ecda69bf7f71455
-R b82a578143acb9c5e1a084b85e2e99b7
+P 92258246916a9c0d72785964513113848a850dec78bdade8b3f274e410df4e7e
+R 43fba60a847876455ec8abde78205ef3
 U drh
-Z 1f6ed13fcc3b9ce0d1d8c376c125c482
+Z d0660c039b12ecd1fe4ffd828711a405
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 78ef7d1413..3b93842124 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-92258246916a9c0d72785964513113848a850dec78bdade8b3f274e410df4e7e
\ No newline at end of file
+66c2ab9ebbf90477742e6be0d30e061d827c409de038f2a5b73479ed9448c4a6
\ No newline at end of file
diff --git a/src/json.c b/src/json.c
index 2de4c61a12..cc4eb83c5b 100644
--- a/src/json.c
+++ b/src/json.c
@@ -329,7 +329,6 @@ struct JsonParse {
   JsonNode *aNode;   /* Array of nodes containing the parse */
   char *zJson;       /* Original JSON string (before edits) */
   char *zAlt;        /* Revised and/or mimified JSON */
-  u32 *aUp;          /* Index of parent of each node */
   JsonCleanup *pClup;/* Cleanup operations prior to freeing this object */
   u16 iDepth;        /* Nesting depth */
   u8 nErr;           /* Number of errors seen */
@@ -860,10 +859,6 @@ static void jsonParseReset(JsonParse *pParse){
   }
   pParse->nNode = 0;
   pParse->nAlloc = 0;
-  if( pParse->aUp ){
-    sqlite3_free(pParse->aUp);
-    pParse->aUp = 0;
-  }
   if( pParse->bJsonIsRCStr ){
     sqlite3RCStrUnref(pParse->zJson);
     pParse->zJson = 0;
@@ -2013,33 +2008,6 @@ json_parse_restart:
   } /* End switch(z[i]) */
 }
 
-/* Mark node i of pParse as being a child of iParent.  Call recursively
-** to fill in all the descendants of node i.
-*/
-static void jsonParseFillInParentage(JsonParse *pParse, u32 i, u32 iParent){
-  JsonNode *pNode = &pParse->aNode[i];
-  u32 j;
-  pParse->aUp[i] = iParent;
-  switch( pNode->eType ){
-    case JSON_ARRAY: {
-      for(j=1; j<=pNode->n; j += jsonNodeSize(pNode+j)){
-        jsonParseFillInParentage(pParse, i+j, i);
-      }
-      break;
-    }
-    case JSON_OBJECT: {
-      for(j=1; j<=pNode->n; j += jsonNodeSize(pNode+j+1)+1){
-        pParse->aUp[i+j] = i;
-        jsonParseFillInParentage(pParse, i+j+1, i);
-      }
-      break;
-    }
-    default: {
-      break;
-    }
-  }
-}
-
 /*
 ** Parse JSON (either pure RFC-8259 JSON text, or JSON-5 text, or a JSONB
 ** blob) into the JsonNode representation.
@@ -2090,21 +2058,6 @@ static int jsonParse(
   return 0;
 }
 
-/*
-** Compute the parentage of all nodes in a completed parse.
-*/
-static int jsonParseFindParents(JsonParse *pParse){
-  u32 *aUp;
-  assert( pParse->aUp==0 );
-  aUp = pParse->aUp = sqlite3_malloc64( sizeof(u32)*pParse->nNode );
-  if( aUp==0 ){
-    pParse->oom = 1;
-    return SQLITE_NOMEM;
-  }
-  jsonParseFillInParentage(pParse, 0, 0);
-  return SQLITE_OK;
-}
-
 /*
 ** Magic number used for the JSON parse cache in sqlite3_get_auxdata()
 */
@@ -3257,7 +3210,7 @@ static int jsonConvertTextToBlob(
     }
   }
   if( i<=0 ){
-    if( ALWAYS(pCtx!=0) ){
+    if( pCtx!=0 ){
       if( pParse->oom ){
         sqlite3_result_error_nomem(pCtx);
       }else{
@@ -5767,47 +5720,7 @@ static void jsonAppendPathName(JsonEachCursor *p){
 /* Advance the cursor to the next element for json_tree() */
 static int jsonEachNext(sqlite3_vtab_cursor *cur){
   JsonEachCursor *p = (JsonEachCursor*)cur;
-  if( p->sParse.aNode ){
-    /* LEGACY */
-    if( p->bRecursive ){
-      if( p->sParse.aNode[p->i].jnFlags & JNODE_LABEL ) p->i++;
-      p->i++;
-      p->iRowid++;
-      if( p->i<p->iEnd ){
-        u32 iUp = p->sParse.aUp[p->i];
-        JsonNode *pUp = &p->sParse.aNode[iUp];
-        p->eType = pUp->eType;
-        if( pUp->eType==JSON_ARRAY ){
-          assert( pUp->eU==0 || pUp->eU==3 );
-          testcase( pUp->eU==3 );
-          JSON_VVA( pUp->eU = 3 );
-          if( iUp==p->i-1 ){
-            pUp->u.iKey = 0;
-          }else{
-            pUp->u.iKey++;
-          }
-        }
-      }
-    }else{
-      switch( p->eType ){
-        case JSON_ARRAY: {
-          p->i += jsonNodeSize(&p->sParse.aNode[p->i]);
-          p->iRowid++;
-          break;
-        }
-        case JSON_OBJECT: {
-          p->i += 1 + jsonNodeSize(&p->sParse.aNode[p->i+1]);
-          p->iRowid++;
-          break;
-        }
-        default: {
-          p->i = p->iEnd;
-          break;
-        }
-      }
-    }
-    return SQLITE_OK;
-  }else if( p->bRecursive ){
+  if( p->bRecursive ){
     u8 x;
     u8 levelChange = 0;
     u32 n, sz = 0;
@@ -5866,70 +5779,6 @@ static int jsonEachNext(sqlite3_vtab_cursor *cur){
   return SQLITE_OK;
 }
 
-/* Append an object label to the JSON Path being constructed
-** in pStr.
-*/
-static void jsonAppendObjectPathElementOfNode(
-  JsonString *pStr,
-  JsonNode *pNode
-){
-  int nn;
-  const char *z;
-  int bNeedQuote = 0;
-  assert( pNode->eType==JSON_STRING );
-  assert( pNode->jnFlags & JNODE_LABEL );
-  assert( pNode->eU==1 );
-  z = pNode->u.zJContent;
-  nn = pNode->n;
-  if( pNode->jnFlags & JNODE_RAW ){
-    /* no-op */
-  }else if( nn==0 || !sqlite3Isalpha(z[0]) ){
-    bNeedQuote = 1;
-  }else{
-    int jj;
-    for(jj=1; jj<nn && sqlite3Isalnum(z[jj]); jj++){}
-    bNeedQuote = jj<nn;
-  }
-  if( bNeedQuote ){
-    jsonPrintf(nn+4, pStr, ".\"%.*s\"", nn, z);
-  }else{
-    jsonPrintf(nn+2, pStr, ".%.*s", nn, z);
-  }
-}
-
-/* Append the name of the path for element i to pStr
-*/
-static void jsonEachComputePath(
-  JsonEachCursor *p,       /* The cursor */
-  JsonString *pStr,        /* Write the path here */
-  u32 i                    /* Path to this element */
-){
-  JsonNode *pNode, *pUp;
-  u32 iUp;
-  if( i==0 ){
-    jsonAppendChar(pStr, '$');
-    return;
-  }
-  if( p->sParse.aNode ){
-    /* LEGACY */
-    assert( p->sParse.aUp );
-    iUp = p->sParse.aUp[i];
-    jsonEachComputePath(p, pStr, iUp);
-    pNode = &p->sParse.aNode[i];
-    pUp = &p->sParse.aNode[iUp];
-    if( pUp->eType==JSON_ARRAY ){
-      assert( pUp->eU==3 || (pUp->eU==0 && pUp->u.iKey==0) );
-      testcase( pUp->eU==0 );
-      jsonPrintf(30, pStr, "[%d]", pUp->u.iKey);
-    }else{
-      assert( pUp->eType==JSON_OBJECT );
-      if( (pNode->jnFlags & JNODE_LABEL)==0 ) pNode--;
-      jsonAppendObjectPathElementOfNode(pStr, pNode);
-    }
-    return;
-  }
-}
-
 /* Return the value of a column */
 static int jsonEachColumn(
   sqlite3_vtab_cursor *cur,   /* The cursor */
@@ -5937,173 +5786,73 @@ static int jsonEachColumn(
   int iColumn                 /* Which column to return */
 ){
   JsonEachCursor *p = (JsonEachCursor*)cur;
-  if( p->sParse.aNode!=0 ){
-    /* LEGACY */
-    JsonNode *pThis = &p->sParse.aNode[p->i];
-    switch( iColumn ){
-      case JEACH_KEY: {
-        if( p->i==0 ) break;
-        if( p->eType==JSON_OBJECT ){
-          jsonReturnFromNode(&p->sParse, pThis, ctx, 0);
-        }else if( p->eType==JSON_ARRAY ){
-          u32 iKey;
-          if( p->bRecursive ){
-            if( p->iRowid==0 ) break;
-            assert( p->sParse.aNode[p->sParse.aUp[p->i]].eU==3 );
-            iKey = p->sParse.aNode[p->sParse.aUp[p->i]].u.iKey;
-          }else{
-            iKey = p->iRowid;
-          }
-          sqlite3_result_int64(ctx, (sqlite3_int64)iKey);
-        }
-        break;
-      }
-      case JEACH_VALUE: {
-        if( pThis->jnFlags & JNODE_LABEL ) pThis++;
-        jsonReturnFromNode(&p->sParse, pThis, ctx, 0);
-        break;
-      }
-      case JEACH_TYPE: {
-        if( pThis->jnFlags & JNODE_LABEL ) pThis++;
-        sqlite3_result_text(ctx, jsonType[pThis->eType], -1, SQLITE_STATIC);
-        break;
-      }
-      case JEACH_ATOM: {
-        if( pThis->jnFlags & JNODE_LABEL ) pThis++;
-        if( pThis->eType>=JSON_ARRAY ) break;
-        jsonReturnFromNode(&p->sParse, pThis, ctx, 0);
-        break;
-      }
-      case JEACH_ID: {
-        sqlite3_result_int64(ctx,
-           (sqlite3_int64)p->i + ((pThis->jnFlags & JNODE_LABEL)!=0));
-        break;
-      }
-      case JEACH_PARENT: {
-        if( p->i>p->iBegin && p->bRecursive ){
-          sqlite3_result_int64(ctx, (sqlite3_int64)p->sParse.aUp[p->i]);
-        }
-        break;
-      }
-      case JEACH_FULLKEY: {
-        JsonString x;
-        jsonStringInit(&x, ctx);
-        if( p->bRecursive ){
-          jsonEachComputePath(p, &x, p->i);
-        }else{
-          if( p->zRoot ){
-            jsonAppendRaw(&x, p->zRoot, (int)strlen(p->zRoot));
-          }else{
-            jsonAppendChar(&x, '$');
-          }
-          if( p->eType==JSON_ARRAY ){
-            jsonPrintf(30, &x, "[%d]", p->iRowid);
-          }else if( p->eType==JSON_OBJECT ){
-            jsonAppendObjectPathElementOfNode(&x, pThis);
-          }
-        }
-        jsonReturnString(&x);
-        break;
-      }
-      case JEACH_PATH: {
-        if( p->bRecursive ){
-          JsonString x;
-          jsonStringInit(&x, ctx);
-          jsonEachComputePath(p, &x, p->sParse.aUp[p->i]);
-          jsonReturnString(&x);
-          break;
-        }
-        /* For json_each() path and root are the same so fall through
-        ** into the root case */
-        /* no break */ deliberate_fall_through
-      }
-      default: {
-        const char *zRoot = p->zRoot;
-        if( zRoot==0 ) zRoot = "$";
-        sqlite3_result_text(ctx, zRoot, -1, SQLITE_STATIC);
-        break;
-      }
-      case JEACH_JSON: {
-        if( p->sParse.isBinary ){
-          sqlite3_result_blob(ctx, p->sParse.aBlob, p->sParse.nBlob,
-                              SQLITE_STATIC);
-        }else{
-          sqlite3_result_text(ctx, p->sParse.zJson, -1, SQLITE_STATIC);
-        }
-        break;
+  switch( iColumn ){
+    case JEACH_KEY: {
+      if( p->nParent==0 ) break;
+      if( p->eType==JSONB_OBJECT ){
+        jsonReturnFromBlob(&p->sParse, p->i, ctx, 1);
+      }else{
+        assert( p->eType==JSONB_ARRAY );
+        sqlite3_result_int64(ctx, p->aParent[p->nParent-1].iKey);
       }
+      break;
     }
-  }else{
-    /* Blob scan */
-    switch( iColumn ){
-      case JEACH_KEY: {
-        if( p->nParent==0 ) break;
-        if( p->eType==JSONB_OBJECT ){
-          jsonReturnFromBlob(&p->sParse, p->i, ctx, 1);
-        }else{
-          assert( p->eType==JSONB_ARRAY );
-          sqlite3_result_int64(ctx, p->aParent[p->nParent-1].iKey);
-        }
-        break;
-      }
-      case JEACH_VALUE: {
-        u32 i = jsonSkipLabel(p);
+    case JEACH_VALUE: {
+      u32 i = jsonSkipLabel(p);
+      jsonReturnFromBlob(&p->sParse, i, ctx, 1);
+      break;
+    }
+    case JEACH_TYPE: {
+      u32 i = jsonSkipLabel(p);
+      u8 eType = eType = p->sParse.aBlob[i] & 0x0f;
+      sqlite3_result_text(ctx, jsonbType[eType], -1, SQLITE_STATIC);
+      break;
+    }
+    case JEACH_ATOM: {
+      u32 i = jsonSkipLabel(p);
+      if( (p->sParse.aBlob[i] & 0x0f)<JSONB_ARRAY ){
         jsonReturnFromBlob(&p->sParse, i, ctx, 1);
-        break;
-      }
-      case JEACH_TYPE: {
-        u32 i = jsonSkipLabel(p);
-        u8 eType = eType = p->sParse.aBlob[i] & 0x0f;
-        sqlite3_result_text(ctx, jsonbType[eType], -1, SQLITE_STATIC);
-        break;
-      }
-      case JEACH_ATOM: {
-        u32 i = jsonSkipLabel(p);
-        if( (p->sParse.aBlob[i] & 0x0f)<JSONB_ARRAY ){
-          jsonReturnFromBlob(&p->sParse, i, ctx, 1);
-        }
-        break;
-      }
-      case JEACH_ID: {
-        sqlite3_result_int64(ctx, (sqlite3_int64)p->i);
-        break;
-      }
-      case JEACH_PARENT: {
-        if( p->nParent>0 ){
-          sqlite3_result_int64(ctx, p->aParent[p->nParent-1].iHead);
-        }
-        break;
-      }
-      case JEACH_FULLKEY: {
-        u64 nBase = p->path.nUsed;
-        if( p->nParent ) jsonAppendPathName(p);
-        sqlite3_result_text64(ctx, p->path.zBuf, p->path.nUsed,
-                              SQLITE_TRANSIENT, SQLITE_UTF8);
-        p->path.nUsed = nBase;
-        break;
-      }
-      case JEACH_PATH: {
-        sqlite3_result_text64(ctx, p->path.zBuf, p->path.nUsed,
-                              SQLITE_TRANSIENT, SQLITE_UTF8);
-        break;
-      }
-      default: {
-        const char *zRoot = p->zRoot;
-        if( zRoot==0 ) zRoot = "$";
-        sqlite3_result_text(ctx, zRoot, -1, SQLITE_STATIC);
-        break;
-      }
-      case JEACH_JSON: {
-        if( p->sParse.isBinary ){
-          sqlite3_result_blob(ctx, p->sParse.aBlob, p->sParse.nBlob,
-                              SQLITE_STATIC);
-        }else{
-          sqlite3_result_text(ctx, p->sParse.zJson, -1, SQLITE_STATIC);
-        }
-        break;
       }
+      break;
+    }
+    case JEACH_ID: {
+      sqlite3_result_int64(ctx, (sqlite3_int64)p->i);
+      break;
+    }
+    case JEACH_PARENT: {
+      if( p->nParent>0 ){
+        sqlite3_result_int64(ctx, p->aParent[p->nParent-1].iHead);
+      }
+      break;
+    }
+    case JEACH_FULLKEY: {
+      u64 nBase = p->path.nUsed;
+      if( p->nParent ) jsonAppendPathName(p);
+      sqlite3_result_text64(ctx, p->path.zBuf, p->path.nUsed,
+                            SQLITE_TRANSIENT, SQLITE_UTF8);
+      p->path.nUsed = nBase;
+      break;
+    }
+    case JEACH_PATH: {
+      sqlite3_result_text64(ctx, p->path.zBuf, p->path.nUsed,
+                            SQLITE_TRANSIENT, SQLITE_UTF8);
+      break;
+    }
+    default: {
+      const char *zRoot = p->zRoot;
+      if( zRoot==0 ) zRoot = "$";
+      sqlite3_result_text(ctx, zRoot, -1, SQLITE_STATIC);
+      break;
+    }
+    case JEACH_JSON: {
+      if( p->sParse.isBinary ){
+        sqlite3_result_blob(ctx, p->sParse.aBlob, p->sParse.nBlob,
+                            SQLITE_STATIC);
+      }else{
+        sqlite3_result_text(ctx, p->sParse.zJson, -1, SQLITE_STATIC);
+      }
+      break;
     }
-
   }
   return SQLITE_OK;
 }
@@ -6192,10 +5941,8 @@ static int jsonEachFilter(
   int argc, sqlite3_value **argv
 ){
   JsonEachCursor *p = (JsonEachCursor*)cur;
-  const char *z;
   const char *zRoot = 0;
-  sqlite3_int64 n;
-  int isBinary;
+  u32 i, n, sz;
 
   UNUSED_PARAMETER(idxStr);
   UNUSED_PARAMETER(argc);
@@ -6204,136 +5951,71 @@ static int jsonEachFilter(
   memset(&p->sParse, 0, sizeof(p->sParse));
   p->sParse.nJPRef = 1;
   if( jsonFuncArgMightBeBinary(argv[0]) ){
-    u32 i, n, sz;
     p->sParse.nBlob = sqlite3_value_bytes(argv[0]);
     p->sParse.aBlob = (u8*)sqlite3_value_blob(argv[0]);
     if( p->sParse.aBlob==0 ){
       return SQLITE_NOMEM;
     }
-    if( idxNum==3 ){
-      zRoot = (const char*)sqlite3_value_text(argv[1]);
-      if( zRoot==0 ) return SQLITE_OK;
-      if( zRoot[0]!='$' ){
-        sqlite3_free(cur->pVtab->zErrMsg);
-        cur->pVtab->zErrMsg = jsonPathSyntaxError(zRoot, 0);
-        jsonEachCursorReset(p);
-        return cur->pVtab->zErrMsg ? SQLITE_ERROR : SQLITE_NOMEM;
+  }else{
+    p->sParse.zJson = (char*)sqlite3_value_text(argv[0]);
+    p->sParse.nJson = sqlite3_value_bytes(argv[0]);
+    if( p->sParse.zJson==0 || jsonConvertTextToBlob(&p->sParse, 0) ){
+      if( p->sParse.oom ){
+        return SQLITE_NOMEM;
       }
-      if( zRoot[1]==0 ){
-        i = p->i = 0;
-        p->eType = 0;
-      }else{
-        i = jsonLookupBlobStep(&p->sParse, 0, zRoot+1, 0);
-        if( JSON_BLOB_ISERROR(i) ){
-          p->i = 0;
-          p->eType = 0;
-          p->iEnd = 0;
-          return SQLITE_OK;
-        }
-        if( p->sParse.iLabel ){
-          p->i = p->sParse.iLabel;
-          p->eType = JSONB_OBJECT;
-        }else{
-          p->i = i;
-          p->eType = JSONB_ARRAY;
-        }
-      }
-      jsonAppendRaw(&p->path, zRoot, sqlite3Strlen30(zRoot));
-    }else{
+      p->i = p->iEnd = 0;
+      return SQLITE_OK;
+    }
+  }
+  if( idxNum==3 ){
+    zRoot = (const char*)sqlite3_value_text(argv[1]);
+    if( zRoot==0 ) return SQLITE_OK;
+    if( zRoot[0]!='$' ){
+      sqlite3_free(cur->pVtab->zErrMsg);
+      cur->pVtab->zErrMsg = jsonPathSyntaxError(zRoot, 0);
+      jsonEachCursorReset(p);
+      return cur->pVtab->zErrMsg ? SQLITE_ERROR : SQLITE_NOMEM;
+    }
+    if( zRoot[1]==0 ){
       i = p->i = 0;
       p->eType = 0;
-      jsonAppendRaw(&p->path, "$", 1);
-    }
-    p->nParent = 0;
-    p->sParse.isBinary = 1;
-    n = jsonbPayloadSize(&p->sParse, i, &sz);
-    p->iEnd = i+n+sz;
-    if( (p->sParse.aBlob[i] & 0x0f)>=JSONB_ARRAY && !p->bRecursive ){
-      p->i = i + n;
-      p->eType = p->sParse.aBlob[i] & 0x0f;
-      p->aParent = sqlite3DbMallocZero(p->db, sizeof(JsonParent));
-      if( p->aParent==0 ) return SQLITE_NOMEM;
-      p->nParent = 1;
-      p->nParentAlloc = 1;
-      p->aParent[0].iKey = 0;
-      p->aParent[0].iEnd = p->iEnd;
-      p->aParent[0].iHead = p->i;
-      p->aParent[0].iValue = i;
-    }
-    return SQLITE_OK;
-  }else{
-    z = (const char*)sqlite3_value_text(argv[0]);
-    isBinary = 0;
-  }
-  if( z==0 ) return SQLITE_OK;
-  if( sqlite3ValueIsOfClass(argv[0], sqlite3RCStrUnref) ){
-    p->sParse.zJson = sqlite3RCStrRef((char*)z);
-  }else{
-    n = sqlite3_value_bytes(argv[0]);
-    p->sParse.zJson = sqlite3RCStrNew( n+1 );
-    if( p->sParse.zJson==0 ) return SQLITE_NOMEM;
-    memcpy(p->sParse.zJson, z, (size_t)n+(isBinary==0));
-    p->sParse.nJson = n;
-  }
-  p->sParse.bJsonIsRCStr = 1;
-  p->sParse.isBinary = isBinary;
-  p->zJson = p->sParse.zJson;
-  if( jsonParse(&p->sParse, 0) ){
-    int rc = SQLITE_NOMEM;
-    if( p->sParse.oom==0 ){
-      sqlite3_free(cur->pVtab->zErrMsg);
-      cur->pVtab->zErrMsg = sqlite3_mprintf("malformed JSON");
-      if( cur->pVtab->zErrMsg ) rc = SQLITE_ERROR;
-    }
-    jsonEachCursorReset(p);
-    return rc;
-  }else if( p->bRecursive && jsonParseFindParents(&p->sParse) ){
-    jsonEachCursorReset(p);
-    return SQLITE_NOMEM;
-  }else{
-    JsonNode *pNode = 0;
-    if( idxNum==3 ){
-      const char *zErr = 0;
-      zRoot = (const char*)sqlite3_value_text(argv[1]);
-      if( zRoot==0 ) return SQLITE_OK;
-      n = sqlite3_value_bytes(argv[1]);
-      p->zRoot = sqlite3_malloc64( n+1 );
-      if( p->zRoot==0 ) return SQLITE_NOMEM;
-      memcpy(p->zRoot, zRoot, (size_t)n+1);
-      if( zRoot[0]!='$' ){
-        zErr = zRoot;
-      }else{
-        pNode = jsonLookupStep(&p->sParse, 0, p->zRoot+1, 0, &zErr);
-      }
-      if( zErr ){
-        sqlite3_free(cur->pVtab->zErrMsg);
-        cur->pVtab->zErrMsg = jsonPathSyntaxError(zErr, 0);
-        jsonEachCursorReset(p);
-        return cur->pVtab->zErrMsg ? SQLITE_ERROR : SQLITE_NOMEM;
-      }else if( pNode==0 ){
+    }else{
+      i = jsonLookupBlobStep(&p->sParse, 0, zRoot+1, 0);
+      if( JSON_BLOB_ISERROR(i) ){
+        p->i = 0;
+        p->eType = 0;
+        p->iEnd = 0;
         return SQLITE_OK;
       }
-    }else{
-      pNode = p->sParse.aNode;
-    }
-    p->iBegin = p->i = (int)(pNode - p->sParse.aNode);
-    p->eType = pNode->eType;
-    if( p->eType>=JSON_ARRAY ){
-      assert( pNode->eU==0 );
-      JSON_VVA( pNode->eU = 3 );
-      pNode->u.iKey = 0;
-      p->iEnd = p->i + pNode->n + 1;
-      if( p->bRecursive ){
-        p->eType = p->sParse.aNode[p->sParse.aUp[p->i]].eType;
-        if( p->i>0 && (p->sParse.aNode[p->i-1].jnFlags & JNODE_LABEL)!=0 ){
-          p->i--;
-        }
+      if( p->sParse.iLabel ){
+        p->i = p->sParse.iLabel;
+        p->eType = JSONB_OBJECT;
       }else{
-        p->i++;
+        p->i = i;
+        p->eType = JSONB_ARRAY;
       }
-    }else{
-      p->iEnd = p->i+1;
     }
+    jsonAppendRaw(&p->path, zRoot, sqlite3Strlen30(zRoot));
+  }else{
+    i = p->i = 0;
+    p->eType = 0;
+    jsonAppendRaw(&p->path, "$", 1);
+  }
+  p->nParent = 0;
+  p->sParse.isBinary = 1;
+  n = jsonbPayloadSize(&p->sParse, i, &sz);
+  p->iEnd = i+n+sz;
+  if( (p->sParse.aBlob[i] & 0x0f)>=JSONB_ARRAY && !p->bRecursive ){
+    p->i = i + n;
+    p->eType = p->sParse.aBlob[i] & 0x0f;
+    p->aParent = sqlite3DbMallocZero(p->db, sizeof(JsonParent));
+    if( p->aParent==0 ) return SQLITE_NOMEM;
+    p->nParent = 1;
+    p->nParentAlloc = 1;
+    p->aParent[0].iKey = 0;
+    p->aParent[0].iEnd = p->iEnd;
+    p->aParent[0].iHead = p->i;
+    p->aParent[0].iValue = i;
   }
   return SQLITE_OK;
 }

From e09a38c2e830b0311405cb6b442aa6f4d07583fc Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sat, 25 Nov 2023 23:00:50 +0000
Subject: [PATCH 07/10] Remove unused elements from the json_tree() cursor.

FossilOrigin-Name: 914a50117d477b2cd30d58388fb8d1b71ff7ff6842ba025f38efc6e9647d06d0
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/json.c    | 14 ++++----------
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/manifest b/manifest
index 1f18d63513..17f760ca91 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sthe\svestigal\sJsonNode\slogic\sfrom\sjson_tree()\sand\sjson_each().
-D 2023-11-25T20:59:03.008
+C Remove\sunused\selements\sfrom\sthe\sjson_tree()\scursor.
+D 2023-11-25T23:00:50.622
 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 211c4e1b8fd886c97d3224105bfef9d4cc04db2e3f1daca1e95c52343df4e85c
+F src/json.c 7bd0d3809b31e32ffa053ba68cf03f67121f6bdd0be7031e8d4c761bef9b6aee
 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 92258246916a9c0d72785964513113848a850dec78bdade8b3f274e410df4e7e
-R 43fba60a847876455ec8abde78205ef3
+P 66c2ab9ebbf90477742e6be0d30e061d827c409de038f2a5b73479ed9448c4a6
+R 79cb22ebedffb4f5b0a0989ee5c920ed
 U drh
-Z d0660c039b12ecd1fe4ffd828711a405
+Z b95c9f50e6b9041cf41818958255b068
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 3b93842124..a22ec07c45 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-66c2ab9ebbf90477742e6be0d30e061d827c409de038f2a5b73479ed9448c4a6
\ No newline at end of file
+914a50117d477b2cd30d58388fb8d1b71ff7ff6842ba025f38efc6e9647d06d0
\ No newline at end of file
diff --git a/src/json.c b/src/json.c
index cc4eb83c5b..1a2a5bd9ef 100644
--- a/src/json.c
+++ b/src/json.c
@@ -5540,16 +5540,14 @@ typedef struct JsonEachCursor JsonEachCursor;
 struct JsonEachCursor {
   sqlite3_vtab_cursor base;  /* Base class - must be first */
   u32 iRowid;                /* The rowid */
-  u32 iBegin;                /* The first node of the scan */
   u32 i;                     /* Index in sParse.aBlob[] of current row */
   u32 iEnd;                  /* EOF when i equals or exceeds this value */
+  u32 nRoot;                 /* Size of the root argument in bytes */
   u8 eType;                  /* Type of the container for element i */
   u8 bRecursive;             /* True for json_tree().  False for json_each() */
   u32 nParent;               /* Current nesting depth */
   u32 nParentAlloc;          /* Space allocated for aParent[] */
   JsonParent *aParent;       /* Parent elements of i */
-  char *zJson;               /* Input JSON */
-  char *zRoot;               /* Path by which to filter zJson */
   sqlite3 *db;               /* Database connection */
   JsonString path;           /* Current path */
   JsonParse sParse;          /* Parse of the input JSON */
@@ -5638,7 +5636,6 @@ static int jsonEachOpenTree(sqlite3_vtab *p, sqlite3_vtab_cursor **ppCursor){
 /* Reset a JsonEachCursor back to its original state.  Free any memory
 ** held. */
 static void jsonEachCursorReset(JsonEachCursor *p){
-  sqlite3_free(p->zRoot);
   jsonParseReset(&p->sParse);
   jsonStringReset(&p->path);
   sqlite3DbFree(p->db, p->aParent);
@@ -5649,8 +5646,6 @@ static void jsonEachCursorReset(JsonEachCursor *p){
   p->nParentAlloc = 0;
   p->iEnd = 0;
   p->eType = 0;
-  p->zJson = 0;
-  p->zRoot = 0;
 }
 
 /* Destructor for a jsonEachCursor object */
@@ -5839,9 +5834,7 @@ static int jsonEachColumn(
       break;
     }
     default: {
-      const char *zRoot = p->zRoot;
-      if( zRoot==0 ) zRoot = "$";
-      sqlite3_result_text(ctx, zRoot, -1, SQLITE_STATIC);
+      sqlite3_result_text(ctx, p->path.zBuf, p->nRoot, SQLITE_STATIC);
       break;
     }
     case JEACH_JSON: {
@@ -5956,6 +5949,7 @@ static int jsonEachFilter(
     if( p->sParse.aBlob==0 ){
       return SQLITE_NOMEM;
     }
+    p->sParse.isBinary = 1;
   }else{
     p->sParse.zJson = (char*)sqlite3_value_text(argv[0]);
     p->sParse.nJson = sqlite3_value_bytes(argv[0]);
@@ -6001,8 +5995,8 @@ static int jsonEachFilter(
     p->eType = 0;
     jsonAppendRaw(&p->path, "$", 1);
   }
+  p->nRoot = p->path.nUsed;
   p->nParent = 0;
-  p->sParse.isBinary = 1;
   n = jsonbPayloadSize(&p->sParse, i, &sz);
   p->iEnd = i+n+sz;
   if( (p->sParse.aBlob[i] & 0x0f)>=JSONB_ARRAY && !p->bRecursive ){

From 50b37832b250acb3fc55b8f177935ab7af4eef48 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sun, 26 Nov 2023 00:48:37 +0000
Subject: [PATCH 08/10] Same results as the legacy JsonNode implementation on a
 small set of test cases.

FossilOrigin-Name: c3da4b079a1a15a4c0b1a6e71f876648b1d9eb32eddc67b9946c2475c7b6d085
---
 manifest      | 12 +++++-----
 manifest.uuid |  2 +-
 src/json.c    | 62 ++++++++++++++++++++++++++++++++++++++++++---------
 3 files changed, 59 insertions(+), 17 deletions(-)

diff --git a/manifest b/manifest
index 17f760ca91..4ae8c18715 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sunused\selements\sfrom\sthe\sjson_tree()\scursor.
-D 2023-11-25T23:00:50.622
+C Same\sresults\sas\sthe\slegacy\sJsonNode\simplementation\son\sa\ssmall\sset\sof\stest\scases.
+D 2023-11-26T00:48:37.511
 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 7bd0d3809b31e32ffa053ba68cf03f67121f6bdd0be7031e8d4c761bef9b6aee
+F src/json.c b93f282f032f904118121ae64552972f078ac13adcd7fc982d20f596f97a424a
 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 66c2ab9ebbf90477742e6be0d30e061d827c409de038f2a5b73479ed9448c4a6
-R 79cb22ebedffb4f5b0a0989ee5c920ed
+P 914a50117d477b2cd30d58388fb8d1b71ff7ff6842ba025f38efc6e9647d06d0
+R d2ae12035201ed7d53848ee421edc8df
 U drh
-Z b95c9f50e6b9041cf41818958255b068
+Z e4ce705fdf38aad5873f97f479b0490a
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index a22ec07c45..a5cbb721e5 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-914a50117d477b2cd30d58388fb8d1b71ff7ff6842ba025f38efc6e9647d06d0
\ No newline at end of file
+c3da4b079a1a15a4c0b1a6e71f876648b1d9eb32eddc67b9946c2475c7b6d085
\ No newline at end of file
diff --git a/src/json.c b/src/json.c
index 1a2a5bd9ef..14fe274146 100644
--- a/src/json.c
+++ b/src/json.c
@@ -5542,7 +5542,7 @@ struct JsonEachCursor {
   u32 iRowid;                /* The rowid */
   u32 i;                     /* Index in sParse.aBlob[] of current row */
   u32 iEnd;                  /* EOF when i equals or exceeds this value */
-  u32 nRoot;                 /* Size of the root argument in bytes */
+  u32 nRoot;                 /* Size of the root path in bytes */
   u8 eType;                  /* Type of the container for element i */
   u8 bRecursive;             /* True for json_tree().  False for json_each() */
   u32 nParent;               /* Current nesting depth */
@@ -5760,20 +5760,44 @@ static int jsonEachNext(sqlite3_vtab_cursor *cur){
         p->eType = 0;
       }
     }
-    if( p->eType==JSONB_ARRAY ){
-      assert( p->nParent>0 );
-      p->aParent[p->nParent-1].iKey++;
-    }
   }else{
     u32 n, sz = 0;
     u32 i = jsonSkipLabel(p);
     n = jsonbPayloadSize(&p->sParse, i, &sz);
     p->i = i + n + sz;
   }
+  if( p->eType==JSONB_ARRAY ){
+    assert( p->nParent>0 );
+    p->aParent[p->nParent-1].iKey++;
+  }
   p->iRowid++;
   return SQLITE_OK;
 }
 
+/* Length of the path for rowid==0 in bRecursive mode.
+*/
+static int jsonEachPathLength(JsonEachCursor *p){
+  u32 n = p->path.nUsed;
+  if( p->iRowid==0 && p->bRecursive && n>1 ){
+    if( p->path.zBuf[n-1]==']' ){
+      do{
+        n--;
+        assert( n>0 );
+      }while( p->path.zBuf[n]!='[' );
+    }else{
+      u32 sz = 0;
+      jsonbPayloadSize(&p->sParse, p->i, &sz);
+      if( p->path.zBuf[n-1]=='"' ) sz += 2;
+      n -= sz;
+      while( p->path.zBuf[n]!='.' ){
+        n--;
+        assert( n>0 );
+      }
+    }
+  }
+  return n;
+}
+
 /* Return the value of a column */
 static int jsonEachColumn(
   sqlite3_vtab_cursor *cur,   /* The cursor */
@@ -5783,7 +5807,23 @@ static int jsonEachColumn(
   JsonEachCursor *p = (JsonEachCursor*)cur;
   switch( iColumn ){
     case JEACH_KEY: {
-      if( p->nParent==0 ) break;
+      if( p->nParent==0 ){
+        u32 n, j;
+        assert( p->iRowid==0 && p->bRecursive );
+        if( p->nRoot==1 ) break;
+        j = jsonEachPathLength(p);
+        n = p->nRoot - j;
+        if( p->path.zBuf[j]=='[' ){
+          i64 x;
+          sqlite3Atoi64(&p->path.zBuf[j+1], &x, n-1, SQLITE_UTF8);
+          sqlite3_result_int64(ctx, x);
+        }else if( p->path.zBuf[j+1]=='"' ){
+          sqlite3_result_text(ctx, &p->path.zBuf[j+2], n-3, SQLITE_TRANSIENT);
+        }else{
+          sqlite3_result_text(ctx, &p->path.zBuf[j+1], n-1, SQLITE_TRANSIENT);
+        }
+        break;
+      }
       if( p->eType==JSONB_OBJECT ){
         jsonReturnFromBlob(&p->sParse, p->i, ctx, 1);
       }else{
@@ -5815,7 +5855,7 @@ static int jsonEachColumn(
       break;
     }
     case JEACH_PARENT: {
-      if( p->nParent>0 ){
+      if( p->nParent>0 && p->bRecursive ){
         sqlite3_result_int64(ctx, p->aParent[p->nParent-1].iHead);
       }
       break;
@@ -5829,7 +5869,8 @@ static int jsonEachColumn(
       break;
     }
     case JEACH_PATH: {
-      sqlite3_result_text64(ctx, p->path.zBuf, p->path.nUsed,
+      u32 n = jsonEachPathLength(p);
+      sqlite3_result_text64(ctx, p->path.zBuf, n,
                             SQLITE_TRANSIENT, SQLITE_UTF8);
       break;
     }
@@ -5970,6 +6011,7 @@ static int jsonEachFilter(
       jsonEachCursorReset(p);
       return cur->pVtab->zErrMsg ? SQLITE_ERROR : SQLITE_NOMEM;
     }
+    p->nRoot = sqlite3_value_bytes(argv[1]);
     if( zRoot[1]==0 ){
       i = p->i = 0;
       p->eType = 0;
@@ -5989,13 +6031,13 @@ static int jsonEachFilter(
         p->eType = JSONB_ARRAY;
       }
     }
-    jsonAppendRaw(&p->path, zRoot, sqlite3Strlen30(zRoot));
+    jsonAppendRaw(&p->path, zRoot, p->nRoot);
   }else{
     i = p->i = 0;
     p->eType = 0;
+    p->nRoot = 1;
     jsonAppendRaw(&p->path, "$", 1);
   }
-  p->nRoot = p->path.nUsed;
   p->nParent = 0;
   n = jsonbPayloadSize(&p->sParse, i, &sz);
   p->iEnd = i+n+sz;

From 15c0b03c5dcccd8a5c3282b7b961dbfc9fda7760 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Sun, 26 Nov 2023 00:56:40 +0000
Subject: [PATCH 09/10] Fix corner-case error conditions.

FossilOrigin-Name: ec23d34ab75e1d7e9366e59c633e0d30def8759f6d4717583ebeb4c90aeccf0d
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/json.c    |  6 ++----
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/manifest b/manifest
index 4ae8c18715..7736b5bcaf 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Same\sresults\sas\sthe\slegacy\sJsonNode\simplementation\son\sa\ssmall\sset\sof\stest\scases.
-D 2023-11-26T00:48:37.511
+C Fix\scorner-case\serror\sconditions.
+D 2023-11-26T00:56:40.131
 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 b93f282f032f904118121ae64552972f078ac13adcd7fc982d20f596f97a424a
+F src/json.c 59dd8bf951f0c7b2e1004f406f8690d9743146f176d675da06427f99c75c78f7
 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 914a50117d477b2cd30d58388fb8d1b71ff7ff6842ba025f38efc6e9647d06d0
-R d2ae12035201ed7d53848ee421edc8df
+P c3da4b079a1a15a4c0b1a6e71f876648b1d9eb32eddc67b9946c2475c7b6d085
+R 6a83cb0634a1b413d8dd9f72a2caf803
 U drh
-Z e4ce705fdf38aad5873f97f479b0490a
+Z cf069d3ef952e41c66c8bcc7a7e83b20
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index a5cbb721e5..90bef2caad 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c3da4b079a1a15a4c0b1a6e71f876648b1d9eb32eddc67b9946c2475c7b6d085
\ No newline at end of file
+ec23d34ab75e1d7e9366e59c633e0d30def8759f6d4717583ebeb4c90aeccf0d
\ No newline at end of file
diff --git a/src/json.c b/src/json.c
index 14fe274146..9317608267 100644
--- a/src/json.c
+++ b/src/json.c
@@ -416,7 +416,7 @@ static void jsonStringReset(JsonString *p){
 */
 static void jsonStringOom(JsonString *p){
   p->eErr |= JSTRING_OOM;
-  sqlite3_result_error_nomem(p->pCtx);
+  if( p->pCtx ) sqlite3_result_error_nomem(p->pCtx);
   jsonStringReset(p);
 }
 
@@ -5766,8 +5766,7 @@ static int jsonEachNext(sqlite3_vtab_cursor *cur){
     n = jsonbPayloadSize(&p->sParse, i, &sz);
     p->i = i + n + sz;
   }
-  if( p->eType==JSONB_ARRAY ){
-    assert( p->nParent>0 );
+  if( p->eType==JSONB_ARRAY && p->nParent ){
     p->aParent[p->nParent-1].iKey++;
   }
   p->iRowid++;
@@ -5809,7 +5808,6 @@ static int jsonEachColumn(
     case JEACH_KEY: {
       if( p->nParent==0 ){
         u32 n, j;
-        assert( p->iRowid==0 && p->bRecursive );
         if( p->nRoot==1 ) break;
         j = jsonEachPathLength(p);
         n = p->nRoot - j;

From b4e5bc6cdb3fb282e735706dbceb888ac500ac23 Mon Sep 17 00:00:00 2001
From: drh <>
Date: Mon, 27 Nov 2023 12:30:55 +0000
Subject: [PATCH 10/10] All tests passing.

FossilOrigin-Name: b5a5660ca22437640c9bf32c44d92c76a7293dafcbaf4fa6a4c171128d64871d
---
 manifest          | 14 +++++++-------
 manifest.uuid     |  2 +-
 src/json.c        | 38 ++++++++++++++++++++++++++++----------
 test/json101.test |  8 ++++----
 4 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/manifest b/manifest
index 7736b5bcaf..8e410950f6 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\scorner-case\serror\sconditions.
-D 2023-11-26T00:56:40.131
+C All\stests\spassing.
+D 2023-11-27T12:30:55.729
 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 59dd8bf951f0c7b2e1004f406f8690d9743146f176d675da06427f99c75c78f7
+F src/json.c efd9ec1cb0f0cbee3e43ebaba69469b3d3f44ee623b53b1ce72361da42e05fbe
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
 F src/main.c 1b89f3de98d1b59fec5bac1d66d6ece21f703821b8eaa0d53d9604c35309f6f9
@@ -1325,7 +1325,7 @@ F test/json/json-generator.tcl dc0dd0f393800c98658fc4c47eaa6af29d4e17527380cd286
 F test/json/json-q1-b.txt 606818a5fba6d9e418c9f4ea7d8418af026775042dad81439b72447a147a462c
 F test/json/json-q1.txt 65f9d1cdcc4cffa9823fb73ed936aae5658700cd001fde448f68bfb91c807307
 F test/json/json-speed-check.sh b060a9a6c696c0a807d8929400fa11bd7113edc58b0d66b9795f424f8d0db326 x
-F test/json101.test 2420fbed1d2dddb9562f8b9d0ac540849b99deba74e869560f94f674ef24171c
+F test/json101.test 19f9abc77c33151bd7fdb7850fb473cb0154f229b863b740590ad9de807a032d
 F test/json102.test 557a46e16df1aa9bdbc4076a71a45814ea0e7503d6621d87d42a8c04cbc2b0ef
 F test/json103.test 53df87f83a4e5fa0c0a56eb29ff6c94055c6eb919f33316d62161a8880112dbe
 F test/json104.test 1b844a70cddcfa2e4cd81a5db0657b2e61e7f00868310f24f56a9ba0114348c1
@@ -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 c3da4b079a1a15a4c0b1a6e71f876648b1d9eb32eddc67b9946c2475c7b6d085
-R 6a83cb0634a1b413d8dd9f72a2caf803
+P ec23d34ab75e1d7e9366e59c633e0d30def8759f6d4717583ebeb4c90aeccf0d
+R 6545b38a1b858ef8dae597ee252577f2
 U drh
-Z cf069d3ef952e41c66c8bcc7a7e83b20
+Z b98cdf654b65fc79957da28b6036dc53
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 90bef2caad..050c01db3c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ec23d34ab75e1d7e9366e59c633e0d30def8759f6d4717583ebeb4c90aeccf0d
\ No newline at end of file
+b5a5660ca22437640c9bf32c44d92c76a7293dafcbaf4fa6a4c171128d64871d
\ No newline at end of file
diff --git a/src/json.c b/src/json.c
index 9317608267..0e3f6fe575 100644
--- a/src/json.c
+++ b/src/json.c
@@ -5715,6 +5715,7 @@ static void jsonAppendPathName(JsonEachCursor *p){
 /* Advance the cursor to the next element for json_tree() */
 static int jsonEachNext(sqlite3_vtab_cursor *cur){
   JsonEachCursor *p = (JsonEachCursor*)cur;
+  int rc = SQLITE_OK;
   if( p->bRecursive ){
     u8 x;
     u8 levelChange = 0;
@@ -5740,7 +5741,10 @@ static int jsonEachNext(sqlite3_vtab_cursor *cur){
       pParent->iEnd = i + n + sz;
       pParent->iKey = -1;
       pParent->nPath = (u32)p->path.nUsed;
-      if( p->eType && p->nParent ) jsonAppendPathName(p);
+      if( p->eType && p->nParent ){
+        jsonAppendPathName(p);
+        if( p->path.eErr ) rc = SQLITE_NOMEM;
+      }
       p->nParent++;
       p->i = i + n;
     }else{
@@ -5770,7 +5774,7 @@ static int jsonEachNext(sqlite3_vtab_cursor *cur){
     p->aParent[p->nParent-1].iKey++;
   }
   p->iRowid++;
-  return SQLITE_OK;
+  return rc;
 }
 
 /* Length of the path for rowid==0 in bRecursive mode.
@@ -5811,7 +5815,9 @@ static int jsonEachColumn(
         if( p->nRoot==1 ) break;
         j = jsonEachPathLength(p);
         n = p->nRoot - j;
-        if( p->path.zBuf[j]=='[' ){
+        if( n==0 ){
+          break;
+        }else if( p->path.zBuf[j]=='[' ){
           i64 x;
           sqlite3Atoi64(&p->path.zBuf[j+1], &x, n-1, SQLITE_UTF8);
           sqlite3_result_int64(ctx, x);
@@ -5992,12 +5998,18 @@ static int jsonEachFilter(
   }else{
     p->sParse.zJson = (char*)sqlite3_value_text(argv[0]);
     p->sParse.nJson = sqlite3_value_bytes(argv[0]);
-    if( p->sParse.zJson==0 || jsonConvertTextToBlob(&p->sParse, 0) ){
+    if( p->sParse.zJson==0 ){
+      p->i = p->iEnd = 0;
+      return SQLITE_OK;
+    }      
+    if( jsonConvertTextToBlob(&p->sParse, 0) ){
       if( p->sParse.oom ){
         return SQLITE_NOMEM;
       }
-      p->i = p->iEnd = 0;
-      return SQLITE_OK;
+      sqlite3_free(cur->pVtab->zErrMsg);
+      cur->pVtab->zErrMsg = sqlite3_mprintf("malformed JSON");
+      jsonEachCursorReset(p);
+      return cur->pVtab->zErrMsg ? SQLITE_ERROR : SQLITE_NOMEM;
     }
   }
   if( idxNum==3 ){
@@ -6016,10 +6028,16 @@ static int jsonEachFilter(
     }else{
       i = jsonLookupBlobStep(&p->sParse, 0, zRoot+1, 0);
       if( JSON_BLOB_ISERROR(i) ){
-        p->i = 0;
-        p->eType = 0;
-        p->iEnd = 0;
-        return SQLITE_OK;
+        if( i==JSON_BLOB_NOTFOUND ){
+          p->i = 0;
+          p->eType = 0;
+          p->iEnd = 0;
+          return SQLITE_OK;
+        }
+        sqlite3_free(cur->pVtab->zErrMsg);
+        cur->pVtab->zErrMsg = jsonPathSyntaxError(zRoot, 0);
+        jsonEachCursorReset(p);
+        return cur->pVtab->zErrMsg ? SQLITE_ERROR : SQLITE_NOMEM;
       }
       if( p->sParse.iLabel ){
         p->i = p->sParse.iLabel;
diff --git a/test/json101.test b/test/json101.test
index 426746377c..280d467393 100644
--- a/test/json101.test
+++ b/test/json101.test
@@ -925,16 +925,16 @@ do_execsql_test json101-14.170 {
 #
 do_execsql_test json101-15.100 {
   SELECT * FROM JSON_EACH('{"a":1, "b":2}');
-} {a 1 integer 1 2 {} {$.a} {$} b 2 integer 2 4 {} {$.b} {$}}
+} {a 1 integer 1 1 {} {$.a} {$} b 2 integer 2 5 {} {$.b} {$}}
 do_execsql_test json101-15.110 {
   SELECT xyz.* FROM JSON_EACH('{"a":1, "b":2}') AS xyz;
-} {a 1 integer 1 2 {} {$.a} {$} b 2 integer 2 4 {} {$.b} {$}}
+} {a 1 integer 1 1 {} {$.a} {$} b 2 integer 2 5 {} {$.b} {$}}
 do_execsql_test json101-15.120 {
   SELECT * FROM (JSON_EACH('{"a":1, "b":2}'));
-} {a 1 integer 1 2 {} {$.a} {$} b 2 integer 2 4 {} {$.b} {$}}
+} {a 1 integer 1 1 {} {$.a} {$} b 2 integer 2 5 {} {$.b} {$}}
 do_execsql_test json101-15.130 {
   SELECT xyz.* FROM (JSON_EACH('{"a":1, "b":2}')) AS xyz;
-} {a 1 integer 1 2 {} {$.a} {$} b 2 integer 2 4 {} {$.b} {$}}
+} {a 1 integer 1 1 {} {$.a} {$} b 2 integer 2 5 {} {$.b} {$}}
 
 # 2019-11-10
 # Mailing list bug report on the handling of surrogate pairs