Optimize jsonb returning using PG_RETURN_JSONB_VALUE_P()

Nikita Glukhov · Nikita Glukhov · commit 3874abf04989 · 2022-07-27T00:46:13.000+03:00
diff --git a/contrib/hstore/hstore_io.c b/contrib/hstore/hstore_io.c
@@ -1413,7 +1413,7 @@ hstore_to_jsonb(PG_FUNCTION_ARGS)
 
 	res = pushJsonbValue(&state, WJB_END_OBJECT, NULL);
 
-	PG_RETURN_JSONB_P(JsonbValueToJsonb(res));
+	PG_RETURN_JSONB_VALUE_P(res);
 }
 
 PG_FUNCTION_INFO_V1(hstore_to_jsonb_loose);
@@ -1489,5 +1489,5 @@ hstore_to_jsonb_loose(PG_FUNCTION_ARGS)
 
 	res = pushJsonbValue(&state, WJB_END_OBJECT, NULL);
 
-	PG_RETURN_JSONB_P(JsonbValueToJsonb(res));
+	PG_RETURN_JSONB_VALUE_P(res);
 }
diff --git a/contrib/jsonb_plperl/jsonb_plperl.c b/contrib/jsonb_plperl/jsonb_plperl.c
@@ -290,7 +290,6 @@ plperl_to_jsonb(PG_FUNCTION_ARGS)
 	JsonbParseState *jsonb_state = NULL;
 	SV		   *in = (SV *) PG_GETARG_POINTER(0);
 	JsonbValue *out = SV_to_JsonbValue(in, &jsonb_state, true);
-	Jsonb	   *result = JsonbValueToJsonb(out);
 
-	PG_RETURN_JSONB_P(result);
+	PG_RETURN_JSONB_VALUE_P(out);
 }
diff --git a/contrib/jsonb_plpython/jsonb_plpython.c b/contrib/jsonb_plpython/jsonb_plpython.c
@@ -461,7 +461,7 @@ plpython_to_jsonb(PG_FUNCTION_ARGS)
 
 	obj = (PyObject *) PG_GETARG_POINTER(0);
 	out = PLyObject_ToJsonbValue(obj, &jsonb_state, true);
