Add JsonContainerAlloc() macro

Nikita Glukhov · Nikita Glukhov · commit f94e8c612d64 · 2017-05-02T21:38:29.000+03:00
diff --git a/src/backend/utils/adt/json.c b/src/backend/utils/adt/json.c
@@ -2767,8 +2767,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/backend/utils/adt/json_generic.c b/src/backend/utils/adt/json_generic.c
@@ -171,7 +171,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
@@ -614,7 +614,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
@@ -227,6 +227,9 @@ JsonIteratorNext(JsonIterator **it, JsonValue *val, bool skipNested)
 extern Json *DatumGetJson(Datum val, JsonContainerOps *ops,
 						  CompressionOptions options);
 
+#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
`@@ -2767,8 +2767,7 @@ jsontFillValue(JsonIterator *pit, JsonValue res, bool skipNested,`
`2767`	`2767`
`2768`	`2768`	`res->type = jbvBinary;`
`2769`	`2769`	`res->val.binary.len = 0;`
`2770`		`- res->val.binary.data = (JsonContainer *)`
`2771`		`- palloc(sizeof(JsonContainer));`
	`2770`	`+ res->val.binary.data = JsonContainerAlloc();`
`2772`	`2771`
`2773`	`2772`	`if (skipNested)`
`2774`	`2773`	`{`
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ JsonValueToContainer(const JsonValue *val)`
`171`	`171`	`return val->val.binary.data;`
`172`	`172`	`else`
`173`	`173`	`{`
`174`		`- JsonContainerData *jc = palloc(sizeof(JsonContainerData));`
	`174`	`+ JsonContainerData *jc = JsonContainerAlloc();`
`175`	`175`	`jsonvInitContainer(jc, val);`
`176`	`176`	`return jc;`
`177`	`177`	`}`
Original file line number	Diff line number	Diff line change
`@@ -614,7 +614,7 @@ fillJsonbValue(const JsonbContainer *container, int index,`
`614`	`614`	`{`
`615`	`615`	`Assert(JBE_ISCONTAINER(entry));`
`616`	`616`	`result->type = jbvBinary;`
`617`		`- result->val.binary.data = palloc(sizeof(JsonContainerData));`
	`617`	`+ result->val.binary.data = JsonContainerAlloc();`
`618`	`618`	`jsonbInitContainer((JsonContainerData *) result->val.binary.data,`
`619`	`619`	`/* Remove alignment padding from data pointer and length */`
`620`	`620`	`(JsonbContainer *)(base_addr + INTALIGN(offset)),`