Skip to content

Commit dbc8249

Browse files
author
Nikita Glukhov
committed
Rename Ctor => Constructor
1 parent 4e00dd5 commit dbc8249

File tree

17 files changed

+260
-224
lines changed

17 files changed

+260
-224
lines changed

‎contrib/pg_stat_statements/pg_stat_statements.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3112,9 +3112,9 @@ JumbleExpr(pgssJumbleState *jstate, Node *node)
31123112
JumbleExpr(jstate, (Node *) expr->format);
31133113
}
31143114
break;
3115-
case T_JsonCtorExpr:
3115+
case T_JsonConstructorExpr:
31163116
{
3117-
JsonCtorExpr *ctor = (JsonCtorExpr *) node;
3117+
JsonConstructorExpr *ctor = (JsonConstructorExpr *) node;
31183118

31193119
JumbleExpr(jstate, (Node *) ctor->func);
31203120
JumbleExpr(jstate, (Node *) ctor->coercion);

‎src/backend/executor/execExpr.c‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2130,9 +2130,9 @@ ExecInitExprRec(Expr *node, ExprState *state,
21302130
break;
21312131
}
21322132

2133-
case T_JsonCtorExpr:
2133+
case T_JsonConstructorExpr:
21342134
{
2135-
JsonCtorExpr *ctor = (JsonCtorExpr *) node;
2135+
JsonConstructorExpr *ctor = (JsonConstructorExpr *) node;
21362136
List *args = ctor->args;
21372137
ListCell *lc;
21382138
int nargs = list_length(args);
@@ -2144,32 +2144,32 @@ ExecInitExprRec(Expr *node, ExprState *state,
21442144
}
21452145
else
21462146
{
2147-
scratch.opcode = EEOP_JSON_CTOR;
2148-
scratch.d.json_ctor.ctor = ctor;
2149-
scratch.d.json_ctor.arg_values = palloc(sizeof(Datum) * nargs);
2150-
scratch.d.json_ctor.arg_nulls = palloc(sizeof(bool) * nargs);
2151-
scratch.d.json_ctor.arg_types = palloc(sizeof(Oid) * nargs);
2152-
scratch.d.json_ctor.nargs = nargs;
2147+
scratch.opcode = EEOP_JSON_CONSTRUCTOR;
2148+
scratch.d.json_constructor.constructor = ctor;
2149+
scratch.d.json_constructor.arg_values = palloc(sizeof(Datum) * nargs);
2150+
scratch.d.json_constructor.arg_nulls = palloc(sizeof(bool) * nargs);
2151+
scratch.d.json_constructor.arg_types = palloc(sizeof(Oid) * nargs);
2152+
scratch.d.json_constructor.nargs = nargs;
21532153

21542154
foreach(lc, args)
21552155
{
21562156
Expr *arg = (Expr *) lfirst(lc);
21572157

2158-
scratch.d.json_ctor.arg_types[argno] = exprType((Node *) arg);
2158+
scratch.d.json_constructor.arg_types[argno] = exprType((Node *) arg);
21592159

21602160
if (IsA(arg, Const))
21612161
{
21622162
/* Don't evaluate const arguments every round */
21632163
Const *con = (Const *) arg;
21642164

2165-
scratch.d.json_ctor.arg_values[argno] = con->constvalue;
2166-
scratch.d.json_ctor.arg_nulls[argno] = con->constisnull;
2165+
scratch.d.json_constructor.arg_values[argno] = con->constvalue;
2166+
scratch.d.json_constructor.arg_nulls[argno] = con->constisnull;
21672167
}
21682168
else
21692169
{
21702170
ExecInitExprRec(arg, state,
2171-
&scratch.d.json_ctor.arg_values[argno],
2172-
&scratch.d.json_ctor.arg_nulls[argno]);
2171+
&scratch.d.json_constructor.arg_values[argno],
2172+
&scratch.d.json_constructor.arg_nulls[argno]);
21732173
}
21742174
argno++;
21752175
}

‎src/backend/executor/execExprInterp.c‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
434434
&&CASE_EEOP_WINDOW_FUNC,
435435
&&CASE_EEOP_SUBPLAN,
436436
&&CASE_EEOP_ALTERNATIVE_SUBPLAN,
437-
&&CASE_EEOP_JSON_CTOR,
437+
&&CASE_EEOP_JSON_CONSTRUCTOR,
438438
&&CASE_EEOP_AGG_STRICT_DESERIALIZE,
439439
&&CASE_EEOP_AGG_DESERIALIZE,
440440
&&CASE_EEOP_AGG_STRICT_INPUT_CHECK_ARGS,
@@ -1547,34 +1547,34 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
15471547
EEO_NEXT();
15481548
}
15491549

1550-
EEO_CASE(EEOP_JSON_CTOR)
1550+
EEO_CASE(EEOP_JSON_CONSTRUCTOR)
15511551
{
15521552
Datum res;
1553-
JsonCtorExpr *ctor = op->d.json_ctor.ctor;
1553+
JsonConstructorExpr *ctor = op->d.json_constructor.constructor;
15541554
bool is_jsonb = ctor->returning->format->format == JS_FORMAT_JSONB;
15551555
bool isnull = false;
15561556

15571557
if (ctor->type == JSCTOR_JSON_ARRAY)
15581558
res = (is_jsonb ?
15591559
jsonb_build_array_worker :
1560-
json_build_array_worker)(op->d.json_ctor.nargs,
1561-
op->d.json_ctor.arg_values,
1562-
op->d.json_ctor.arg_nulls,
1563-
op->d.json_ctor.arg_types,
1564-
op->d.json_ctor.ctor->absent_on_null);
1560+
json_build_array_worker)(op->d.json_constructor.nargs,
1561+
op->d.json_constructor.arg_values,
1562+
op->d.json_constructor.arg_nulls,
1563+
op->d.json_constructor.arg_types,
1564+
op->d.json_constructor.constructor->absent_on_null);
15651565
else if (ctor->type == JSCTOR_JSON_OBJECT)
15661566
res = (is_jsonb ?
15671567
jsonb_build_object_worker :
1568-
json_build_object_worker)(op->d.json_ctor.nargs,
1569-
op->d.json_ctor.arg_values,
1570-
op->d.json_ctor.arg_nulls,
1571-
op->d.json_ctor.arg_types,
1572-
op->d.json_ctor.ctor->absent_on_null,
1573-
op->d.json_ctor.ctor->unique);
1568+
json_build_object_worker)(op->d.json_constructor.nargs,
1569+
op->d.json_constructor.arg_values,
1570+
op->d.json_constructor.arg_nulls,
1571+
op->d.json_constructor.arg_types,
1572+
op->d.json_constructor.constructor->absent_on_null,
1573+
op->d.json_constructor.constructor->unique);
15741574
else
15751575
{
15761576
res = (Datum) 0;
1577-
elog(ERROR, "invalid JsonCtorExpr type %d", ctor->type);
1577+
elog(ERROR, "invalid JsonConstructorExpr type %d", ctor->type);
15781578
}
15791579