-	PG_RETURN_JSONB_P(JsonbValueToJsonb(out));
+	PG_RETURN_JSONB_VALUE_P(out);
 }
 
 /*
diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c
@@ -268,7 +268,7 @@ JsonValueFromCString(char *json, int len, bool unique_keys)
 static inline Datum
 jsonb_from_cstring(char *json, int len, bool unique_keys)
 {
-	PG_RETURN_JSONB_P(JsonbValueToJsonb(JsonValueFromCString(json, len, unique_keys)));
+	PG_RETURN_JSONB_VALUE_P(JsonValueFromCString(json, len, unique_keys));
 }
 
 static void
@@ -1074,16 +1074,22 @@ add_jsonb(Datum val, bool is_null, JsonbInState *result,
 	datum_to_jsonb(val, is_null, result, tcategory, outfuncoid, key_scalar);
 }
 
-Datum
-to_jsonb_worker(Datum val, JsonbTypeCategory tcategory, Oid outfuncoid)
+static JsonbValue *
+to_jsonb_worker_internal(Datum val, JsonbTypeCategory tcategory, Oid outfuncoid)
 {
 	JsonbInState result;
 
 	memset(&result, 0, sizeof(JsonbInState));
 
 	datum_to_jsonb(val, false, &result, tcategory, outfuncoid, false);
 
-	return JsonbPGetDatum(JsonbValueToJsonb(result.res));
+	return result.res;
+}
+
+Datum
+to_jsonb_worker(Datum val, JsonbTypeCategory tcategory, Oid outfuncoid)
+{
+	return JsonValueToJsonbDatum(to_jsonb_worker_internal(val, tcategory, outfuncoid));
 }
 
 bool
@@ -1138,12 +1144,13 @@ to_jsonb(PG_FUNCTION_ARGS)
 	jsonb_categorize_type(val_type,
 						  &tcategory, &outfuncoid);
 
-	PG_RETURN_DATUM(to_jsonb_worker(val, tcategory, outfuncoid));
+	PG_RETURN_JSONB_VALUE_P(to_jsonb_worker_internal(val, tcategory, outfuncoid));
 }
 
-Datum
-jsonb_build_object_worker(int nargs, Datum *args, bool *nulls, Oid *types,
-						  bool absent_on_null, bool unique_keys)
+static JsonbValue *
+jsonb_build_object_worker_internal(int nargs, Datum *args,
+								   bool *nulls, Oid *types,
+								   bool absent_on_null, bool unique_keys)
 {
 	int			i;
 	JsonbInState result;
@@ -1186,9 +1193,19 @@ jsonb_build_object_worker(int nargs, Datum *args, bool *nulls, Oid *types,
 		add_jsonb(args[i + 1], nulls[i + 1], &result, types[i + 1], false);
 	}
 
-	result.res = pushJsonbValue(&result.parseState, WJB_END_OBJECT, NULL);
+	return pushJsonbValue(&result.parseState, WJB_END_OBJECT, NULL);
+}
+
+Datum
+jsonb_build_object_worker(int nargs, Datum *args, bool *nulls, Oid *types,
+						  bool absent_on_null, bool unique_keys)
+{
+	JsonbValue *res = jsonb_build_object_worker_internal(nargs, args,
+														 nulls, types,
+														 absent_on_null,
+														 unique_keys);
 
-	return JsonbPGetDatum(JsonbValueToJsonb(result.res));
+	return JsonValueToJsonbDatum(res);
 }
 
 /*
@@ -1208,7 +1225,8 @@ jsonb_build_object(PG_FUNCTION_ARGS)
 	if (nargs < 0)
 		PG_RETURN_NULL();
 
-	PG_RETURN_DATUM(jsonb_build_object_worker(nargs, args, nulls, types, false, false));
+	PG_RETURN_JSONB_VALUE_P(
+		jsonb_build_object_worker_internal(nargs, args, nulls, types, false, false));
 }
 
 /*
@@ -1224,12 +1242,13 @@ jsonb_build_object_noargs(PG_FUNCTION_ARGS)
 	(void) pushJsonbValue(&result.parseState, WJB_BEGIN_OBJECT, NULL);
 	result.res = pushJsonbValue(&result.parseState, WJB_END_OBJECT, NULL);
 
-	PG_RETURN_JSONB_P(JsonbValueToJsonb(result.res));
+	PG_RETURN_JSONB_VALUE_P(result.res);
 }
 
-Datum
-jsonb_build_array_worker(int nargs, Datum *args, bool *nulls, Oid *types,
-						 bool absent_on_null)
+static JsonbValue *
+jsonb_build_array_worker_internal(int nargs, Datum *args,
+								  bool *nulls, Oid *types,
+								  bool absent_on_null)
 {
 	int			i;
 	JsonbInState result;
@@ -1246,9 +1265,18 @@ jsonb_build_array_worker(int nargs, Datum *args, bool *nulls, Oid *types,
 		add_jsonb(args[i], nulls[i], &result, types[i], false);
 	}
 
-	result.res = pushJsonbValue(&result.parseState, WJB_END_ARRAY, NULL);
+	return pushJsonbValue(&result.parseState, WJB_END_ARRAY, NULL);
+}
 
-	return JsonbPGetDatum(JsonbValueToJsonb(result.res));
+Datum
+jsonb_build_array_worker(int nargs, Datum *args, bool *nulls, Oid *types,
+						 bool absent_on_null)
+{
+	JsonbValue *res = jsonb_build_array_worker_internal(nargs, args,
+														nulls, types,
+														absent_on_null);
+
+	return JsonValueToJsonbDatum(res);
 }
 
 /*
@@ -1268,10 +1296,10 @@ jsonb_build_array(PG_FUNCTION_ARGS)
 	if (nargs < 0)
 		PG_RETURN_NULL();
 
-	PG_RETURN_DATUM(jsonb_build_array_worker(nargs, args, nulls, types, false));
+	PG_RETURN_JSONB_VALUE_P(
+		jsonb_build_array_worker_internal(nargs, args, nulls, types, false));
 }
 
-
 /*
  * degenerate case of jsonb_build_array where it gets 0 arguments.
  */
