Commit2e068db

committed

Use macro NUM_MERGE_MATCH_KINDS instead of '3' in MERGE code.

1 parentf6e8451 commit2e068dbCopy full SHA for 2e068db

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ transform_MERGE_to_join(Query *parse)`
`153`	`153`	`{`
`154`	`154`	`RangeTblEntry*joinrte;`
`155`	`155`	`JoinExpr*joinexpr;`
`156`		`-boolhave_action[3];`
	`156`	`+boolhave_action[NUM_MERGE_MATCH_KINDS];`
`157`	`157`	`JoinTypejointype;`
`158`	`158`	`intjoinrti;`
`159`	`159`	`List*vars;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ transformMergeStmt(ParseState pstate, MergeStmt stmt)`
`109`	`109`	`Query*qry=makeNode(Query);`
`110`	`110`	`ListCell*l;`
`111`	`111`	`AclModetargetPerms=ACL_NO_RIGHTS;`
`112`		`-boolis_terminal[3];`
	`112`	`+boolis_terminal[NUM_MERGE_MATCH_KINDS];`
`113`	`113`	`IndexsourceRTI;`
`114`	`114`	`List*mergeActionList;`
`115`	`115`	`ParseNamespaceItem*nsitem;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -545,7 +545,7 @@ typedef struct ResultRelInfo`
`545`	`545`	`OnConflictSetState*ri_onConflict;`
`546`	`546`
`547`	`547`	`/* for MERGE, lists of MergeActionState (one per MergeMatchKind) */`
`548`		`-List*ri_MergeActions[3];`
	`548`	`+List*ri_MergeActions[NUM_MERGE_MATCH_KINDS];`
`549`	`549`
`550`	`550`	`/* for MERGE, expr state for checking the join condition */`
`551`	`551`	`ExprState*ri_MergeJoinCondition;`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1970,6 +1970,8 @@ typedef enum MergeMatchKind`
`1970`	`1970`	`MERGE_WHEN_NOT_MATCHED_BY_TARGET`
`1971`	`1971`	`}MergeMatchKind;`
`1972`	`1972`
	`1973`	`+#defineNUM_MERGE_MATCH_KINDS (MERGE_WHEN_NOT_MATCHED_BY_TARGET + 1)`
	`1974`	`+`
`1973`	`1975`	`typedefstructMergeAction`
`1974`	`1976`	`{`
`1975`	`1977`	`NodeTagtype;`

Comments

(0)