Use nodes JsonFomat and JsonReturning in JSON_ARRAY

Author: Nikita Glukhov

src/backend/executor/execExprInterp.c

@@ -1550,19 +1550,35 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
 		EEO_CASE(EEOP_JSON_CTOR)
 		{
 			Datum		res;
-			bool		is_jsonb = op->d.json_ctor.ctor->returning->format->format == JS_FORMAT_JSONB;
-
-			res = (is_jsonb ?
-				   jsonb_build_object_worker :
-				   json_build_object_worker)(op->d.json_ctor.nargs,
-											 op->d.json_ctor.arg_values,
-											 op->d.json_ctor.arg_nulls,
-											 op->d.json_ctor.arg_types,
-											 op->d.json_ctor.ctor->absent_on_null,
-											 op->d.json_ctor.ctor->unique);
+			JsonCtorExpr *ctor = op->d.json_ctor.ctor;
+			bool		is_jsonb = ctor->returning->format->format == JS_FORMAT_JSONB;
+			bool		isnull = false;
+
+			if (ctor->type == JSCTOR_JSON_ARRAY)
+				res = (is_jsonb ?
+					   jsonb_build_array_worker :
+					   json_build_array_worker)(op->d.json_ctor.nargs,
+												op->d.json_ctor.arg_values,
+												op->d.json_ctor.arg_nulls,
+												op->d.json_ctor.arg_types,
+												op->d.json_ctor.ctor->absent_on_null);
+			else if (ctor->type == JSCTOR_JSON_OBJECT)
+				res = (is_jsonb ?
+					   jsonb_build_object_worker :
+					   json_build_object_worker)(op->d.json_ctor.nargs,
+												 op->d.json_ctor.arg_values,
+												 op->d.json_ctor.arg_nulls,
+												 op->d.json_ctor.arg_types,
+												 op->d.json_ctor.ctor->absent_on_null,
+												 op->d.json_ctor.ctor->unique);
+			else
+			{
+				res = (Datum) 0;
+				elog(ERROR, "invalid JsonCtorExpr type %d", ctor->type);
+			}
 
 			*op->resvalue = res;
-			*op->resnull = false;
+			*op->resnull = isnull;
 
 			EEO_NEXT();
 		}

src/backend/parser/parse_expr.c

@@ -4013,21 +4013,14 @@ transformJsonObjectCtor(ParseState *pstate, JsonObjectCtor *ctor)
 static Node *
 transformJsonArrayCtor(ParseState *pstate, JsonArrayCtor *ctor)
 {
-	JsonReturning returning;
 	JsonCtorExpr *jsctor;
-	FuncExpr   *fexpr;
 	List	   *args = NIL;
-	Oid			funcid;
-	Oid			funcrettype;
 
 	/* transform element expressions, if any */
 	if (ctor->exprs)
 	{
 		ListCell   *lc;
 
-		/* append the first absent_on_null argument */
-		args = lappend(args, makeBoolConst(ctor->absent_on_null, false));
-
 		/* transform and append element arguments */
 		foreach(lc, ctor->exprs)
 		{
@@ -4039,29 +4032,13 @@ transformJsonArrayCtor(ParseState *pstate, JsonArrayCtor *ctor)
 		}
 	}
 
-	transformJsonOutput(pstate, ctor->output, true, &returning);
-
-	if (returning.format.type == JS_FORMAT_JSONB)
-	{
-		funcid = args ? F_JSONB_BUILD_ARRAY_EXT : F_JSONB_BUILD_ARRAY_NOARGS;
-		funcrettype = JSONBOID;
-	}
-	else
-	{
-		funcid = args ? F_JSON_BUILD_ARRAY_EXT : F_JSON_BUILD_ARRAY_NOARGS;
-		funcrettype = JSONOID;
-	}
-
-	fexpr = makeFuncExpr(funcid, funcrettype, args,
-						 InvalidOid, InvalidOid, COERCE_EXPLICIT_CALL);
-	fexpr->location = ctor->location;
-
 	jsctor = makeNode(JsonCtorExpr);
-	jsctor->func = fexpr;
+	jsctor->args = args;
 	jsctor->type = JSCTOR_JSON_ARRAY;
-	jsctor->returning = returning;
+	jsctor->returning = transformJsonOutput(pstate, ctor->output, true);
 	jsctor->unique = false;
 	jsctor->absent_on_null = ctor->absent_on_null;
+	jsctor->location = ctor->location;
 
-	return coerceJsonFuncExpr(pstate, (Node *) jsctor, &returning, true);
+	return coerceJsonFuncExpr(pstate, (Node *) jsctor, jsctor->returning, true);
 }