15801580
*op->resvalue = res;

‎src/backend/nodes/copyfuncs.c‎

Lines changed: 46 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2295,12 +2295,12 @@ _copyJsonValueExpr(const JsonValueExpr *from)
22952295
}
22962296

22972297
/*
2298-
* _copyJsonCtorExpr
2298+
* _copyJsonConstructorExpr
22992299
*/
2300-
static JsonCtorExpr *
2301-
_copyJsonCtorExpr(const JsonCtorExpr *from)
2300+
static JsonConstructorExpr *
2301+
_copyJsonConstructorExpr(const JsonConstructorExpr *from)
23022302
{
2303-
JsonCtorExpr *newnode = makeNode(JsonCtorExpr);
2303+
JsonConstructorExpr *newnode = makeNode(JsonConstructorExpr);
23042304

23052305
COPY_SCALAR_FIELD(type);
23062306
COPY_NODE_FIELD(args);
@@ -2329,12 +2329,12 @@ _copyJsonKeyValue(const JsonKeyValue *from)
23292329
}
23302330

23312331
/*
2332-
* _copyJsonObjectCtor
2332+
* _copyJsonObjectConstructor
23332333
*/
2334-
static JsonObjectCtor *
2335-
_copyJsonObjectCtor(const JsonObjectCtor *from)
2334+
static JsonObjectConstructor *
2335+
_copyJsonObjectConstructor(const JsonObjectConstructor *from)
23362336
{
2337-
JsonObjectCtor *newnode = makeNode(JsonObjectCtor);
2337+
JsonObjectConstructor *newnode = makeNode(JsonObjectConstructor);
23382338

23392339
COPY_NODE_FIELD(exprs);
23402340
COPY_NODE_FIELD(output);
@@ -2345,6 +2345,23 @@ _copyJsonObjectCtor(const JsonObjectCtor *from)
23452345
return newnode;
23462346
}
23472347

