Commit9429f3f

Nikita Glukhov

committed

Return back JsonInit()

This reverts commit 7fbff1afd2632039d28122cd852001957884134e.

1 parente133dea commit9429f3fCopy full SHA for 9429f3f

File tree

+18

-0

lines changed

+18

-0

lines changed

Lines changed: 18 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,24 @@ JsonToJsonValue(Json json, JsonValue jv)`
`69`	`69`	`returnJsonValueInitBinary(jv,&json->root);`
`70`	`70`	`}`
`71`	`71`
	`72`	`+staticvoid`
	`73`	`+JsonInit(Json*json)`
	`74`	`+{`
	`75`	`+constvoid*data=DatumGetPointer(json->obj.value);`
	`76`	`+structvarlena*detoasted_data;`
	`77`	`+`
	`78`	`+Assert(JsonContainerDataPtr(&json->root)\|\|data);`
	`79`	`+`
	`80`	`+if (JsonContainerDataPtr(&json->root)\|\| !data)/* FIXME */`
	`81`	`+return;`
	`82`	`+`
	`83`	`+detoasted_data=PG_DETOAST_DATUM(json->obj.value);`
	`84`	`+json->obj.value=PointerGetDatum(detoasted_data);`
	`85`	`+json->obj.freeValue \|=data!=detoasted_data;`
	`86`	`+`
	`87`	`+json->root.ops->init(&json->root,json->obj.value);`
	`88`	`+}`
	`89`	`+`
`72`	`90`	`staticJson*`
`73`	`91`	`JsonExpand(Jsontmp,Datumvalue,boolfreeValue,JsonContainerOpsops)`
`74`	`92`	`{`

Comments

(0)