Add JsonContainerAlloc() macro

Nikita Glukhov · Nikita Glukhov · commit 7b9c90f5f3d9 · 2020-12-07T19:31:04.000+03:00
diff --git a/src/backend/utils/adt/json_generic.c b/src/backend/utils/adt/json_generic.c
@@ -173,7 +173,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
@@ -642,7 +642,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/common/jsonapi.c b/src/common/jsonapi.c
@@ -1334,8 +1334,7 @@ jsontFillValue(JsonIterator **pit, JsonValue *res, bool skipNested,
 
 			res->type = jbvBinary;
 			res->val.binary.len = 0;
-			res->val.binary.data = (JsonContainer *)
-							palloc(sizeof(JsonContainer));
+			res->val.binary.data = JsonContainerAlloc();
 
 			if (skipNested)
 			{
diff --git a/src/include/utils/json_generic.h b/src/include/utils/json_generic.h
@@ -249,6 +249,9 @@ JsonIteratorNext(JsonIterator **it, JsonValue *val, bool skipNested)
 
 extern Json *DatumGetJson(Datum value, JsonContainerOps *ops);
 
+#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
`@@ -173,7 +173,7 @@ JsonValueToContainer(const JsonValue *val)`
`173`	`173`	`return val->val.binary.data;`
`174`	`174`	`else`
`175`	`175`	`{`
`176`		`- JsonContainerData *jc = palloc(sizeof(JsonContainerData));`
	`176`	`+ JsonContainerData *jc = JsonContainerAlloc();`
`177`	`177`	`jsonvInitContainer(jc, val);`
`178`	`178`	`return jc;`
`179`	`179`	`}`
Original file line number	Diff line number	Diff line change
`@@ -642,7 +642,7 @@ fillJsonbValue(const JsonbContainer *container, int index,`
`642`	`642`	`{`
`643`	`643`	`Assert(JBE_ISCONTAINER(entry));`
`644`	`644`	`result->type = jbvBinary;`
`645`		`- result->val.binary.data = palloc(sizeof(JsonContainerData));`
	`645`	`+ result->val.binary.data = JsonContainerAlloc();`
`646`	`646`	`jsonbInitContainer((JsonContainerData *) result->val.binary.data,`
`647`	`647`	`/* Remove alignment padding from data pointer and length */`
`648`	`648`	`(JsonbContainer *)(base_addr + INTALIGN(offset)),`
Original file line number	Diff line number	Diff line change
`@@ -1334,8 +1334,7 @@ jsontFillValue(JsonIterator *pit, JsonValue res, bool skipNested,`
`1334`	`1334`
`1335`	`1335`	`res->type = jbvBinary;`
`1336`	`1336`	`res->val.binary.len = 0;`
`1337`		`- res->val.binary.data = (JsonContainer *)`
`1338`		`- palloc(sizeof(JsonContainer));`
	`1337`	`+ res->val.binary.data = JsonContainerAlloc();`
`1339`	`1338`
`1340`	`1339`	`if (skipNested)`
`1341`	`1340`	`{`