Use PG_RETURN_JSONB()/JsonbGetDatum() instead of PG_RETURN_JSONB()/PointerGetDatum()

Nikita Glukhov · Nikita Glukhov · commit e3a57603e2e2 · 2021-03-29T20:40:07.000+03:00
diff --git a/contrib/hstore/hstore_io.c b/contrib/hstore/hstore_io.c
@@ -1419,7 +1419,7 @@ hstore_to_jsonb(PG_FUNCTION_ARGS)
 
 	res = pushJsonbValue(&state, WJB_END_OBJECT, NULL);
 
-	PG_RETURN_POINTER(JsonbValueToJsonb(res));
+	PG_RETURN_JSONB_P(JsonbValueToJsonb(res));
 }
 
 PG_FUNCTION_INFO_V1(hstore_to_jsonb_loose);
@@ -1495,5 +1495,5 @@ hstore_to_jsonb_loose(PG_FUNCTION_ARGS)
 
 	res = pushJsonbValue(&state, WJB_END_OBJECT, NULL);
 
-	PG_RETURN_POINTER(JsonbValueToJsonb(res));
+	PG_RETURN_JSONB_P(JsonbValueToJsonb(res));
 }
diff --git a/contrib/jsonb_plpython/jsonb_plpython.c b/contrib/jsonb_plpython/jsonb_plpython.c
@@ -468,7 +468,7 @@ plpython_to_jsonb(PG_FUNCTION_ARGS)
 
 	obj = (PyObject *) PG_GETARG_POINTER(0);
 	out = PLyObject_ToJsonbValue(obj, &jsonb_state, true);
-	PG_RETURN_POINTER(JsonbValueToJsonb(out));
+	PG_RETURN_JSONB_P(JsonbValueToJsonb(out));
 }
 
 /*
diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c
@@ -282,7 +282,7 @@ jsonb_from_cstring(char *json, int len)
 	pg_parse_json_or_ereport(lex, &sem);
 
 	/* after parsing, the item member has the composed jsonb structure */
-	PG_RETURN_POINTER(JsonbValueToJsonb(state.res));
+	PG_RETURN_JSONB_P(JsonbValueToJsonb(state.res));
 }
 
 static size_t
@@ -1109,7 +1109,7 @@ to_jsonb(PG_FUNCTION_ARGS)
 
 	datum_to_jsonb(val, false, &result, tcategory, outfuncoid, false);
 
-	PG_RETURN_POINTER(JsonbValueToJsonb(result.res));
+	PG_RETURN_JSONB_P(JsonbValueToJsonb(result.res));
 }
 
 /*
@@ -1159,7 +1159,7 @@ jsonb_build_object(PG_FUNCTION_ARGS)
 
 	result.res = pushJsonbValue(&result.parseState, WJB_END_OBJECT, NULL);
 
-	PG_RETURN_POINTER(JsonbValueToJsonb(result.res));
+	PG_RETURN_JSONB_P(JsonbValueToJsonb(result.res));
 }
 
 /*
@@ -1175,7 +1175,7 @@ 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_POINTER(JsonbValueToJsonb(result.res));
+	PG_RETURN_JSONB_P(JsonbValueToJsonb(result.res));
 }
 
 /*
@@ -1206,7 +1206,7 @@ jsonb_build_array(PG_FUNCTION_ARGS)
 
 	result.res = pushJsonbValue(&result.parseState, WJB_END_ARRAY, NULL);
 
-	PG_RETURN_POINTER(JsonbValueToJsonb(result.res));
+	PG_RETURN_JSONB_P(JsonbValueToJsonb(result.res));
 }
 
 /*
@@ -1222,7 +1222,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_POINTER(JsonbValueToJsonb(result.res));
+	PG_RETURN_JSONB_P(JsonbValueToJsonb(result.res));
 }
 
 
@@ -1326,7 +1326,7 @@ jsonb_object(PG_FUNCTION_ARGS)
 close_object:
 	result.res = pushJsonbValue(&result.parseState, WJB_END_OBJECT, NULL);
 
-	PG_RETURN_POINTER(JsonbValueToJsonb(result.res));
+	PG_RETURN_JSONB_P(JsonbValueToJsonb(result.res));
 }
 
 /*
@@ -1423,7 +1423,7 @@ jsonb_object_two_arg(PG_FUNCTION_ARGS)
 close_object:
 	result.res = pushJsonbValue(&result.parseState, WJB_END_OBJECT, NULL);
 
-	PG_RETURN_POINTER(JsonbValueToJsonb(result.res));
+	PG_RETURN_JSONB_P(JsonbValueToJsonb(result.res));
 }
 
 
@@ -1577,7 +1577,7 @@ jsonb_agg_finalfn(PG_FUNCTION_ARGS)
 
 	out = JsonbValueToJsonb(result.res);
 
-	PG_RETURN_POINTER(out);
+	PG_RETURN_JSONB_P(out);
 }
 
 /*
@@ -1809,7 +1809,7 @@ jsonb_object_agg_finalfn(PG_FUNCTION_ARGS)
 
 	out = JsonbValueToJsonb(result.res);
 
-	PG_RETURN_POINTER(out);
+	PG_RETURN_JSONB_P(out);
 }
 
 
diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c
@@ -1998,7 +1998,7 @@ each_worker_jsonb(FunctionCallInfo fcinfo, const char *funcname, bool as_text)
 				/* Not in text mode, just return the Jsonb */
 				Jsonb	   *val = JsonbValueToJsonb(&v);
 
