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

Nikita Glukhov · Nikita Glukhov · commit e30954c110da · 2022-07-27T00:46:12.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_POINTER(JsonbValueToJsonb(res));
+	PG_RETURN_JSONB_P(JsonbValueToJsonb(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_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
@@ -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_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
@@ -263,7 +263,7 @@ jsonb_from_cstring(char *json, int len, bool unique_keys)
 	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
@@ -1122,7 +1122,7 @@ to_jsonb(PG_FUNCTION_ARGS)
 	jsonb_categorize_type(val_type,
 						  &tcategory, &outfuncoid);
 
-	PG_RETURN_DATUM(to_jsonb_worker(val, tcategory, outfuncoid));
+	PG_RETURN_JSONB_P(to_jsonb_worker(val, tcategory, outfuncoid));
 }
 
 Datum
@@ -1208,7 +1208,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));
 }
 
 Datum
@@ -1269,7 +1269,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));
 }
 
 
@@ -1371,7 +1371,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));
 }
 
 /*
@@ -1463,7 +1463,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));
 }
 
 static Datum
@@ -1634,7 +1634,7 @@ jsonb_agg_finalfn(PG_FUNCTION_ARGS)
 
 	out = JsonbValueToJsonb(result.res);
 
-	PG_RETURN_POINTER(out);
+	PG_RETURN_JSONB_P(out);
 }
 
 static Datum
@@ -1925,7 +1925,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
@@ -1969,7 +1969,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);
 			}
 
 			tuplestore_putvalues(rsi->setResult, rsi->setDesc, values, nulls);
@@ -2201,7 +2201,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);
 			}
 
 			tuplestore_putvalues(rsi->setResult, rsi->setDesc, values, nulls);
@@ -4185,7 +4185,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);
 
@@ -4222,7 +4222,7 @@ jsonb_strip_nulls(PG_FUNCTION_ARGS)
 
 	Assert(res != NULL);
 
-	PG_RETURN_POINTER(JsonbValueToJsonb(res));
+	PG_RETURN_JSONB_P(JsonbValueToJsonb(res));
 }
 
 /*

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_POINTER(JsonbValueToJsonb(res));`
	`1416`	`+ PG_RETURN_JSONB_P(JsonbValueToJsonb(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_POINTER(JsonbValueToJsonb(res));`
	`1492`	`+ PG_RETURN_JSONB_P(JsonbValueToJsonb(res));`
`1493`	`1493`	`}`
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_POINTER(JsonbValueToJsonb(out));`
	`464`	`+ PG_RETURN_JSONB_P(JsonbValueToJsonb(out));`
`465`	`465`	`}`
`466`	`466`
`467`	`467`	`/*`