Commit4a881f9

Nikita Glukhov

committed

Use pushSingleScalarJsonbValue() in JsonbValueToJsonb()

1 parent856dc9a commit4a881f9Copy full SHA for 4a881f9

File tree

-11

lines changed

-11

lines changed

Lines changed: 3 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,8 @@ static void uniqueifyJsonbObject(JsonbValue *object, bool unique_keys,`
`109`	`109`	`staticJsonbValuepushJsonbValueScalar(JsonbParseState*pstate,`
`110`	`110`	`JsonbIteratorTokenseq,`
`111`	`111`	`JsonbValue*scalarVal);`
	`112`	`+staticJsonbValuepushSingleScalarJsonbValue(JsonbParseState*pstate,`
	`113`	`+JsonbValue*jbval);`
`112`	`114`
`113`	`115`	`void`
`114`	`116`	`JsonbToJsonbValue(Jsonbjsonb,JsonbValueval)`
`@@ -139,17 +141,7 @@ JsonbValueToJsonb(JsonbValue *val)`
`139`	`141`	`{`
`140`	`142`	`/* Scalar value */`
`141`	`143`	`JsonbParseState*pstate=NULL;`
`142`		`-JsonbValue*res;`
`143`		`-JsonbValuescalarArray;`
`144`		`-`
`145`		`-scalarArray.type=jbvArray;`
`146`		`-scalarArray.val.array.rawScalar= true;`
`147`		`-scalarArray.val.array.nElems=1;`
`148`		`-`
`149`		`-pushJsonbValue(&pstate,WJB_BEGIN_ARRAY,&scalarArray);`
`150`		`-pushJsonbValue(&pstate,WJB_ELEM,val);`
`151`		`-res=pushJsonbValue(&pstate,WJB_END_ARRAY,NULL);`
`152`		`-`
	`144`	`+JsonbValue*res=pushSingleScalarJsonbValue(&pstate,val);`
`153`	`145`	`out=convertToJsonb(res);`
`154`	`146`	`}`
`155`	`147`	`elseif (val->type==jbvObject\|\|val->type==jbvArray)`

Comments

(0)