Commitf168b8b

Nikita Glukhov

committed

Add JsonValueUnwrap(), JsonExtractScalar()

1 parent611cdfe commitf168b8bCopy full SHA for f168b8b

File tree

+60

-6

lines changed

+60

-6

lines changed

Lines changed: 46 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,52 @@ JsonValueCopy(JsonValue res, const JsonValue val)`
`103`	`103`	`returnres;`
`104`	`104`	`}`
`105`	`105`
	`106`	`+JsonValue*`
	`107`	`+JsonExtractScalar(JsonContainerjc,JsonValuescalar)`
	`108`	`+{`
	`109`	`+JsonIterator*it;`
	`110`	`+JsonValueval;`
	`111`	`+`
	`112`	`+Assert(JsonContainerIsScalar(jc));`
	`113`	`+`
	`114`	`+it=JsonIteratorInit(jc);`
	`115`	`+`
	`116`	`+if (JsonIteratorNext(&it,&val, false)!=WJB_BEGIN_ARRAY\|\|`
	`117`	`+JsonIteratorNext(&it,scalar, false)!=WJB_ELEM\|\|`
	`118`	`+JsonIteratorNext(&it,&val, false)!=WJB_END_ARRAY)`
	`119`	`+elog(ERROR,"unexpected structure of scalar json container");`
	`120`	`+`
	`121`	`+returnscalar;`
	`122`	`+}`
	`123`	`+`
	`124`	`+constJsonValue*`
	`125`	`+JsonValueUnwrap(constJsonValueval,JsonValuevalbuf)`
	`126`	`+{`
	`127`	`+if (val->type==jbvBinary)`
	`128`	`+{`
	`129`	`+JsonContainer*jc=val->val.binary.data;`
	`130`	`+`
	`131`	`+if (jc->ops==&jsonvContainerOps)`
	`132`	`+{`
	`133`	`+val= (JsonbValue*)jc->data;`
	`134`	`+Assert(val->type!=jbvBinary);`
	`135`	`+}`
	`136`	`+elseif (JsonContainerIsScalar(jc))`
	`137`	`+{`
	`138`	`+val=JsonExtractScalar(jc,valbuf);`
	`139`	`+Assert(IsAJsonbScalar(val));`
	`140`	`+}`
	`141`	`+}`
	`142`	`+`
	`143`	`+if (val->type==jbvArray&&val->val.array.rawScalar)`
	`144`	`+{`
	`145`	`+val=&val->val.array.elems[0];`
	`146`	`+Assert(IsAJsonbScalar(val));`
	`147`	`+}`
	`148`	`+`
	`149`	`+returnval;`
	`150`	`+}`
	`151`	`+`
`106`	`152`	`staticinlineJsonValue*`
`107`	`153`	`jsonFindKeyInObjectInternal(JsonContainerobj,constcharkey,intlen,`
`108`	`154`	`boollast)`

Lines changed: 2 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -846,15 +846,10 @@ datum_to_jsonb(Datum val, bool is_null, JsonbInState *result,`
`846`	`846`	`caseJSONBTYPE_JSONB:`
`847`	`847`	`{`
`848`	`848`	`Jsonb*jsonb=DatumGetJsonbP(val);`
`849`		`-JsonbIterator*it;`
`850`		`-`
`851`		`-it=JsonbIteratorInit(&jsonb->root);`
`852`	`849`
`853`	`850`	`if (JB_ROOT_IS_SCALAR(jsonb))`
`854`	`851`	`{`
`855`		`-(void)JsonbIteratorNext(&it,&jb, true);`
`856`		`-Assert(jb.type==jbvArray);`
`857`		`-(void)JsonbIteratorNext(&it,&jb, true);`
	`852`	`+JsonExtractScalar(&jsonb->root,&jb);`
`858`	`853`	`break;`
`859`	`854`	`}`
`860`	`855`
`@@ -866,6 +861,7 @@ datum_to_jsonb(Datum val, bool is_null, JsonbInState *result,`
`866`	`861`	`else`
`867`	`862`	`{`
`868`	`863`	`JsonbIteratorTokentype;`
	`864`	`+JsonbIterator*it=JsonbIteratorInit(&jsonb->root);`
`869`	`865`
`870`	`866`	`while ((type=JsonbIteratorNext(&it,&jb, false))`
`871`	`867`	`!=WJB_DONE)`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -747,6 +747,16 @@ pushJsonbValueExt(JsonbParseState **pstate, JsonbIteratorToken seq,`
`747`	`747`	`jbval->type!=jbvBinary\|\| !unpackBinary)`
`748`	`748`	`{`
`749`	`749`	`/* drop through */`
	`750`	`+if (jbval&& (seq==WJB_ELEM\|\|seq==WJB_VALUE))`
	`751`	`+jbval=JsonValueUnwrap(jbval,&v);`
	`752`	`+`
	`753`	`+returnpushJsonbValueScalar(pstate,seq,jbval);`
	`754`	`+}`
	`755`	`+`
	`756`	`+if (*pstate&&JsonContainerIsScalar(jbval->val.binary.data))`
	`757`	`+{`
	`758`	`+jbval=JsonExtractScalar(jbval->val.binary.data,&v);`
	`759`	`+Assert(IsAJsonbScalar(jbval));`
`750`	`760`	`returnpushJsonbValueScalar(pstate,seq,jbval);`
`751`	`761`	`}`
`752`	`762`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,9 @@ extern JsonValue JsonToJsonValue(Json json, JsonValue *jv);`
`271`	`271`	`externJsonValueJsonValueUnpackBinary(constJsonValuejbv);`
`272`	`272`	`externJsonContainerJsonValueToContainer(constJsonValueval);`
`273`	`273`	`externJsonValueJsonValueCopy(JsonValueres,constJsonValue*val);`
	`274`	`+externconstJsonValueJsonValueUnwrap(constJsonValueval,JsonValue*buf);`
`274`	`275`	`externJsonContainerJsonCopyFlat(JsonContainerflatContainer);`
	`276`	`+externJsonValueJsonExtractScalar(JsonContainerjc,JsonValue*scalar);`
`275`	`277`
`276`	`278`	`externJsonb*JsonbMakeEmptyArray(void);`
`277`	`279`	`externJsonb*JsonbMakeEmptyObject(void);`

Comments

(0)