Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit4877281

Browse files
committed
Reconcile nodes/*funcs.c with recent work.
A few of the discrepancies had semantic significance, but I did nottrack down the resulting user-visible bugs, if any. Back-patch to 9.5,where all but one discrepancy appeared. The _equalCreateEventTrigStmt()situation dates to 9.3 but does not affect semantics.catversion bump due to readfuncs.c field order changes.
1 parent2fcedad commit4877281

File tree

5 files changed

+14
-11
lines changed

5 files changed

+14
-11
lines changed

‎src/backend/nodes/copyfuncs.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -647,6 +647,7 @@ _copyCustomScan(const CustomScan *from)
647647
* copy remainder of node
648648
*/
649649
COPY_SCALAR_FIELD(flags);
650+
COPY_NODE_FIELD(custom_plans);
650651
COPY_NODE_FIELD(custom_exprs);
651652
COPY_NODE_FIELD(custom_private);
652653
COPY_NODE_FIELD(custom_scan_tlist);
@@ -1925,9 +1926,9 @@ _copyOnConflictExpr(const OnConflictExpr *from)
19251926
COPY_SCALAR_FIELD(action);
19261927
COPY_NODE_FIELD(arbiterElems);
19271928
COPY_NODE_FIELD(arbiterWhere);
1929+
COPY_SCALAR_FIELD(constraint);
19281930
COPY_NODE_FIELD(onConflictSet);
19291931
COPY_NODE_FIELD(onConflictWhere);
1930-
COPY_SCALAR_FIELD(constraint);
19311932
COPY_SCALAR_FIELD(exclRelIndex);
19321933
COPY_NODE_FIELD(exclRelTlist);
19331934

@@ -4070,7 +4071,7 @@ _copyCreatePolicyStmt(const CreatePolicyStmt *from)
40704071

40714072
COPY_STRING_FIELD(policy_name);
40724073
COPY_NODE_FIELD(table);
4073-
COPY_SCALAR_FIELD(cmd);
4074+
COPY_STRING_FIELD(cmd);
40744075
COPY_NODE_FIELD(roles);
40754076
COPY_NODE_FIELD(qual);
40764077
COPY_NODE_FIELD(with_check);

‎src/backend/nodes/equalfuncs.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -759,9 +759,9 @@ _equalOnConflictExpr(const OnConflictExpr *a, const OnConflictExpr *b)
759759
COMPARE_SCALAR_FIELD(action);
760760
COMPARE_NODE_FIELD(arbiterElems);
761761
COMPARE_NODE_FIELD(arbiterWhere);
762+
COMPARE_SCALAR_FIELD(constraint);
762763
COMPARE_NODE_FIELD(onConflictSet);
763764
COMPARE_NODE_FIELD(onConflictWhere);
764-
COMPARE_SCALAR_FIELD(constraint);
765765
COMPARE_SCALAR_FIELD(exclRelIndex);
766766
COMPARE_NODE_FIELD(exclRelTlist);
767767

