Add context to JsonValueFlatten()

Nikita Glukhov · Nikita Glukhov · commit 8e9a0cf35bcc · 2022-07-27T00:46:13.000+03:00
diff --git a/src/backend/utils/adt/jsonb_util.c b/src/backend/utils/adt/jsonb_util.c
@@ -165,7 +165,7 @@ JsonContainerFlatten(JsonContainer *jc, JsonValueEncoder encoder,
  */
 void *
 JsonValueFlatten(const JsonValue *val, JsonValueEncoder encoder,
-				 JsonContainerOps *ops)
+				 JsonContainerOps *ops, void *cxt)
 {
 	if (val->type == jbvBinary)
 		return JsonContainerFlatten(val->val.binary.data, encoder, ops, val);
@@ -180,7 +180,7 @@ JsonValueFlatten(const JsonValue *val, JsonValueEncoder encoder,
 		Assert(val->type == jbvObject || val->type == jbvArray);
 	}
 
-	return JsonEncode(val, encoder, NULL);
+	return JsonEncode(val, encoder, cxt);
 }
 
 /*
diff --git a/src/include/utils/json_generic.h b/src/include/utils/json_generic.h
@@ -92,7 +92,7 @@ typedef JsonContainer JsonbContainer;
 		PointerGetDatum(JsonFlatten(json, JsonbEncode, &jsonbContainerOps))
 
 #define JsonValueToJsonbDatum(jv) \
-	PointerGetDatum(JsonValueFlatten(jv, JsonbEncode, &jsonbContainerOps))
+	PointerGetDatum(JsonValueFlatten(jv, JsonbEncode, &jsonbContainerOps, NULL))
 
 #define JsonbPGetDatum(json)		JsonFlattenToJsonbDatum(json)
 
@@ -294,7 +294,7 @@ extern void *JsonContainerFlatten(JsonContainer *jc, JsonValueEncoder encoder,
 								  JsonContainerOps *ops, const JsonValue *binary);
 
 extern void *JsonValueFlatten(const JsonValue *val, JsonValueEncoder encoder,
-							  JsonContainerOps *ops);
+							  JsonContainerOps *ops, void *cxt);
 extern void *JsonEncode(const JsonbValue *val, JsonValueEncoder encoder, void *cxt);
 
 static inline void *
@@ -306,7 +306,7 @@ JsonFlatten(Json *json, JsonValueEncoder encoder, JsonContainerOps *ops)
 extern void JsonbEncode(StringInfo, const JsonValue *, void *cxt);
 
 #define JsonValueToJsonb(val) \
-		JsonValueFlatten(val, JsonbEncode, &jsonbContainerOps)
+		JsonValueFlatten(val, JsonbEncode, &jsonbContainerOps, NULL)
 
 extern int lengthCompareJsonbStringValue(const void *a, const void *b);
 extern int lengthCompareJsonbString(const char *val1, int len1,

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ JsonContainerFlatten(JsonContainer *jc, JsonValueEncoder encoder,`
`165`	`165`	`*/`
`166`	`166`	`void *`
`167`	`167`	`JsonValueFlatten(const JsonValue *val, JsonValueEncoder encoder,`
`168`		`- JsonContainerOps *ops)`
	`168`	`+ JsonContainerOps ops, void cxt)`
`169`	`169`	`{`
`170`	`170`	`if (val->type == jbvBinary)`
`171`	`171`	`return JsonContainerFlatten(val->val.binary.data, encoder, ops, val);`
`@@ -180,7 +180,7 @@ JsonValueFlatten(const JsonValue *val, JsonValueEncoder encoder,`
`180`	`180`	`Assert(val->type == jbvObject \|\| val->type == jbvArray);`
`181`	`181`	`}`
`182`	`182`
`183`		`- return JsonEncode(val, encoder, NULL);`
	`183`	`+ return JsonEncode(val, encoder, cxt);`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`/*`