database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2026-01-06 08:01:16 +03:00
Code Activity

Direct editing of JSONB using json_insert() and json_set().

Browse Source 
FossilOrigin-Name: fffb7a9538838e26991e6f16ea3138346a30c33ea6c3d3834680ee6d1f6eece2
This commit is contained in:
drh
2023-11-21 20:13:08 +00:00
parent e1df37b947
commit 27fea97e44
3 changed files with 56 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Correct\sblob-to-text\srendering\sin\ssome\scorner\scases.
D 2023-11-21T19:05:22.846
C Direct\sediting\sof\sJSONB\susing\sjson_insert()\sand\sjson_set().
D 2023-11-21T20:13:08.271
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -685,7 +685,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 54e4261d68a463bb8e8adf7ce0ba9c8ad2853870ce53e4e5f903c6a97eb8b644
F src/json.c 6530a0ad967e10973ba46db399b46e20fc243b2b495cd53226aa31a9ce1b1e46
F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
F src/main.c 1b89f3de98d1b59fec5bac1d66d6ece21f703821b8eaa0d53d9604c35309f6f9
@@ -2142,8 +2142,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 40c4fb441f220982e4d61fd42597cf18546791a302fbcc8eec2eed29ee15ef35
R e0de56e45777fbb83b14bb9ecc453e36
P 7822e0e59f9b611fe6289cc762b0aff61f9b87c3a82c60de110f447589a2c125
R 42a0f1601a18c87c6ad9e79182203b90
U drh
Z 0c3d75110c96246c67d1b5a0fbc45fae
Z 7d1450dc466726ea7e03ad211ff3e833
# Remove this line to create a well-formed Fossil manifest.

2
manifest.uuid
View File

@@ -1 +1 @@
7822e0e59f9b611fe6289cc762b0aff61f9b87c3a82c60de110f447589a2c125
fffb7a9538838e26991e6f16ea3138346a30c33ea6c3d3834680ee6d1f6eece2

66
src/json.c
View File

@@ -349,10 +349,10 @@ struct JsonParse {
};
/* Allowed values for JsonParse.eEdit */
#define JEDIT_DEL 0x01 /* Delete if exists */
#define JEDIT_INS 0x02 /* Insert if not exists */
#define JEDIT_REPL 0x04 /* Overwrite if exists */
#define JEDIT_SET 0x08 /* Insert or overwrite */
#define JEDIT_DEL 1 /* Delete if exists */
#define JEDIT_REPL 2 /* Overwrite if exists */
#define JEDIT_INS 3 /* Insert if not exists */
#define JEDIT_SET 4 /* Insert or overwrite */
/*
** Maximum nesting depth of JSON for this implementation.
@@ -2586,12 +2586,12 @@ static int jsonBlobExpand(JsonParse *pParse, u32 N){
**
** Return true on success. Return false on OOM.
*/
static int jsonBlobMakeEditable(JsonParse *pParse){
static int jsonBlobMakeEditable(JsonParse *pParse, u32 nExtra){
u8 *aOld;
u32 nSize;
if( pParse->nBlobAlloc>0 ) return 1;
aOld = pParse->aBlob;
nSize = pParse->nBlob + pParse->nIns;
nSize = pParse->nBlob + pParse->nIns + nExtra;
if( nSize>100 ) nSize -= 100;
pParse->aBlob = 0;
if( jsonBlobExpand(pParse, nSize) ){
@@ -3859,7 +3859,7 @@ static u32 jsonLookupBlobStep(
u8 x;
if( zPath[0]==0 ){
if( pParse->eEdit && jsonBlobMakeEditable(pParse) ){
if( pParse->eEdit && jsonBlobMakeEditable(pParse, 0) ){
n = jsonbPayloadSize(pParse, iRoot, &sz);
sz += n;
if( pParse->eEdit==JEDIT_DEL ){
@@ -3941,6 +3941,32 @@ static u32 jsonLookupBlobStep(
j += n+sz;
}
if( j>iEnd ) return JSON_BLOB_ERROR;
if( pParse->eEdit>=JEDIT_INS ){
u32 nIns;
u8 aLabel[16];
JsonParse ix;
testcase( pParse->eEdit==JEDIT_INS );
testcase( pParse->eEdit==JEDIT_SET );
memset(&ix, 0, sizeof(ix));
ix.aBlob = aLabel;
ix.nBlobAlloc = sizeof(aLabel);
jsonBlobAppendNodeType(&ix,JSONB_TEXTRAW, nKey);
if( jsonBlobMakeEditable(pParse, ix.nBlob+nKey) ){
nIns = ix.nBlob + nKey + pParse->nIns;
assert( pParse->nBlob + pParse->nIns <= pParse->nBlobAlloc );
memmove(&pParse->aBlob[j+nIns], &pParse->aBlob[j],
pParse->nBlob - j);
memcpy(&pParse->aBlob[j], ix.aBlob, ix.nBlob);
k = j + ix.nBlob;
memcpy(&pParse->aBlob[k], zKey, nKey);
k += nKey;
memcpy(&pParse->aBlob[k], pParse->aIns, pParse->nIns);
pParse->delta = nIns;
pParse->nBlob += nIns;
jsonAfterEditSizeAdjust(pParse, iRoot);
}
return j;
}
}else if( zPath[0]=='[' ){
x = pParse->aBlob[iRoot] & 0x0f;
if( x!=JSONB_ARRAY ) return JSON_BLOB_NOTFOUND;
@@ -3987,19 +4013,21 @@ static u32 jsonLookupBlobStep(
}
if( j>iEnd ) return JSON_BLOB_ERROR;
if( k>1 ) return JSON_BLOB_NOTFOUND;
if( pParse->eEdit>=JEDIT_INS && jsonBlobMakeEditable(pParse, 0) ){
testcase( pParse->eEdit==JEDIT_INS );
testcase( pParse->eEdit==JEDIT_SET );
assert( pParse->nBlob + pParse->nIns <= pParse->nBlobAlloc );
memmove(&pParse->aBlob[j+pParse->nIns], &pParse->aBlob[j],
pParse->nBlob - j);
memcpy(&pParse->aBlob[j], pParse->aIns, pParse->nIns);
pParse->delta = pParse->nIns;
pParse->nBlob += pParse->nIns;
jsonAfterEditSizeAdjust(pParse, iRoot);
return j;
}
}else{
return JSON_BLOB_PATHERROR;
}
if( pParse->eEdit==JEDIT_INS && jsonBlobMakeEditable(pParse) ){
assert( pParse->nBlob + pParse->nIns <= pParse->nBlobAlloc );
memmove(&pParse->aBlob[j], &pParse->aBlob[j+pParse->nIns],
pParse->nBlob - j);
memcpy(&pParse->aBlob[j], pParse->aIns, pParse->nIns);
pParse->delta = pParse->nIns;
pParse->nBlob += pParse->nIns;
jsonAfterEditSizeAdjust(pParse, iRoot);
return j;
}
return JSON_BLOB_NOTFOUND;
}
@@ -5183,6 +5211,10 @@ static void jsonSetFunc(
jsonWrongNumArgs(ctx, bIsSet ? "set" : "insert");
return;
}
if( jsonFuncArgMightBeBinary(argv[0]) && argc>=3 ){
jsonInsertIntoBlob(ctx, argc, argv, bIsSet ? JEDIT_SET : JEDIT_INS);
return;
}
pParse = jsonParseCached(ctx, argv[0], ctx, argc>1);
if( pParse==0 ) return;
pParse->nJPRef++;