part_strategy does not need its very own keyword classification.

tglsfdc · tglsfdc · commit c7d65a252cdb · 2020-05-19T20:09:59.000-04:00
This should be plain old ColId.  Making it so makes the grammar less
complicated, and makes the compiled tables a kilobyte or so smaller
(likely because they don't have to deal with a keyword classification
that's not used anyplace else).
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
@@ -595,7 +595,6 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
 %type <boolean> opt_if_not_exists
 %type <ival>	generated_when override_kind
 %type <partspec>	PartitionSpec OptPartitionSpec
-%type <str>			part_strategy
 %type <partelem>	part_elem
 %type <list>		part_params
 %type <partboundspec> PartitionBoundSpec
@@ -3894,7 +3893,7 @@ OptPartitionSpec: PartitionSpec	{ $$ = $1; }
 			| /*EMPTY*/			{ $$ = NULL; }
 		;
 
-PartitionSpec: PARTITION BY part_strategy '(' part_params ')'
+PartitionSpec: PARTITION BY ColId '(' part_params ')'
 				{
 					PartitionSpec *n = makeNode(PartitionSpec);
 
@@ -3906,10 +3905,6 @@ PartitionSpec: PARTITION BY part_strategy '(' part_params ')'
 				}
 		;
 
-part_strategy:	IDENT					{ $$ = $1; }
-				| unreserved_keyword	{ $$ = pstrdup($1); }
-		;
-
 part_params:	part_elem						{ $$ = list_make1($1); }
 			| part_params ',' part_elem			{ $$ = lappend($1, $3); }
 		;

Original file line number	Diff line number	Diff line change
`@@ -595,7 +595,6 @@ static Node makeRecursiveViewSelect(char relname, List aliases, Node query);`
`595`	`595`	`%type <boolean> opt_if_not_exists`
`596`	`596`	`%type <ival> generated_when override_kind`
`597`	`597`	`%type <partspec> PartitionSpec OptPartitionSpec`
`598`		`-%type <str> part_strategy`
`599`	`598`	`%type <partelem> part_elem`
`600`	`599`	`%type <list> part_params`
`601`	`600`	`%type <partboundspec> PartitionBoundSpec`
`@@ -3894,7 +3893,7 @@ OptPartitionSpec: PartitionSpec { $$ = $1; }`
`3894`	`3893`	`\| /EMPTY/ { $$ = NULL; }`
`3895`	`3894`	`;`
`3896`	`3895`
`3897`		`-PartitionSpec: PARTITION BY part_strategy '(' part_params ')'`
	`3896`	`+PartitionSpec: PARTITION BY ColId '(' part_params ')'`
`3898`	`3897`	`{`
`3899`	`3898`	`PartitionSpec *n = makeNode(PartitionSpec);`
`3900`	`3899`
`@@ -3906,10 +3905,6 @@ PartitionSpec: PARTITION BY part_strategy '(' part_params ')'`
`3906`	`3905`	`}`
`3907`	`3906`	`;`
`3908`	`3907`
`3909`		`-part_strategy: IDENT { $$ = $1; }`
`3910`		`- \| unreserved_keyword { $$ = pstrdup($1); }`
`3911`		`- ;`
`3912`		`-`
`3913`	`3908`	`part_params: part_elem { $$ = list_make1($1); }`
`3914`	`3909`	`\| part_params ',' part_elem { $$ = lappend($1, $3); }`
`3915`	`3910`	`;`