Commite7877e0

Nikita Glukhov

committed

Add JsonValueUnwrap(), JsonExtractScalar()

1 parent63ba0ba commite7877e0Copy full SHA for e7877e0

File tree

+60

-7

lines changed

+60

-7

lines changed

Lines changed: 46 additions & 0 deletions

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

Lines changed: 2 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -934,15 +934,9 @@ datum_to_jsonb(Datum val, bool is_null, JsonbInState *result,`
`934`	`934`	`?DatumGetJsont(val)`
`935`	`935`	`:DatumGetJsonb(val);`
`936`	`936`	`#endif`
`937`		`-JsonbIterator*it;`
`938`		`-`
`939`		`-it=JsonbIteratorInit(&jsonb->root);`
`940`		`-`
`941`	`937`	`if (JB_ROOT_IS_SCALAR(jsonb))`
`942`	`938`	`{`
`943`		`-(void)JsonbIteratorNext(&it,&jb, true);`
`944`		`-Assert(jb.type==jbvArray);`
`945`		`-(void)JsonbIteratorNext(&it,&jb, true);`
	`939`	`+JsonExtractScalar(&jsonb->root,&jb);`
`946`	`940`	`break;`
`947`	`941`	`}`
`948`	`942`
`@@ -954,6 +948,7 @@ datum_to_jsonb(Datum val, bool is_null, JsonbInState *result,`
`954`	`948`	`else`
`955`	`949`	`{`
`956`	`950`	`JsonbIteratorTokentype;`
	`951`	`+JsonbIterator*it=JsonbIteratorInit(&jsonb->root);`
`957`	`952`
`958`	`953`	`while ((type=JsonbIteratorNext(&it,&jb, false))`
`959`	`954`	`!=WJB_DONE)`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -693,6 +693,16 @@ pushJsonbValueExt(JsonbParseState **pstate, JsonbIteratorToken seq,`
`693`	`693`	`jbval->type!=jbvBinary\|\| !unpackBinary)`
`694`	`694`	`{`
`695`	`695`	`/* drop through */`
	`696`	`+if (jbval&& (seq==WJB_ELEM\|\|seq==WJB_VALUE))`
	`697`	`+jbval=JsonValueUnwrap(jbval,&v);`
	`698`	`+`
	`699`	`+returnpushJsonbValueScalar(pstate,seq,jbval);`
	`700`	`+}`
	`701`	`+`
	`702`	`+if (*pstate&&JsonContainerIsScalar(jbval->val.binary.data))`
	`703`	`+{`
	`704`	`+jbval=JsonExtractScalar(jbval->val.binary.data,&v);`
	`705`	`+Assert(IsAJsonbScalar(jbval));`
`696`	`706`	`returnpushJsonbValueScalar(pstate,seq,jbval);`
`697`	`707`	`}`
`698`	`708`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -346,7 +346,9 @@ extern JsonValue JsonToJsonValue(Json json, JsonValue *jv);`
`346`	`346`	`externJsonValueJsonValueUnpackBinary(constJsonValuejbv);`
`347`	`347`	`externJsonContainerJsonValueToContainer(constJsonValueval);`
`348`	`348`	`externJsonValueJsonValueCopy(JsonValueres,constJsonValue*val);`
	`349`	`+externconstJsonValueJsonValueUnwrap(constJsonValueval,JsonValue*buf);`
`349`	`350`	`externJsonContainerJsonCopyFlat(JsonContainerflatContainer);`
	`351`	`+externJsonValueJsonExtractScalar(JsonContainerjc,JsonValue*scalar);`
`350`	`352`
`351`	`353`	`externintJsonCompareContainers(JsonContainera,JsonContainerb);`
`352`	`354`

Comments

(0)