Add JsonContainerAlloc() macro

Nikita Glukhov · Nikita Glukhov · commit f8d860b57425 · 2022-07-27T00:46:12.000+03:00
diff --git a/src/backend/utils/adt/json_generic.c b/src/backend/utils/adt/json_generic.c
@@ -248,7 +248,7 @@ JsonValueToContainer(const JsonValue *val)
 		return val->val.binary.data;
 	else
 	{
-		JsonContainerData *jc = palloc(sizeof(JsonContainerData));
+		JsonContainerData *jc = JsonContainerAlloc();
 		jsonvInitContainer(jc, val);
 		return jc;
 	}
diff --git a/src/backend/utils/adt/jsonb_util.c b/src/backend/utils/adt/jsonb_util.c
@@ -639,7 +639,7 @@ fillJsonbValue(const JsonbContainer *container, int index,
 	{
 		Assert(JBE_ISCONTAINER(entry));
 		result->type = jbvBinary;
-		result->val.binary.data = palloc(sizeof(JsonContainerData));
+		result->val.binary.data = JsonContainerAlloc();
 		jsonbInitContainer((JsonContainerData *) result->val.binary.data,
 				/* Remove alignment padding from data pointer and length */
 						   (JsonbContainer *)(base_addr + INTALIGN(offset)),
diff --git a/src/include/utils/json_generic.h b/src/include/utils/json_generic.h
@@ -226,6 +226,9 @@ extern Json *DatumGetJson(Datum val, JsonContainerOps *ops, Json *tmp);
 extern void JsonFree(Json *json);
 extern Json *JsonCopyTemporary(Json *tmp);
 
+#define JsonContainerAlloc() \
+	((JsonContainerData *) palloc(sizeof(JsonContainerData)))
+
 extern JsonValue *JsonFindValueInContainer(JsonContainer *json, uint32 flags,
 										   JsonValue *key);
 

Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ JsonValueToContainer(const JsonValue *val)`
`248`	`248`	`return val->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`	`return jc;`
`254`	`254`	`}`
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)),`