2348+
/*
2349+
* _copyJsonAggConstructor
2350+
*/
2351+
static JsonAggConstructor *
2352+
_copyJsonAggConstructor(const JsonAggConstructor *from)
2353+
{
2354+
JsonAggConstructor *newnode = makeNode(JsonAggConstructor);
2355+
2356+
COPY_NODE_FIELD(output);
2357+
COPY_NODE_FIELD(agg_filter);
2358+
COPY_NODE_FIELD(agg_order);
2359+
COPY_NODE_FIELD(over);
2360+
COPY_LOCATION_FIELD(location);
2361+
2362+
return newnode;
2363+
}
2364+
23482365
/*
23492366
* _copyJsonObjectAgg
23502367
*/
@@ -2353,11 +2370,7 @@ _copyJsonObjectAgg(const JsonObjectAgg *from)
23532370
{
23542371
JsonObjectAgg *newnode = makeNode(JsonObjectAgg);
23552372

2356-
COPY_NODE_FIELD(ctor.output);
2357-
COPY_NODE_FIELD(ctor.agg_filter);
2358-
COPY_NODE_FIELD(ctor.agg_order);
2359-
COPY_NODE_FIELD(ctor.over);
2360-
COPY_LOCATION_FIELD(ctor.location);
2373+
COPY_NODE_FIELD(constructor);
23612374
COPY_NODE_FIELD(arg);
23622375
COPY_SCALAR_FIELD(absent_on_null);
23632376
COPY_SCALAR_FIELD(unique);
@@ -2380,12 +2393,12 @@ _copyJsonOutput(const JsonOutput *from)
23802393
}
23812394

