Optimize JsonToJsonValue() for jsonv containers

Nikita Glukhov · Nikita Glukhov · commit 8ea2d2b30aa2 · 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
@@ -562,6 +562,9 @@ jsonvContainerOps =
 JsonValue *
 JsonToJsonValue(Json *json, JsonValue *jv)
 {
+	if (JsonRoot(json)->ops == &jsonvContainerOps)
+		return (JsonValue *) JsonRoot(json)->data;
+
 	if (!jv)
 		jv = palloc(sizeof(JsonValue));
 
diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c
@@ -862,11 +862,11 @@ datum_to_jsonb(Datum val, bool is_null, JsonbInState *result,
 					{
 						JsonbIteratorToken type;
 
-						JsonToJsonValue(jsonb, &jb);
 
 						if (result->parseState)
 						{
-							pushScalarJsonbValue(&result->parseState, &jb,
+							pushScalarJsonbValue(&result->parseState,
+												 JsonToJsonValue(jsonb, &jb),
 												 false, false);
 							return;
 						}

Original file line number	Diff line number	Diff line change
`@@ -562,6 +562,9 @@ jsonvContainerOps =`
`562`	`562`	`JsonValue *`
`563`	`563`	`JsonToJsonValue(Json json, JsonValue jv)`
`564`	`564`	`{`
	`565`	`+ if (JsonRoot(json)->ops == &jsonvContainerOps)`
	`566`	`+ return (JsonValue *) JsonRoot(json)->data;`
	`567`	`+`
`565`	`568`	`if (!jv)`
`566`	`569`	`jv = palloc(sizeof(JsonValue));`
`567`	`570`
Original file line number	Diff line number	Diff line change
`@@ -862,11 +862,11 @@ datum_to_jsonb(Datum val, bool is_null, JsonbInState *result,`
`862`	`862`	`{`
`863`	`863`	`JsonbIteratorToken type;`
`864`	`864`
`865`		`- JsonToJsonValue(jsonb, &jb);`
`866`	`865`
`867`	`866`	`if (result->parseState)`
`868`	`867`	`{`
`869`		`- pushScalarJsonbValue(&result->parseState, &jb,`
	`868`	`+ pushScalarJsonbValue(&result->parseState,`
	`869`	`+ JsonToJsonValue(jsonb, &jb),`
`870`	`870`	`false, false);`
`871`	`871`	`return;`
`872`	`872`	`}`