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

deanrasheed · deanrasheed · commit 2e068db56e31 · 2024-04-19T09:40:20.000+01:00
Code quality improvement for 0294df2. Aleksander Alekseev, reviewed by Richard Guo. Discussion: https://postgr.es/m/CAJ7c6TMsiaV5urU_Pq6zJ2tXPDwk69-NKVh4AMN5XrRiM7N%2BGA%40mail.gmail.com
diff --git a/src/backend/optimizer/prep/prepjointree.c b/src/backend/optimizer/prep/prepjointree.c
@@ -153,7 +153,7 @@ transform_MERGE_to_join(Query *parse)
 {
 	RangeTblEntry *joinrte;
 	JoinExpr   *joinexpr;
-	bool		have_action[3];
+	bool		have_action[NUM_MERGE_MATCH_KINDS];
 	JoinType	jointype;
 	int			joinrti;
 	List	   *vars;
diff --git a/src/backend/parser/parse_merge.c b/src/backend/parser/parse_merge.c
@@ -109,7 +109,7 @@ transformMergeStmt(ParseState *pstate, MergeStmt *stmt)
 	Query	   *qry = makeNode(Query);
 	ListCell   *l;
 	AclMode		targetPerms = ACL_NO_RIGHTS;
-	bool		is_terminal[3];
+	bool		is_terminal[NUM_MERGE_MATCH_KINDS];
 	Index		sourceRTI;
 	List	   *mergeActionList;
 	ParseNamespaceItem *nsitem;
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h
@@ -545,7 +545,7 @@ typedef struct ResultRelInfo
 	OnConflictSetState *ri_onConflict;
 
 	/* for MERGE, lists of MergeActionState (one per MergeMatchKind) */
-	List	   *ri_MergeActions[3];
+	List	   *ri_MergeActions[NUM_MERGE_MATCH_KINDS];
 
 	/* for MERGE, expr state for checking the join condition */
 	ExprState  *ri_MergeJoinCondition;
diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h
@@ -1970,6 +1970,8 @@ typedef enum MergeMatchKind
 	MERGE_WHEN_NOT_MATCHED_BY_TARGET
 } MergeMatchKind;
 
+#define NUM_MERGE_MATCH_KINDS (MERGE_WHEN_NOT_MATCHED_BY_TARGET + 1)
+
 typedef struct MergeAction
 {
 	NodeTag		type;

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`		`- bool have_action[3];`
	`156`	`+ bool have_action[NUM_MERGE_MATCH_KINDS];`
`157`	`157`	`JoinType jointype;`
`158`	`158`	`int joinrti;`
`159`	`159`	`List *vars;`
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`	`+#define NUM_MERGE_MATCH_KINDS (MERGE_WHEN_NOT_MATCHED_BY_TARGET + 1)`
	`1974`	`+`
`1973`	`1975`	`typedef struct MergeAction`
`1974`	`1976`	`{`
`1975`	`1977`	`NodeTag type;`