@@ -1285,7 +1313,7 @@ jsonb_build_array_noargs(PG_FUNCTION_ARGS)
 	(void) pushJsonbValue(&result.parseState, WJB_BEGIN_ARRAY, NULL);
 	result.res = pushJsonbValue(&result.parseState, WJB_END_ARRAY, NULL);
 
-	PG_RETURN_JSONB_P(JsonbValueToJsonb(result.res));
+	PG_RETURN_JSONB_VALUE_P(result.res);
 }
 
 
@@ -1387,7 +1415,7 @@ jsonb_object(PG_FUNCTION_ARGS)
 close_object:
 	result.res = pushJsonbValue(&result.parseState, WJB_END_OBJECT, NULL);
 
-	PG_RETURN_JSONB_P(JsonbValueToJsonb(result.res));
+	PG_RETURN_JSONB_VALUE_P(result.res);
 }
 
 /*
@@ -1479,7 +1507,7 @@ jsonb_object_two_arg(PG_FUNCTION_ARGS)
 close_object:
 	result.res = pushJsonbValue(&result.parseState, WJB_END_OBJECT, NULL);
 
-	PG_RETURN_JSONB_P(JsonbValueToJsonb(result.res));
+	PG_RETURN_JSONB_VALUE_P(result.res);
 }
 
 static Datum
@@ -1626,7 +1654,6 @@ jsonb_agg_finalfn(PG_FUNCTION_ARGS)
 {
 	JsonbAggState *arg;
 	JsonbInState result;
-	Jsonb	   *out;
 
 	/* cannot be called directly because of internal-type argument */
 	Assert(AggCheckCallContext(fcinfo, NULL));
@@ -1648,9 +1675,7 @@ jsonb_agg_finalfn(PG_FUNCTION_ARGS)
 	result.res = pushJsonbValue(&result.parseState,
 								WJB_END_ARRAY, NULL);
 
-	out = JsonbValueToJsonb(result.res);
-
-	PG_RETURN_JSONB_P(out);
+	PG_RETURN_JSONB_VALUE_P(result.res);
 }
 
 static Datum
@@ -1916,7 +1941,6 @@ jsonb_object_agg_finalfn(PG_FUNCTION_ARGS)
 {
 	JsonbAggState *arg;
 	JsonbInState result;
-	Jsonb	   *out;
 
 	/* cannot be called directly because of internal-type argument */
 	Assert(AggCheckCallContext(fcinfo, NULL));
@@ -1939,9 +1963,7 @@ jsonb_object_agg_finalfn(PG_FUNCTION_ARGS)
 	result.res = pushJsonbValue(&result.parseState,
 								WJB_END_OBJECT, NULL);
 
-	out = JsonbValueToJsonb(result.res);
-
-	PG_RETURN_JSONB_P(out);
+	PG_RETURN_JSONB_VALUE_P(result.res);
 }
 
 
diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c
@@ -832,7 +832,7 @@ jsonb_object_field(PG_FUNCTION_ARGS)
 									 &vbuf);
 
 	if (v != NULL)
-		PG_RETURN_JSONB_P(JsonbValueToJsonb(v));
+		PG_RETURN_JSONB_VALUE_P(v);
 
 	PG_RETURN_NULL();
 }
@@ -913,7 +913,7 @@ jsonb_array_element(PG_FUNCTION_ARGS)
 
 	v = getIthJsonbValueFromContainer(JsonbRoot(jb), element);
 	if (v != NULL)
-		PG_RETURN_JSONB_P(JsonbValueToJsonb(v));
+		PG_RETURN_JSONB_VALUE_P(v);
 
 	PG_RETURN_NULL();
 }
@@ -1607,10 +1607,8 @@ jsonb_get_element(Jsonb *jb, Datum *path, int npath, bool *isnull, bool as_text)
 	}
 	else
 	{
-		Jsonb	   *res = JsonbValueToJsonb(jbvp);
-
 		/* not text mode - just hand back the jsonb */
-		PG_RETURN_JSONB_P(res);
+		PG_RETURN_JSONB_VALUE_P(jbvp);
 	}
 }
 
@@ -1634,7 +1632,7 @@ jsonb_set_element(Jsonb *jb, Datum *path, int path_len,
 
 	pfree(path_nulls);
 
-	PG_RETURN_JSONB_P(JsonbValueToJsonb(res));
+	PG_RETURN_JSONB_VALUE_P(res);
 }
 
 static void
@@ -1970,9 +1968,7 @@ each_worker_jsonb(FunctionCallInfo fcinfo, const char *funcname, bool as_text)
 			else
 			{
 				/* Not in text mode, just return the Jsonb */
-				Jsonb	   *val = JsonbValueToJsonb(&v);
-
-				values[1] = JsonbPGetDatum(val);
+				values[1] = JsonValueToJsonbDatum(&v);
 			}
 
 			tuplestore_putvalues(rsi->setResult, rsi->setDesc, values, nulls);