23822395
/*
2383-
* _copyJsonArrayCtor
2396+
* _copyJsonArrayConstructor
23842397
*/
2385-
static JsonArrayCtor *
2386-
_copyJsonArrayCtor(const JsonArrayCtor *from)
2398+
static JsonArrayConstructor *
2399+
_copyJsonArrayConstructor(const JsonArrayConstructor *from)
23872400
{
2388-
JsonArrayCtor *newnode = makeNode(JsonArrayCtor);
2401+
JsonArrayConstructor *newnode = makeNode(JsonArrayConstructor);
23892402

23902403
COPY_NODE_FIELD(exprs);
23912404
COPY_NODE_FIELD(output);
@@ -2403,24 +2416,20 @@ _copyJsonArrayAgg(const JsonArrayAgg *from)
24032416
{
24042417
JsonArrayAgg *newnode = makeNode(JsonArrayAgg);
24052418

2406-
COPY_NODE_FIELD(ctor.output);
2407-
COPY_NODE_FIELD(ctor.agg_filter);
2408-
COPY_NODE_FIELD(ctor.agg_order);
2409-
COPY_NODE_FIELD(ctor.over);
2410-
COPY_LOCATION_FIELD(ctor.location);
2419+
COPY_NODE_FIELD(constructor);
24112420
COPY_NODE_FIELD(arg);
24122421
COPY_SCALAR_FIELD(absent_on_null);
24132422

24142423
return newnode;
24152424
}
24162425

24172426
/*
2418-
* _copyJsonArrayQueryCtor
2427+
* _copyJsonArrayQueryConstructor
24192428
*/
2420-
static JsonArrayQueryCtor *
2421-
_copyJsonArrayQueryCtor(const JsonArrayQueryCtor *from)
2429+
static JsonArrayQueryConstructor *
2430+
_copyJsonArrayQueryConstructor(const JsonArrayQueryConstructor *from)
24222431
{
2423-
JsonArrayQueryCtor *newnode = makeNode(JsonArrayQueryCtor);
2432+
JsonArrayQueryConstructor *newnode = makeNode(JsonArrayQueryConstructor);
24242433

24252434
COPY_NODE_FIELD(query);
24262435
COPY_NODE_FIELD(output);
@@ -5340,23 +5349,26 @@ copyObjectImpl(const void *from)
53405349
case T_JsonKeyValue:
53415350
retval = _copyJsonKeyValue(from);
53425351
break;
5343-
case T_JsonCtorExpr:
5344-
retval = _copyJsonCtorExpr(from);
5352+
case T_JsonConstructorExpr:
5353+
retval = _copyJsonConstructorExpr(from);
5354+
break;
5355+
case T_JsonObjectConstructor:
5356+
retval = _copyJsonObjectConstructor(from);
53455357
break;
5346-
case T_JsonObjectCtor:
5347-
retval = _copyJsonObjectCtor(from);
5358+
case T_JsonAggConstructor:
5359+
retval = _copyJsonAggConstructor(from);
53485360
break;
53495361
case T_JsonObjectAgg:
53505362
retval = _copyJsonObjectAgg(from);
53515363
break;
53525364
case T_JsonOutput:
53535365
retval = _copyJsonOutput(from);
53545366
break;
5355-
case T_JsonArrayCtor:
5356-
retval = _copyJsonArrayCtor(from);
5367+
case T_JsonArrayConstructor:
5368+
retval = _copyJsonArrayConstructor(from);
53575369
break;
5358-
case T_JsonArrayQueryCtor:
5359-
retval = _copyJsonArrayQueryCtor(from);
5370+
case T_JsonArrayQueryConstructor:
5371+
retval = _copyJsonArrayQueryConstructor(from);
53605372
break;
53615373
case T_JsonArrayAgg:
53625374
retval = _copyJsonArrayAgg(from);

‎src/backend/nodes/equalfuncs.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,7 @@ _equalJsonValueExpr(const JsonValueExpr *a, const JsonValueExpr *b)
849849
}
850850

851851
static bool
852-
_equalJsonCtorExpr(const JsonCtorExpr *a, const JsonCtorExpr *b)
852+
_equalJsonConstructorExpr(const JsonConstructorExpr *a, const JsonConstructorExpr *b)
853853
{
854854
COMPARE_SCALAR_FIELD(type);
855855
COMPARE_NODE_FIELD(args);
@@ -3264,8 +3264,8 @@ equal(const void *a, const void *b)
32643264
case T_JsonValueExpr:
32653265
retval = _equalJsonValueExpr(a, b);
32663266
break;
3267-
case T_JsonCtorExpr:
3268-
retval = _equalJsonCtorExpr(a, b);
3267+
case T_JsonConstructorExpr:
3268+
retval = _equalJsonConstructorExpr(a, b);
32693269
break;
32703270

32713271
/*

0 commit comments

Comments
 (0)