-				values[1] = PointerGetDatum(val);
+				values[1] = JsonbPGetDatum(val);
 			}
 
 			tuple = heap_form_tuple(ret_tdesc, values, nulls);
@@ -2283,7 +2283,7 @@ elements_worker_jsonb(FunctionCallInfo fcinfo, const char *funcname,
 				/* Not in text mode, just return the Jsonb */
 				Jsonb	   *val = JsonbValueToJsonb(&v);
 
-				values[0] = PointerGetDatum(val);
+				values[0] = JsonbPGetDatum(val);
 			}
 
 			tuple = heap_form_tuple(ret_tdesc, values, nulls);
@@ -4251,7 +4251,7 @@ jsonb_strip_nulls(PG_FUNCTION_ARGS)
 	bool		last_was_key = false;
 
 	if (JB_ROOT_IS_SCALAR(jb))
-		PG_RETURN_POINTER(jb);
+		PG_RETURN_JSONB_P(jb);
 
 	it = JsonbIteratorInit(&jb->root);
 
@@ -4288,7 +4288,7 @@ jsonb_strip_nulls(PG_FUNCTION_ARGS)
 
 	Assert(res != NULL);
 
-	PG_RETURN_POINTER(JsonbValueToJsonb(res));
+	PG_RETURN_JSONB_P(JsonbValueToJsonb(res));
 }
 
 /*
@@ -4310,7 +4310,7 @@ jsonb_pretty(PG_FUNCTION_ARGS)
 Datum
 jsonb_canonical(PG_FUNCTION_ARGS)
 {
-	Jsonb	   *jb = PG_GETARG_JSONB(0);
+	Jsonb	   *jb = PG_GETARG_JSONB_P(0);
 	StringInfo	str = makeStringInfo();
 
 	JsonbToCStringCanonical(str, &jb->root, VARSIZE(jb));

Original file line number	Diff line number	Diff line change
`@@ -1419,7 +1419,7 @@ hstore_to_jsonb(PG_FUNCTION_ARGS)`
`1419`	`1419`
`1420`	`1420`	`res = pushJsonbValue(&state, WJB_END_OBJECT, NULL);`
`1421`	`1421`
`1422`		`- PG_RETURN_POINTER(JsonbValueToJsonb(res));`
	`1422`	`+ PG_RETURN_JSONB_P(JsonbValueToJsonb(res));`
`1423`	`1423`	`}`
`1424`	`1424`
`1425`	`1425`	`PG_FUNCTION_INFO_V1(hstore_to_jsonb_loose);`
`@@ -1495,5 +1495,5 @@ hstore_to_jsonb_loose(PG_FUNCTION_ARGS)`
`1495`	`1495`
`1496`	`1496`	`res = pushJsonbValue(&state, WJB_END_OBJECT, NULL);`
`1497`	`1497`
`1498`		`- PG_RETURN_POINTER(JsonbValueToJsonb(res));`
	`1498`	`+ PG_RETURN_JSONB_P(JsonbValueToJsonb(res));`
`1499`	`1499`	`}`
Original file line number	Diff line number	Diff line change
`@@ -468,7 +468,7 @@ plpython_to_jsonb(PG_FUNCTION_ARGS)`
`468`	`468`
`469`	`469`	`obj = (PyObject *) PG_GETARG_POINTER(0);`
`470`	`470`	`out = PLyObject_ToJsonbValue(obj, &jsonb_state, true);`
`471`		`- PG_RETURN_POINTER(JsonbValueToJsonb(out));`
	`471`	`+ PG_RETURN_JSONB_P(JsonbValueToJsonb(out));`
`472`	`472`	`}`
`473`	`473`
`474`	`474`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ jsonb_from_cstring(char *json, int len)`
`282`	`282`	`pg_parse_json_or_ereport(lex, &sem);`
`283`	`283`
`284`	`284`	`/* after parsing, the item member has the composed jsonb structure */`
`285`		`- PG_RETURN_POINTER(JsonbValueToJsonb(state.res));`
	`285`	`+ PG_RETURN_JSONB_P(JsonbValueToJsonb(state.res));`
`286`	`286`	`}`
`287`	`287`
`288`	`288`	`static size_t`
`@@ -1109,7 +1109,7 @@ to_jsonb(PG_FUNCTION_ARGS)`
`1109`	`1109`
`1110`	`1110`	`datum_to_jsonb(val, false, &result, tcategory, outfuncoid, false);`
`1111`	`1111`
`1112`		`- PG_RETURN_POINTER(JsonbValueToJsonb(result.res));`
	`1112`	`+ PG_RETURN_JSONB_P(JsonbValueToJsonb(result.res));`
`1113`	`1113`	`}`
`1114`	`1114`
`1115`	`1115`	`/*`
`@@ -1159,7 +1159,7 @@ jsonb_build_object(PG_FUNCTION_ARGS)`
`1159`	`1159`
`1160`	`1160`	`result.res = pushJsonbValue(&result.parseState, WJB_END_OBJECT, NULL);`
`1161`	`1161`
`1162`		`- PG_RETURN_POINTER(JsonbValueToJsonb(result.res));`
	`1162`	`+ PG_RETURN_JSONB_P(JsonbValueToJsonb(result.res));`
`1163`	`1163`	`}`
`1164`	`1164`
`1165`	`1165`	`/*`
`@@ -1175,7 +1175,7 @@ jsonb_build_object_noargs(PG_FUNCTION_ARGS)`
`1175`	`1175`	`(void) pushJsonbValue(&result.parseState, WJB_BEGIN_OBJECT, NULL);`
`1176`	`1176`	`result.res = pushJsonbValue(&result.parseState, WJB_END_OBJECT, NULL);`
`1177`	`1177`
`1178`		`- PG_RETURN_POINTER(JsonbValueToJsonb(result.res));`
	`1178`	`+ PG_RETURN_JSONB_P(JsonbValueToJsonb(result.res));`
`1179`	`1179`	`}`
`1180`	`1180`
`1181`	`1181`	`/*`
`@@ -1206,7 +1206,7 @@ jsonb_build_array(PG_FUNCTION_ARGS)`
`1206`	`1206`
`1207`	`1207`	`result.res = pushJsonbValue(&result.parseState, WJB_END_ARRAY, NULL);`
`1208`	`1208`
`1209`		`- PG_RETURN_POINTER(JsonbValueToJsonb(result.res));`
	`1209`	`+ PG_RETURN_JSONB_P(JsonbValueToJsonb(result.res));`
`1210`	`1210`	`}`
`1211`	`1211`
`1212`	`1212`	`/*`
`@@ -1222,7 +1222,7 @@ jsonb_build_array_noargs(PG_FUNCTION_ARGS)`
`1222`	`1222`	`(void) pushJsonbValue(&result.parseState, WJB_BEGIN_ARRAY, NULL);`
`1223`	`1223`	`result.res = pushJsonbValue(&result.parseState, WJB_END_ARRAY, NULL);`
`1224`	`1224`
`1225`		`- PG_RETURN_POINTER(JsonbValueToJsonb(result.res));`
	`1225`	`+ PG_RETURN_JSONB_P(JsonbValueToJsonb(result.res));`
`1226`	`1226`	`}`
`1227`	`1227`
`1228`	`1228`
`@@ -1326,7 +1326,7 @@ jsonb_object(PG_FUNCTION_ARGS)`
`1326`	`1326`	`close_object:`
`1327`	`1327`	`result.res = pushJsonbValue(&result.parseState, WJB_END_OBJECT, NULL);`
`1328`	`1328`
`1329`		`- PG_RETURN_POINTER(JsonbValueToJsonb(result.res));`
	`1329`	`+ PG_RETURN_JSONB_P(JsonbValueToJsonb(result.res));`
`1330`	`1330`	`}`
`1331`	`1331`
`1332`	`1332`	`/*`
`@@ -1423,7 +1423,7 @@ jsonb_object_two_arg(PG_FUNCTION_ARGS)`
`1423`	`1423`	`close_object:`
`1424`	`1424`	`result.res = pushJsonbValue(&result.parseState, WJB_END_OBJECT, NULL);`
`1425`	`1425`
`1426`		`- PG_RETURN_POINTER(JsonbValueToJsonb(result.res));`
	`1426`	`+ PG_RETURN_JSONB_P(JsonbValueToJsonb(result.res));`
`1427`	`1427`	`}`
`1428`	`1428`
`1429`	`1429`
`@@ -1577,7 +1577,7 @@ jsonb_agg_finalfn(PG_FUNCTION_ARGS)`
`1577`	`1577`
`1578`	`1578`	`out = JsonbValueToJsonb(result.res);`
`1579`	`1579`
`1580`		`- PG_RETURN_POINTER(out);`
	`1580`	`+ PG_RETURN_JSONB_P(out);`
`1581`	`1581`	`}`
`1582`	`1582`
`1583`	`1583`	`/*`
`@@ -1809,7 +1809,7 @@ jsonb_object_agg_finalfn(PG_FUNCTION_ARGS)`
`1809`	`1809`
`1810`	`1810`	`out = JsonbValueToJsonb(result.res);`
`1811`	`1811`
`1812`		`- PG_RETURN_POINTER(out);`
	`1812`	`+ PG_RETURN_JSONB_P(out);`
`1813`	`1813`	`}`
`1814`	`1814`
`1815`	`1815`