Replace GUC_UNIT_MEMORY|GUC_UNIT_TIME with GUC_UNIT.

MasahikoSawada · MasahikoSawada · commit a54fc892ad0a · 2023-06-15T17:04:19.000+09:00
We used (GUC_UNIT_MEMORY | GUC_UNIT_TIME) instead of GUC_UNIT some places but we already define it in guc.h. This commit replaces them with GUC_UNIT for better consistency with their surrounding code. Author: Japin Li Reviewed-by: Richard Guo, Michael Paquier, Masahiko Sawada Discussion: https://postgr.es/m/MEYP282MB1669EC0FED922F7A151673ACB65AA@MEYP282MB1669.AUSP282.PROD.OUTLOOK.COM
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
@@ -2766,7 +2766,7 @@ convert_real_from_base_unit(double base_value, int base_unit,
 const char *
 get_config_unit_name(int flags)
 {
-	switch (flags & (GUC_UNIT_MEMORY | GUC_UNIT_TIME))
+	switch (flags & GUC_UNIT)
 	{
 		case 0:
 			return NULL;		/* GUC has no units */
@@ -2802,7 +2802,7 @@ get_config_unit_name(int flags)
 			return "min";
 		default:
 			elog(ERROR, "unrecognized GUC units value: %d",
-				 flags & (GUC_UNIT_MEMORY | GUC_UNIT_TIME));
+				 flags & GUC_UNIT);
 			return NULL;
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -2766,7 +2766,7 @@ convert_real_from_base_unit(double base_value, int base_unit,`
`2766`	`2766`	`const char *`
`2767`	`2767`	`get_config_unit_name(int flags)`
`2768`	`2768`	`{`
`2769`		`- switch (flags & (GUC_UNIT_MEMORY \| GUC_UNIT_TIME))`
	`2769`	`+ switch (flags & GUC_UNIT)`
`2770`	`2770`	`{`
`2771`	`2771`	`case 0:`
`2772`	`2772`	`return NULL; /* GUC has no units */`
`@@ -2802,7 +2802,7 @@ get_config_unit_name(int flags)`
`2802`	`2802`	`return "min";`
`2803`	`2803`	`default:`
`2804`	`2804`	`elog(ERROR, "unrecognized GUC units value: %d",`
`2805`		`- flags & (GUC_UNIT_MEMORY \| GUC_UNIT_TIME));`
	`2805`	`+ flags & GUC_UNIT);`
`2806`	`2806`	`return NULL;`
`2807`	`2807`	`}`
`2808`	`2808`	`}`