Commitf8d860b

Nikita Glukhov

committed

Add JsonContainerAlloc() macro

1 parentf9bed84 commitf8d860bCopy full SHA for f8d860b

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ JsonValueToContainer(const JsonValue *val)`
`248`	`248`	`returnval->val.binary.data;`
`249`	`249`	`else`
`250`	`250`	`{`
`251`		`-JsonContainerData*jc=palloc(sizeof(JsonContainerData));`
	`251`	`+JsonContainerData*jc=JsonContainerAlloc();`
`252`	`252`	`jsonvInitContainer(jc,val);`
`253`	`253`	`returnjc;`
`254`	`254`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -639,7 +639,7 @@ fillJsonbValue(const JsonbContainer *container, int index,`
`639`	`639`	`{`
`640`	`640`	`Assert(JBE_ISCONTAINER(entry));`
`641`	`641`	`result->type=jbvBinary;`
`642`		`-result->val.binary.data=palloc(sizeof(JsonContainerData));`
	`642`	`+result->val.binary.data=JsonContainerAlloc();`
`643`	`643`	`jsonbInitContainer((JsonContainerData*)result->val.binary.data,`
`644`	`644`	`/* Remove alignment padding from data pointer and length */`
`645`	`645`	`(JsonbContainer*)(base_addr+INTALIGN(offset)),`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -226,6 +226,9 @@ extern Json DatumGetJson(Datum val, JsonContainerOps ops, Json *tmp);`
`226`	`226`	`externvoidJsonFree(Json*json);`
`227`	`227`	`externJsonJsonCopyTemporary(Jsontmp);`
`228`	`228`
	`229`	`+#defineJsonContainerAlloc() \`
	`230`	`+((JsonContainerData *) palloc(sizeof(JsonContainerData)))`
	`231`	`+`
`229`	`232`	`externJsonValueJsonFindValueInContainer(JsonContainerjson,uint32flags,`
`230`	`233`	`JsonValue*key);`
`231`	`234`

Comments

(0)