src/backend/utils/adt/json.c

@@ -1237,24 +1237,13 @@ json_build_object_noargs(PG_FUNCTION_ARGS)
 	PG_RETURN_TEXT_P(cstring_to_text_with_len("{}", 2));
 }
 
-static Datum
-json_build_array_worker(FunctionCallInfo fcinfo, int first_vararg,
+Datum
+json_build_array_worker(int nargs, Datum *args, bool *nulls, Oid *types,
 						bool absent_on_null)
 {
-	int			nargs;
 	int			i;
 	const char *sep = "";
 	StringInfo	result;
-	Datum	   *args;
-	bool	   *nulls;
-	Oid		   *types;
-
-	/* fetch argument values to build the array */
-	nargs = extract_variadic_args(fcinfo, first_vararg, false,
-								  &args, &types, &nulls);
-
-	if (nargs < 0)
-		PG_RETURN_NULL();
 
 	result = makeStringInfo();
 
@@ -1272,7 +1261,7 @@ json_build_array_worker(FunctionCallInfo fcinfo, int first_vararg,
 
 	appendStringInfoChar(result, ']');
 
-	PG_RETURN_TEXT_P(cstring_to_text_with_len(result->data, result->len));
+	return PointerGetDatum(cstring_to_text_with_len(result->data, result->len));
 }
 
 /*
@@ -1281,16 +1270,17 @@ json_build_array_worker(FunctionCallInfo fcinfo, int first_vararg,
 Datum
 json_build_array(PG_FUNCTION_ARGS)
 {
-	return json_build_array_worker(fcinfo, 0, false);
-}
+	Datum	   *args;
+	bool	   *nulls;
+	Oid		   *types;
+	/* build argument values to build the object */
+	int			nargs = extract_variadic_args(fcinfo, 0, true,
+											  &args, &types, &nulls);
 
-/*
- * SQL function json_build_array_ext(absent_on_null bool, variadic "any")
- */
-Datum
-json_build_array_ext(PG_FUNCTION_ARGS)
-{
-	return json_build_array_worker(fcinfo, 1, PG_GETARG_BOOL(0));
+	if (nargs < 0)
+		PG_RETURN_NULL();
+
+	PG_RETURN_DATUM(json_build_array_worker(nargs, args, nulls, types, false));
 }
 
 /*

src/backend/utils/adt/jsonb.c

@@ -1237,23 +1237,12 @@ jsonb_build_object_noargs(PG_FUNCTION_ARGS)
 	PG_RETURN_POINTER(JsonbValueToJsonb(result.res));
 }
 
-static Datum
-jsonb_build_array_worker(FunctionCallInfo fcinfo, int first_vararg,
+Datum
+jsonb_build_array_worker(int nargs, Datum *args, bool *nulls, Oid *types,
 						 bool absent_on_null)
 {
-	int			nargs;
 	int			i;
 	JsonbInState result;
-	Datum	   *args;
-	bool	   *nulls;
-	Oid		   *types;
-
-	/* build argument values to build the array */
-	nargs = extract_variadic_args(fcinfo, first_vararg, true,
-								  &args, &types, &nulls);
-
-	if (nargs < 0)
-		PG_RETURN_NULL();
 
 	memset(&result, 0, sizeof(JsonbInState));
 
@@ -1269,7 +1258,7 @@ jsonb_build_array_worker(FunctionCallInfo fcinfo, int first_vararg,
 
 	result.res = pushJsonbValue(&result.parseState, WJB_END_ARRAY, NULL);
 
-	PG_RETURN_POINTER(JsonbValueToJsonb(result.res));
+	return JsonbPGetDatum(JsonbValueToJsonb(result.res));
 }
 
 /*
@@ -1278,18 +1267,20 @@ jsonb_build_array_worker(FunctionCallInfo fcinfo, int first_vararg,
 Datum
 jsonb_build_array(PG_FUNCTION_ARGS)
 {
-	return jsonb_build_array_worker(fcinfo, 0, false);
-}
+	Datum	   *args;
+	bool	   *nulls;
+	Oid		   *types;
+	/* build argument values to build the object */
+	int			nargs = extract_variadic_args(fcinfo, 0, true,
+											  &args, &types, &nulls);
 
-/*
- * SQL function jsonb_build_array_ext(absent_on_null bool, variadic "any")
- */
-Datum
-jsonb_build_array_ext(PG_FUNCTION_ARGS)
-{
-	return jsonb_build_array_worker(fcinfo, 1, PG_GETARG_BOOL(0));
+	if (nargs < 0)
+		PG_RETURN_NULL();
+
+	PG_RETURN_DATUM(jsonb_build_array_worker(nargs, args, nulls, types, false));
 }
 
+
 /*
  * degenerate case of jsonb_build_array where it gets 0 arguments.
  */

src/include/catalog/pg_proc.dat

@@ -8397,11 +8397,6 @@
   proname => 'json_build_array', proisstrict => 'f', provolatile => 's',
   prorettype => 'json', proargtypes => '',
   prosrc => 'json_build_array_noargs' },
-{ oid => '2228', descr => 'build a json array from any inputs',
-  proname => 'json_build_array_ext', provariadic => 'any', proisstrict => 'f',
-  provolatile => 's', prorettype => 'json', proargtypes => 'bool any',
-  proallargtypes => '{bool,any}', proargmodes => '{i,v}',
-  prosrc => 'json_build_array_ext' },
 { oid => '3200',
   descr => 'build a json object from pairwise key/value inputs',
   proname => 'json_build_object', provariadic => 'any', proisstrict => 'f',
@@ -9277,11 +9272,6 @@
   proname => 'jsonb_build_array', proisstrict => 'f', provolatile => 's',
   prorettype => 'jsonb', proargtypes => '',
   prosrc => 'jsonb_build_array_noargs' },
-{ oid => '6068', descr => 'build a jsonb array from any inputs',
-  proname => 'jsonb_build_array_ext', provariadic => 'any', proisstrict => 'f',
-  provolatile => 's', prorettype => 'jsonb', proargtypes => 'bool any',
-  proallargtypes => '{bool,any}', proargmodes => '{i,v}',
-  prosrc => 'jsonb_build_array_ext' },
 { oid => '3273',
   descr => 'build a jsonb object from pairwise key/value inputs',
   proname => 'jsonb_build_object', provariadic => 'any', proisstrict => 'f',

src/include/utils/json.h

@@ -23,5 +23,7 @@ extern char *JsonEncodeDateTime(char *buf, Datum value, Oid typid,
 extern Datum json_build_object_worker(int nargs, Datum *args, bool *nulls,
 									  Oid *types, bool absent_on_null,
 									  bool unique_keys);
+extern Datum json_build_array_worker(int nargs, Datum *args, bool *nulls,
+									 Oid *types, bool absent_on_null);
 
 #endif							/* JSON_H */

src/include/utils/jsonb.h

@@ -412,5 +412,7 @@ extern const char *JsonbTypeName(JsonbValue *jb);
 extern Datum jsonb_build_object_worker(int nargs, Datum *args, bool *nulls,
 									   Oid *types, bool absent_on_null,
 									   bool unique_keys);
+extern Datum jsonb_build_array_worker(int nargs, Datum *args, bool *nulls,
+									  Oid *types, bool absent_on_null);
 
 #endif							/* __JSONB_H__ */