Rename Ctor => Constructor

Nikita Glukhov · Nikita Glukhov · commit 9c9978469f66 · 2020-07-29T20:09:20.000+03:00
diff --git a/src/backend/executor/execExpr.c b/src/backend/executor/execExpr.c
@@ -2180,14 +2180,14 @@ ExecInitExprRec(Expr *node, ExprState *state,
 						bool		is_jsonb =
 							ctor->returning->format->format == JS_FORMAT_JSONB;
 
-						scratch.d.json_ctor.arg_type_cache =
-							palloc(sizeof(*scratch.d.json_ctor.arg_type_cache) * nargs);
+						scratch.d.json_constructor.arg_type_cache =
+							palloc(sizeof(*scratch.d.json_constructor.arg_type_cache) * nargs);
 
 						for (int i = 0; i < nargs; i++)
 						{
 							int			category;
 							Oid			outfuncid;
-							Oid			typid = scratch.d.json_ctor.arg_types[i];
+							Oid			typid = scratch.d.json_constructor.arg_types[i];
 
 							if (is_jsonb)
 							{
@@ -2206,8 +2206,8 @@ ExecInitExprRec(Expr *node, ExprState *state,
 								category = (int) jscat;
 							}
 
-							scratch.d.json_ctor.arg_type_cache[i].outfuncid = outfuncid;
-							scratch.d.json_ctor.arg_type_cache[i].category = category;
+							scratch.d.json_constructor.arg_type_cache[i].outfuncid = outfuncid;
+							scratch.d.json_constructor.arg_type_cache[i].category = category;
 						}
 					}
 
diff --git a/src/backend/executor/execExprInterp.c b/src/backend/executor/execExprInterp.c
@@ -1582,7 +1582,7 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
 												 op->d.json_constructor.constructor->unique);
 			else if (ctor->type == JSCTOR_JSON_SCALAR)
 			{
-				if (op->d.json_ctor.arg_nulls[0])
+				if (op->d.json_constructor.arg_nulls[0])
 				{
 					res = (Datum) 0;
 					isnull = true;
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
@@ -4908,6 +4908,6 @@ transformJsonScalarExpr(ParseState *pstate, JsonScalarExpr *jsexpr)
 	if (exprType(arg) == UNKNOWNOID)
 		arg = coerce_to_specific_type(pstate, arg, TEXTOID, "JSON_SCALAR");
 
-	return makeJsonCtorExpr(pstate, JSCTOR_JSON_SCALAR, list_make1(arg), NULL,
+	return makeJsonConstructorExpr(pstate, JSCTOR_JSON_SCALAR, list_make1(arg), NULL,
 							returning, false, false, jsexpr->location);
 }

Original file line number	Diff line number	Diff line change
`@@ -2180,14 +2180,14 @@ ExecInitExprRec(Expr node, ExprState state,`
`2180`	`2180`	`bool is_jsonb =`
`2181`	`2181`	`ctor->returning->format->format == JS_FORMAT_JSONB;`
`2182`	`2182`
`2183`		`- scratch.d.json_ctor.arg_type_cache =`
`2184`		`- palloc(sizeof(scratch.d.json_ctor.arg_type_cache) nargs);`
	`2183`	`+ scratch.d.json_constructor.arg_type_cache =`
	`2184`	`+ palloc(sizeof(scratch.d.json_constructor.arg_type_cache) nargs);`
`2185`	`2185`
`2186`	`2186`	`for (int i = 0; i < nargs; i++)`
`2187`	`2187`	`{`
`2188`	`2188`	`int category;`
`2189`	`2189`	`Oid outfuncid;`
`2190`		`- Oid typid = scratch.d.json_ctor.arg_types[i];`
	`2190`	`+ Oid typid = scratch.d.json_constructor.arg_types[i];`
`2191`	`2191`
`2192`	`2192`	`if (is_jsonb)`
`2193`	`2193`	`{`
`@@ -2206,8 +2206,8 @@ ExecInitExprRec(Expr node, ExprState state,`
`2206`	`2206`	`category = (int) jscat;`
`2207`	`2207`	`}`
`2208`	`2208`
`2209`		`- scratch.d.json_ctor.arg_type_cache[i].outfuncid = outfuncid;`
`2210`		`- scratch.d.json_ctor.arg_type_cache[i].category = category;`
	`2209`	`+ scratch.d.json_constructor.arg_type_cache[i].outfuncid = outfuncid;`
	`2210`	`+ scratch.d.json_constructor.arg_type_cache[i].category = category;`
`2211`	`2211`	`}`
`2212`	`2212`	`}`
`2213`	`2213`
Original file line number	Diff line number	Diff line change
`@@ -1582,7 +1582,7 @@ ExecInterpExpr(ExprState state, ExprContext econtext, bool *isnull)`
`1582`	`1582`	`op->d.json_constructor.constructor->unique);`
`1583`	`1583`	`else if (ctor->type == JSCTOR_JSON_SCALAR)`
`1584`	`1584`	`{`
`1585`		`- if (op->d.json_ctor.arg_nulls[0])`
	`1585`	`+ if (op->d.json_constructor.arg_nulls[0])`
`1586`	`1586`	`{`
`1587`	`1587`	`res = (Datum) 0;`
`1588`	`1588`	`isnull = true;`
Original file line number	Diff line number	Diff line change
`@@ -4908,6 +4908,6 @@ transformJsonScalarExpr(ParseState pstate, JsonScalarExpr jsexpr)`
`4908`	`4908`	`if (exprType(arg) == UNKNOWNOID)`
`4909`	`4909`	`arg = coerce_to_specific_type(pstate, arg, TEXTOID, "JSON_SCALAR");`
`4910`	`4910`
`4911`		`- return makeJsonCtorExpr(pstate, JSCTOR_JSON_SCALAR, list_make1(arg), NULL,`
	`4911`	`+ return makeJsonConstructorExpr(pstate, JSCTOR_JSON_SCALAR, list_make1(arg), NULL,`
`4912`	`4912`	`returning, false, false, jsexpr->location);`
`4913`	`4913`	`}`