Use class_args field in opclass_drop

petere · petere · commit 63ebd377a6ec · 2017-03-06T13:31:47.000-05:00
This makes it consistent with the usage in opclass_item.

Reviewed-by: Jim Nasby &lt;Jim.Nasby@BlueTreble.com&gt;
Reviewed-by: Michael Paquier &lt;michael.paquier@gmail.com&gt;
diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c
@@ -989,7 +989,7 @@ AlterOpFamilyDrop(AlterOpFamilyStmt *stmt, Oid amoid, Oid opfamilyoid,
 							 errmsg("invalid operator number %d,"
 									" must be between 1 and %d",
 									item->number, maxOpNumber)));
-				processTypesSpec(item->args, &lefttype, &righttype);
+				processTypesSpec(item->class_args, &lefttype, &righttype);
 				/* Save the info */
 				member = (OpFamilyMember *) palloc0(sizeof(OpFamilyMember));
 				member->number = item->number;
@@ -1004,7 +1004,7 @@ AlterOpFamilyDrop(AlterOpFamilyStmt *stmt, Oid amoid, Oid opfamilyoid,
 							 errmsg("invalid procedure number %d,"
 									" must be between 1 and %d",
 									item->number, maxProcNumber)));
-				processTypesSpec(item->args, &lefttype, &righttype);
+				processTypesSpec(item->class_args, &lefttype, &righttype);
 				/* Save the info */
 				member = (OpFamilyMember *) palloc0(sizeof(OpFamilyMember));
 				member->number = item->number;
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
@@ -5910,15 +5910,15 @@ opclass_drop:
 					CreateOpClassItem *n = makeNode(CreateOpClassItem);
 					n->itemtype = OPCLASS_ITEM_OPERATOR;
 					n->number = $2;
-					n->args = $4;
+					n->class_args = $4;
 					$$ = (Node *) n;
 				}
 			| FUNCTION Iconst '(' type_list ')'
 				{
 					CreateOpClassItem *n = makeNode(CreateOpClassItem);
 					n->itemtype = OPCLASS_ITEM_FUNCTION;
 					n->number = $2;
-					n->args = $4;
+					n->class_args = $4;
 					$$ = (Node *) n;
 				}
 		;
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
@@ -2424,7 +2424,8 @@ typedef struct CreateOpClassItem
 	List	   *args;			/* argument types */
 	int			number;			/* strategy num or support proc num */
 	List	   *order_family;	/* only used for ordering operators */
-	List	   *class_args;		/* only used for functions */
+	List	   *class_args;		/* amproclefttype/amprocrighttype or
+								 * amoplefttype/amoprighttype */
 	/* fields used for a storagetype item: */
 	TypeName   *storedtype;		/* datatype stored in index */
 } CreateOpClassItem;

Original file line number	Diff line number	Diff line change
`@@ -5910,15 +5910,15 @@ opclass_drop:`
`5910`	`5910`	`CreateOpClassItem *n = makeNode(CreateOpClassItem);`
`5911`	`5911`	`n->itemtype = OPCLASS_ITEM_OPERATOR;`
`5912`	`5912`	`n->number = $2;`
`5913`		`- n->args = $4;`
	`5913`	`+ n->class_args = $4;`
`5914`	`5914`	`$$ = (Node *) n;`
`5915`	`5915`	`}`
`5916`	`5916`	`\| FUNCTION Iconst '(' type_list ')'`
`5917`	`5917`	`{`
`5918`	`5918`	`CreateOpClassItem *n = makeNode(CreateOpClassItem);`
`5919`	`5919`	`n->itemtype = OPCLASS_ITEM_FUNCTION;`
`5920`	`5920`	`n->number = $2;`
`5921`		`- n->args = $4;`
	`5921`	`+ n->class_args = $4;`
`5922`	`5922`	`$$ = (Node *) n;`
`5923`	`5923`	`}`
`5924`	`5924`	`;`