Optimize JsonToJsonValue() for jsonv containers

Nikita Glukhov · Nikita Glukhov · commit a87ec4074317 · 2017-05-02T21:38:29.000+03:00
diff --git a/src/backend/utils/adt/json_generic.c b/src/backend/utils/adt/json_generic.c
@@ -557,6 +557,9 @@ jsonvContainerOps =
 JsonValue *
 JsonToJsonValue(Json *json, JsonValue *jv)
 {
+	if (JsonRoot(json)->ops == &jsonvContainerOps)
+		return (JsonValue *) JsonRoot(json)->data;
+
 	if (!jv)
 		jv = palloc(sizeof(JsonValue));
 
@@ -766,9 +769,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
@@ -903,11 +903,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
`@@ -557,6 +557,9 @@ jsonvContainerOps =`
`557`	`557`	`JsonValue *`
`558`	`558`	`JsonToJsonValue(Json json, JsonValue jv)`
`559`	`559`	`{`
	`560`	`+ if (JsonRoot(json)->ops == &jsonvContainerOps)`
	`561`	`+ return (JsonValue *) JsonRoot(json)->data;`
	`562`	`+`
`560`	`563`	`if (!jv)`
`561`	`564`	`jv = palloc(sizeof(JsonValue));`
`562`	`565`
`@@ -766,9 +769,8 @@ jsonFlatten(Json *json)`
`766`	`769`	`}`
`767`	`770`	`else`
`768`	`771`	`{`
`769`		`- JsonValue val;`
`770`		`- JsonToJsonValue(json, &val);`
`771`		`- return JsonValueToJsonb(&val);`
	`772`	`+ JsonValue val;`
	`773`	`+ return JsonValueToJsonb(JsonToJsonValue(json, &val));`
`772`	`774`	`}`
`773`	`775`	`}`
`774`	`776`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -903,11 +903,11 @@ datum_to_jsonb(Datum val, bool is_null, JsonbInState *result,`
`903`	`903`	`{`
`904`	`904`	`JsonbIteratorToken type;`
`905`	`905`
`906`		`- JsonToJsonValue(jsonb, &jb);`
`907`	`906`
`908`	`907`	`if (result->parseState)`
`909`	`908`	`{`
`910`		`- pushScalarJsonbValue(&result->parseState, &jb,`
	`909`	`+ pushScalarJsonbValue(&result->parseState,`
	`910`	`+ JsonToJsonValue(jsonb, &jb),`
`911`	`911`	`false, false);`
`912`	`912`	`return;`
`913`	`913`	`}`