Optimize JsonToJsonValue() for jsonv containers

Nikita Glukhov · Nikita Glukhov · commit f13f1fdcfd51 · 2020-12-07T19:31:05.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));
 
@@ -741,9 +744,8 @@ jsonFlatten(Json *json)
 		}
 		else
 		{
-			JsonValue val;
-			JsonToJsonValue(json, &val);
-			return JsonValueToJsonb(&val);
+			JsonValue	val;
+			return JsonValueToJsonb(JsonToJsonValue(json, &val));
 		}
 	}
 #endif
diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c
@@ -911,11 +911,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`
`@@ -741,9 +744,8 @@ jsonFlatten(Json *json)`
`741`	`744`	`}`
`742`	`745`	`else`
`743`	`746`	`{`
`744`		`- JsonValue val;`
`745`		`- JsonToJsonValue(json, &val);`
`746`		`- return JsonValueToJsonb(&val);`
	`747`	`+ JsonValue val;`
	`748`	`+ return JsonValueToJsonb(JsonToJsonValue(json, &val));`
`747`	`749`	`}`
`748`	`750`	`}`
`749`	`751`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -911,11 +911,11 @@ datum_to_jsonb(Datum val, bool is_null, JsonbInState *result,`
`911`	`911`	`{`
`912`	`912`	`JsonbIteratorToken type;`
`913`	`913`
`914`		`- JsonToJsonValue(jsonb, &jb);`
`915`	`914`
`916`	`915`	`if (result->parseState)`
`917`	`916`	`{`
`918`		`- pushScalarJsonbValue(&result->parseState, &jb,`
	`917`	`+ pushScalarJsonbValue(&result->parseState,`
	`918`	`+ JsonToJsonValue(jsonb, &jb),`
`919`	`919`	`false, false);`
`920`	`920`	`return;`
`921`	`921`	`}`