Commit1947dcb

Nikita Glukhov

committed

Rename get_subscription() to get_typsubscription()

1 parentf4e27a0 commit1947dcbCopy full SHA for 1947dcb

File tree

+11

-12

lines changed

+11

-12

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -269,8 +269,8 @@ ExecEvalSubscriptionRef(SubscriptionRefExprState *sbstate,`
`269`	`269`	`ExprDoneCond*isDone)`
`270`	`270`	`{`
`271`	`271`	`SubscriptionRefsbsRef= (SubscriptionRef)sbstate->xprstate.expr;`
`272`		`-OidcontainerType,`
`273`		`-typsubscription;`
	`272`	`+OidcontainerType;`
	`273`	`+RegProceduretypsubscription;`
`274`	`274`	`boolisAssignment= (sbsRef->refassgnexpr!=NULL);`
`275`	`275`	`booleisnull;`
`276`	`276`	`Datum*upper,`
`@@ -384,7 +384,7 @@ ExecEvalSubscriptionRef(SubscriptionRefExprState *sbstate,`
`384`	`384`	`sbsdata.indexprNumber=i;`
`385`	`385`
`386`	`386`	`containerType=getBaseTypeAndTypmod(sbsRef->refcontainertype,&sbsRef->reftypmod);`
`387`		`-typsubscription=get_subscription(containerType);`
	`387`	`+typsubscription=get_typsubscription(containerType);`
`388`	`388`
`389`	`389`	`if (!OidIsValid(typsubscription))`
`390`	`390`	`/* this can't happen */`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,7 @@ transformContainerSubscripts(ParseState *pstate,`
`297`	`297`	`ListCell*idx;`
`298`	`298`	`SubscriptionRef*sbsref,`
`299`	`299`	`*prepared_sbsref;`
`300`		`-Oidtypsubscription=get_subscription(containerType);`
	`300`	`+RegProceduretypsubscription=get_typsubscription(containerType);`
`301`	`301`
`302`	`302`	`if (!OidIsValid(typsubscription))`
`303`	`303`	`ereport(ERROR,`

Lines changed: 6 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -3063,16 +3063,15 @@ get_range_subtype(Oid rangeOid)`
`3063`	`3063`	`}`
`3064`	`3064`
`3065`	`3065`	`/*`
`3066`		`- *get_subscription`
	`3066`	`+ *get_typsubscription`
`3067`	`3067`	`*`
`3068`		`- *Given the type OID, get the corresponding "true" array type.`
`3069`		`- *Returns InvalidOid if no array type can be found.`
	`3068`	`+ *Given the type OID, return the type's typsubscription procedure, if any.`
`3070`	`3069`	`*/`
`3071`		`-Oid`
`3072`		`-get_subscription(Oidtypid)`
	`3070`	`+RegProcedure`
	`3071`	`+get_typsubscription(Oidtypid)`
`3073`	`3072`	`{`
`3074`		`-HeapTupletp;`
`3075`		`-Oidresult=InvalidOid;`
	`3073`	`+HeapTupletp;`
	`3074`	`+RegProcedureresult=InvalidOid;`
`3076`	`3075`
`3077`	`3076`	`tp=SearchSysCache1(TYPEOID,ObjectIdGetDatum(typid));`
`3078`	`3077`	`if (HeapTupleIsValid(tp))`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ extern void free_attstatsslot(Oid atttype,`
`159`	`159`	`externchar*get_namespace_name(Oidnspid);`
`160`	`160`	`externchar*get_namespace_name_or_temp(Oidnspid);`
`161`	`161`	`externOidget_range_subtype(OidrangeOid);`
`162`		`-externOidget_subscription(OidrangeOid);`
	`162`	`+externRegProcedureget_typsubscription(Oidtypid);`
`163`	`163`
`164`	`164`	`#definetype_is_array(typid) (get_element_type(typid) != InvalidOid)`
`165`	`165`	`/* type_is_array_domain accepts both plain arrays and domains over arrays */`

Comments

(0)