@@ -2202,9 +2198,7 @@ elements_worker_jsonb(FunctionCallInfo fcinfo, const char *funcname,
 			else
 			{
 				/* Not in text mode, just return the Jsonb */
-				Jsonb	   *val = JsonbValueToJsonb(&v);
-
-				values[0] = JsonbPGetDatum(val);
+				values[0] = JsonValueToJsonbDatum(&v);
 			}
 
 			tuplestore_putvalues(rsi->setResult, rsi->setDesc, values, nulls);
@@ -2917,11 +2911,7 @@ populate_scalar(ScalarIOData *io, Oid typid, int32 typmod, JsValue *jsv)
 		JsonbValue *jbv = jsv->val.jsonb;
 
 		if (typid == JSONBOID)
-		{
-			Jsonb	   *jsonb = JsonbValueToJsonb(jbv); /* directly use jsonb */
-
-			return JsonbPGetDatum(jsonb);
-		}
+			return JsonValueToJsonbDatum(jbv); /* directly use jsonb */
 		/* convert jsonb to string for typio call */
 		else if (typid == JSONOID && jbv->type != jbvBinary)
 		{
@@ -4223,7 +4213,7 @@ jsonb_strip_nulls(PG_FUNCTION_ARGS)
 
 	Assert(res != NULL);
 
-	PG_RETURN_JSONB_P(JsonbValueToJsonb(res));
+	PG_RETURN_JSONB_VALUE_P(res);
 }
 
 /*
@@ -4278,7 +4268,7 @@ jsonb_concat(PG_FUNCTION_ARGS)
 
 	Assert(res != NULL);
 
-	PG_RETURN_JSONB_P(JsonbValueToJsonb(res));
+	PG_RETURN_JSONB_VALUE_P(res);
 }
 
 
@@ -4332,7 +4322,7 @@ jsonb_delete(PG_FUNCTION_ARGS)
 
 	Assert(res != NULL);
 
-	PG_RETURN_JSONB_P(JsonbValueToJsonb(res));
+	PG_RETURN_JSONB_VALUE_P(res);
 }
 
 /*
@@ -4417,7 +4407,7 @@ jsonb_delete_array(PG_FUNCTION_ARGS)
 
 	Assert(res != NULL);
 
-	PG_RETURN_JSONB_P(JsonbValueToJsonb(res));
+	PG_RETURN_JSONB_VALUE_P(res);
 }
 
 /*
@@ -4485,7 +4475,7 @@ jsonb_delete_idx(PG_FUNCTION_ARGS)
 
 	Assert(res != NULL);
 
-	PG_RETURN_JSONB_P(JsonbValueToJsonb(res));
+	PG_RETURN_JSONB_VALUE_P(res);
 }
 
 /*
@@ -4533,7 +4523,7 @@ jsonb_set(PG_FUNCTION_ARGS)
 
 	Assert(res != NULL);
 
-	PG_RETURN_JSONB_P(JsonbValueToJsonb(res));
+	PG_RETURN_JSONB_VALUE_P(res);
 }
 
 
@@ -4644,7 +4634,7 @@ jsonb_delete_path(PG_FUNCTION_ARGS)
 
 	Assert(res != NULL);
 
-	PG_RETURN_JSONB_P(JsonbValueToJsonb(res));
+	PG_RETURN_JSONB_VALUE_P(res);
 }
 
 /*
@@ -4689,7 +4679,7 @@ jsonb_insert(PG_FUNCTION_ARGS)
 
 	Assert(res != NULL);
 
-	PG_RETURN_JSONB_P(JsonbValueToJsonb(res));
+	PG_RETURN_JSONB_VALUE_P(res);
 }
 
 /*
diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c
diff --git a/src/include/utils/json_generic.h b/src/include/utils/json_generic.h

Original file line number	Diff line number	Diff line change
`@@ -1413,7 +1413,7 @@ hstore_to_jsonb(PG_FUNCTION_ARGS)`
`1413`	`1413`
`1414`	`1414`	`res = pushJsonbValue(&state, WJB_END_OBJECT, NULL);`
`1415`	`1415`
`1416`		`- PG_RETURN_JSONB_P(JsonbValueToJsonb(res));`
	`1416`	`+ PG_RETURN_JSONB_VALUE_P(res);`
`1417`	`1417`	`}`
`1418`	`1418`
`1419`	`1419`	`PG_FUNCTION_INFO_V1(hstore_to_jsonb_loose);`
`@@ -1489,5 +1489,5 @@ hstore_to_jsonb_loose(PG_FUNCTION_ARGS)`
`1489`	`1489`
`1490`	`1490`	`res = pushJsonbValue(&state, WJB_END_OBJECT, NULL);`
`1491`	`1491`
`1492`		`- PG_RETURN_JSONB_P(JsonbValueToJsonb(res));`
	`1492`	`+ PG_RETURN_JSONB_VALUE_P(res);`
`1493`	`1493`	`}`
Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,6 @@ plperl_to_jsonb(PG_FUNCTION_ARGS)`
`290`	`290`	`JsonbParseState *jsonb_state = NULL;`
`291`	`291`	`SV in = (SV ) PG_GETARG_POINTER(0);`
`292`	`292`	`JsonbValue *out = SV_to_JsonbValue(in, &jsonb_state, true);`
`293`		`- Jsonb *result = JsonbValueToJsonb(out);`
`294`	`293`
`295`		`- PG_RETURN_JSONB_P(result);`
	`294`	`+ PG_RETURN_JSONB_VALUE_P(out);`
`296`	`295`	`}`
Original file line number	Diff line number	Diff line change
`@@ -461,7 +461,7 @@ plpython_to_jsonb(PG_FUNCTION_ARGS)`
`461`	`461`
`462`	`462`	`obj = (PyObject *) PG_GETARG_POINTER(0);`
`463`	`463`	`out = PLyObject_ToJsonbValue(obj, &jsonb_state, true);`
`464`		`- PG_RETURN_JSONB_P(JsonbValueToJsonb(out));`
	`464`	`+ PG_RETURN_JSONB_VALUE_P(out);`
`465`	`465`	`}`
`466`	`466`
`467`	`467`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -832,7 +832,7 @@ jsonb_object_field(PG_FUNCTION_ARGS)`
`832`	`832`	`&vbuf);`
`833`	`833`
`834`	`834`	`if (v != NULL)`
`835`		`- PG_RETURN_JSONB_P(JsonbValueToJsonb(v));`
	`835`	`+ PG_RETURN_JSONB_VALUE_P(v);`
`836`	`836`
`837`	`837`	`PG_RETURN_NULL();`
`838`	`838`	`}`
`@@ -913,7 +913,7 @@ jsonb_array_element(PG_FUNCTION_ARGS)`
`913`	`913`
`914`	`914`	`v = getIthJsonbValueFromContainer(JsonbRoot(jb), element);`
`915`	`915`	`if (v != NULL)`
`916`		`- PG_RETURN_JSONB_P(JsonbValueToJsonb(v));`
	`916`	`+ PG_RETURN_JSONB_VALUE_P(v);`
`917`	`917`
`918`	`918`	`PG_RETURN_NULL();`
`919`	`919`	`}`
`@@ -1607,10 +1607,8 @@ jsonb_get_element(Jsonb jb, Datum path, int npath, bool *isnull, bool as_text)`
`1607`	`1607`	`}`
`1608`	`1608`	`else`
`1609`	`1609`	`{`
`1610`		`- Jsonb *res = JsonbValueToJsonb(jbvp);`
`1611`		`-`
`1612`	`1610`	`/* not text mode - just hand back the jsonb */`
`1613`		`- PG_RETURN_JSONB_P(res);`
	`1611`	`+ PG_RETURN_JSONB_VALUE_P(jbvp);`
`1614`	`1612`	`}`
`1615`	`1613`	`}`
`1616`	`1614`
`@@ -1634,7 +1632,7 @@ jsonb_set_element(Jsonb jb, Datum path, int path_len,`
`1634`	`1632`
`1635`	`1633`	`pfree(path_nulls);`
`1636`	`1634`
`1637`		`- PG_RETURN_JSONB_P(JsonbValueToJsonb(res));`
	`1635`	`+ PG_RETURN_JSONB_VALUE_P(res);`
`1638`	`1636`	`}`
`1639`	`1637`
`1640`	`1638`	`static void`
`@@ -1970,9 +1968,7 @@ each_worker_jsonb(FunctionCallInfo fcinfo, const char *funcname, bool as_text)`
`1970`	`1968`	`else`
`1971`	`1969`	`{`
`1972`	`1970`	`/* Not in text mode, just return the Jsonb */`
`1973`		`- Jsonb *val = JsonbValueToJsonb(&v);`
`1974`		`-`
`1975`		`- values[1] = JsonbPGetDatum(val);`
	`1971`	`+ values[1] = JsonValueToJsonbDatum(&v);`
`1976`	`1972`	`}`
`1977`	`1973`
`1978`	`1974`	`tuplestore_putvalues(rsi->setResult, rsi->setDesc, values, nulls);`
`@@ -2202,9 +2198,7 @@ elements_worker_jsonb(FunctionCallInfo fcinfo, const char *funcname,`
`2202`	`2198`	`else`
`2203`	`2199`	`{`
`2204`	`2200`	`/* Not in text mode, just return the Jsonb */`
`2205`		`- Jsonb *val = JsonbValueToJsonb(&v);`
`2206`		`-`
`2207`		`- values[0] = JsonbPGetDatum(val);`
	`2201`	`+ values[0] = JsonValueToJsonbDatum(&v);`
`2208`	`2202`	`}`
`2209`	`2203`
`2210`	`2204`	`tuplestore_putvalues(rsi->setResult, rsi->setDesc, values, nulls);`
`@@ -2917,11 +2911,7 @@ populate_scalar(ScalarIOData io, Oid typid, int32 typmod, JsValue jsv)`
`2917`	`2911`	`JsonbValue *jbv = jsv->val.jsonb;`
`2918`	`2912`
`2919`	`2913`	`if (typid == JSONBOID)`
`2920`		`- {`
`2921`		`- Jsonb jsonb = JsonbValueToJsonb(jbv); / directly use jsonb */`
`2922`		`-`
`2923`		`- return JsonbPGetDatum(jsonb);`
`2924`		`- }`
	`2914`	`+ return JsonValueToJsonbDatum(jbv); /* directly use jsonb */`
`2925`	`2915`	`/* convert jsonb to string for typio call */`
`2926`	`2916`	`else if (typid == JSONOID && jbv->type != jbvBinary)`
`2927`	`2917`	`{`
`@@ -4223,7 +4213,7 @@ jsonb_strip_nulls(PG_FUNCTION_ARGS)`
`4223`	`4213`
`4224`	`4214`	`Assert(res != NULL);`
`4225`	`4215`
`4226`		`- PG_RETURN_JSONB_P(JsonbValueToJsonb(res));`
	`4216`	`+ PG_RETURN_JSONB_VALUE_P(res);`
`4227`	`4217`	`}`
`4228`	`4218`
`4229`	`4219`	`/*`
`@@ -4278,7 +4268,7 @@ jsonb_concat(PG_FUNCTION_ARGS)`
`4278`	`4268`
`4279`	`4269`	`Assert(res != NULL);`
`4280`	`4270`
`4281`		`- PG_RETURN_JSONB_P(JsonbValueToJsonb(res));`
	`4271`	`+ PG_RETURN_JSONB_VALUE_P(res);`
`4282`	`4272`	`}`
`4283`	`4273`
`4284`	`4274`
`@@ -4332,7 +4322,7 @@ jsonb_delete(PG_FUNCTION_ARGS)`
`4332`	`4322`
`4333`	`4323`	`Assert(res != NULL);`
`4334`	`4324`
`4335`		`- PG_RETURN_JSONB_P(JsonbValueToJsonb(res));`
	`4325`	`+ PG_RETURN_JSONB_VALUE_P(res);`
`4336`	`4326`	`}`
`4337`	`4327`
`4338`	`4328`	`/*`
`@@ -4417,7 +4407,7 @@ jsonb_delete_array(PG_FUNCTION_ARGS)`
`4417`	`4407`
`4418`	`4408`	`Assert(res != NULL);`
`4419`	`4409`
`4420`		`- PG_RETURN_JSONB_P(JsonbValueToJsonb(res));`
	`4410`	`+ PG_RETURN_JSONB_VALUE_P(res);`
`4421`	`4411`	`}`
`4422`	`4412`
`4423`	`4413`	`/*`
`@@ -4485,7 +4475,7 @@ jsonb_delete_idx(PG_FUNCTION_ARGS)`
`4485`	`4475`
`4486`	`4476`	`Assert(res != NULL);`
`4487`	`4477`
`4488`		`- PG_RETURN_JSONB_P(JsonbValueToJsonb(res));`
	`4478`	`+ PG_RETURN_JSONB_VALUE_P(res);`
`4489`	`4479`	`}`
`4490`	`4480`
`4491`	`4481`	`/*`
`@@ -4533,7 +4523,7 @@ jsonb_set(PG_FUNCTION_ARGS)`
`4533`	`4523`
`4534`	`4524`	`Assert(res != NULL);`
`4535`	`4525`
`4536`		`- PG_RETURN_JSONB_P(JsonbValueToJsonb(res));`
	`4526`	`+ PG_RETURN_JSONB_VALUE_P(res);`
`4537`	`4527`	`}`
`4538`	`4528`
`4539`	`4529`
`@@ -4644,7 +4634,7 @@ jsonb_delete_path(PG_FUNCTION_ARGS)`
`4644`	`4634`
`4645`	`4635`	`Assert(res != NULL);`
`4646`	`4636`
`4647`		`- PG_RETURN_JSONB_P(JsonbValueToJsonb(res));`
	`4637`	`+ PG_RETURN_JSONB_VALUE_P(res);`
`4648`	`4638`	`}`
`4649`	`4639`
`4650`	`4640`	`/*`
`@@ -4689,7 +4679,7 @@ jsonb_insert(PG_FUNCTION_ARGS)`
`4689`	`4679`
`4690`	`4680`	`Assert(res != NULL);`
`4691`	`4681`
`4692`		`- PG_RETURN_JSONB_P(JsonbValueToJsonb(res));`
	`4682`	`+ PG_RETURN_JSONB_VALUE_P(res);`
`4693`	`4683`	`}`
`4694`	`4684`
`4695`	`4685`	`/*`