Add JsonContainerFree()

Nikita Glukhov · Nikita Glukhov · commit e46e50f5c455 · 2022-07-27T00:46:13.000+03:00
diff --git a/src/backend/utils/adt/json_generic.c b/src/backend/utils/adt/json_generic.c
@@ -130,6 +130,8 @@ DatumGetJson(Datum value, JsonContainerOps *ops, Json *tmp)
 void
 JsonFree(Json *json)
 {
+	JsonContainerFree(&json->root);
+
 	if (json->obj.freeValue)
 		pfree(DatumGetPointer(json->obj.value));
 
diff --git a/src/backend/utils/adt/jsonb_util.c b/src/backend/utils/adt/jsonb_util.c
@@ -2229,4 +2229,5 @@ jsonbContainerOps =
 	NULL,
 	JsonbToCStringRaw,
 	JsonCopyFlat,
+	NULL,
 };
diff --git a/src/include/utils/json_generic.h b/src/include/utils/json_generic.h
@@ -62,6 +62,7 @@ struct JsonContainerOps
 	char		   *(*toString)(StringInfo out, JsonContainer *jc,
 								int estimated_len);
 	JsonContainer  *(*copy)(JsonContainer *jc);
+	void		   *(*free)(JsonContainer *jc);
 };
 
 typedef struct CompressedObject
@@ -164,6 +165,12 @@ typedef JsonContainer JsonbContainer;
 #define JsonCopy(jscontainer) \
 		JsonOp0(copy, jscontainer)
 
+#define	JsonContainerFree(jc) do { \
+		if ((jc)->ops->free) \
+			(jc)->ops->free(jc); \
+	} while (0)
+
+
 static inline JsonIteratorToken
 JsonIteratorNext(JsonIterator **it, JsonValue *val, bool skipNested)
 {

Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,8 @@ DatumGetJson(Datum value, JsonContainerOps ops, Json tmp)`
`130`	`130`	`void`
`131`	`131`	`JsonFree(Json *json)`
`132`	`132`	`{`
	`133`	`+ JsonContainerFree(&json->root);`
	`134`	`+`
`133`	`135`	`if (json->obj.freeValue)`
`134`	`136`	`pfree(DatumGetPointer(json->obj.value));`
`135`	`137`