From 40b5d7d7baefdd824283597adad866ea42dcdc42 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Wed, 28 Dec 2016 12:00:00 -0500 Subject: [PATCH v2 1/6] Use class_args field in opclass_drop This makes it consistent with the usage in opclass_item. --- src/backend/commands/opclasscmds.c | 4 ++-- src/backend/parser/gram.y | 4 ++-- src/include/nodes/parsenodes.h | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c index 5f2364bccf..9bd50a3bec 100644 --- 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 index e833b2eba5..4921b8a1ad 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -5910,7 +5910,7 @@ 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 ')' @@ -5918,7 +5918,7 @@ opclass_drop: 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 index 5afc3ebea0..a9d0d08b53 100644 --- 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; -- 2.11.1