@@ -1858,8 +1858,8 @@ _equalCreateEventTrigStmt(const CreateEventTrigStmt *a, const CreateEventTrigStm
18581858
{
18591859
COMPARE_STRING_FIELD(trigname);
18601860
COMPARE_STRING_FIELD(eventname);
1861-
COMPARE_NODE_FIELD(funcname);
18621861
COMPARE_NODE_FIELD(whenclause);
1862+
COMPARE_NODE_FIELD(funcname);
18631863

18641864
return true;
18651865
}
@@ -2064,7 +2064,7 @@ _equalCreatePolicyStmt(const CreatePolicyStmt *a, const CreatePolicyStmt *b)
20642064
{
20652065
COMPARE_STRING_FIELD(policy_name);
20662066
COMPARE_NODE_FIELD(table);
2067-
COMPARE_SCALAR_FIELD(cmd);
2067+
COMPARE_STRING_FIELD(cmd);
20682068
COMPARE_NODE_FIELD(roles);
20692069
COMPARE_NODE_FIELD(qual);
20702070
COMPARE_NODE_FIELD(with_check);

‎src/backend/nodes/outfuncs.c‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ _outModifyTable(StringInfo str, const ModifyTable *node)
341341
WRITE_NODE_FIELD(arbiterIndexes);
342342
WRITE_NODE_FIELD(onConflictSet);
343343
WRITE_NODE_FIELD(onConflictWhere);
344-
WRITE_INT_FIELD(exclRelRTI);
344+
WRITE_UINT_FIELD(exclRelRTI);
345345
WRITE_NODE_FIELD(exclRelTlist);
346346
}
347347

@@ -591,6 +591,7 @@ _outCustomScan(StringInfo str, const CustomScan *node)
591591
_outScanInfo(str, (constScan*)node);
592592

593593
WRITE_UINT_FIELD(flags);
594+
WRITE_NODE_FIELD(custom_plans);
594595
WRITE_NODE_FIELD(custom_exprs);
595596
WRITE_NODE_FIELD(custom_private);
596597
WRITE_NODE_FIELD(custom_scan_tlist);
@@ -1016,7 +1017,7 @@ _outGroupingFunc(StringInfo str, const GroupingFunc *node)
10161017
WRITE_NODE_FIELD(args);
10171018
WRITE_NODE_FIELD(refs);
10181019
WRITE_NODE_FIELD(cols);
1019-
WRITE_INT_FIELD(agglevelsup);
1020+
WRITE_UINT_FIELD(agglevelsup);
10201021
WRITE_LOCATION_FIELD(location);
10211022
}
10221023

@@ -1532,9 +1533,9 @@ _outOnConflictExpr(StringInfo str, const OnConflictExpr *node)
15321533
WRITE_ENUM_FIELD(action,OnConflictAction);
15331534
WRITE_NODE_FIELD(arbiterElems);
15341535
WRITE_NODE_FIELD(arbiterWhere);
1536+
WRITE_OID_FIELD(constraint);
15351537
WRITE_NODE_FIELD(onConflictSet);
15361538
WRITE_NODE_FIELD(onConflictWhere);
1537-
WRITE_OID_FIELD(constraint);
15381539
WRITE_INT_FIELD(exclRelIndex);
15391540
WRITE_NODE_FIELD(exclRelTlist);
15401541
}
@@ -1674,6 +1675,7 @@ _outCustomPath(StringInfo str, const CustomPath *node)
16741675
_outPathInfo(str, (constPath*)node);
16751676

16761677
WRITE_UINT_FIELD(flags);
1678+
WRITE_NODE_FIELD(custom_paths);
16771679
WRITE_NODE_FIELD(custom_private);
16781680
appendStringInfoString(str," :methods ");
16791681
_outToken(str,node->methods->CustomName);

‎src/backend/nodes/readfuncs.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ _readGroupingFunc(void)
538538
READ_NODE_FIELD(args);
539539
READ_NODE_FIELD(refs);
540540
READ_NODE_FIELD(cols);
541-
READ_INT_FIELD(agglevelsup);
541+
READ_UINT_FIELD(agglevelsup);
542542
READ_LOCATION_FIELD(location);
543543

544544
READ_DONE();
@@ -1256,9 +1256,9 @@ _readOnConflictExpr(void)
12561256
READ_ENUM_FIELD(action,OnConflictAction);
12571257
READ_NODE_FIELD(arbiterElems);
12581258
READ_NODE_FIELD(arbiterWhere);
1259+
READ_OID_FIELD(constraint);
12591260
READ_NODE_FIELD(onConflictSet);
12601261
READ_NODE_FIELD(onConflictWhere);
1261-
READ_OID_FIELD(constraint);
12621262
READ_INT_FIELD(exclRelIndex);
12631263
READ_NODE_FIELD(exclRelTlist);
12641264

‎src/include/catalog/catversion.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@
5353
*/
5454

5555
/*yyyymmddN */
56-
#defineCATALOG_VERSION_NO201507281
56+
#defineCATALOG_VERSION_NO201508061
5757

5858
#endif

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp