Rename get_subscription() to get_typsubscription()

Nikita Glukhov · Nikita Glukhov · commit 1947dcbc0178 · 2016-09-01T20:07:13.000+04:00
diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
@@ -269,8 +269,8 @@ ExecEvalSubscriptionRef(SubscriptionRefExprState *sbstate,
 						ExprDoneCond *isDone)
 {
 	SubscriptionRef		   *sbsRef = (SubscriptionRef *) sbstate->xprstate.expr;
-	Oid						containerType,
-							typsubscription;
+	Oid						containerType;
+	RegProcedure			typsubscription;
 	bool					isAssignment = (sbsRef->refassgnexpr != NULL);
 	bool					eisnull;
 	Datum				   *upper,
@@ -384,7 +384,7 @@ ExecEvalSubscriptionRef(SubscriptionRefExprState *sbstate,
 	sbsdata.indexprNumber = i;
 
 	containerType = getBaseTypeAndTypmod(sbsRef->refcontainertype, &sbsRef->reftypmod);
-	typsubscription = get_subscription(containerType);
+	typsubscription = get_typsubscription(containerType);
 
 	if (!OidIsValid(typsubscription))
 		/* this can't happen */
diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c
@@ -297,7 +297,7 @@ transformContainerSubscripts(ParseState *pstate,
 	ListCell		   *idx;
 	SubscriptionRef	   *sbsref,
 					   *prepared_sbsref;
-	Oid					typsubscription = get_subscription(containerType);
+	RegProcedure		typsubscription = get_typsubscription(containerType);
 
 	if (!OidIsValid(typsubscription))
 		ereport(ERROR,
diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c
@@ -3063,16 +3063,15 @@ get_range_subtype(Oid rangeOid)
 }
 
 /*
- * get_subscription
+ * get_typsubscription
  *
- *		Given the type OID, get the corresponding "true" array type.
- *		Returns InvalidOid if no array type can be found.
+ *		Given the type OID, return the type's typsubscription procedure, if any.
  */
-Oid
-get_subscription(Oid typid)
+RegProcedure
+get_typsubscription(Oid typid)
 {
-	HeapTuple	tp;
-	Oid			result = InvalidOid;
+	HeapTuple		tp;
+	RegProcedure	result = InvalidOid;
 
 	tp = SearchSysCache1(TYPEOID, ObjectIdGetDatum(typid));
 	if (HeapTupleIsValid(tp))
diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h
@@ -159,7 +159,7 @@ extern void free_attstatsslot(Oid atttype,
 extern char *get_namespace_name(Oid nspid);
 extern char *get_namespace_name_or_temp(Oid nspid);
 extern Oid	get_range_subtype(Oid rangeOid);
-extern Oid	get_subscription(Oid rangeOid);
+extern RegProcedure get_typsubscription(Oid typid);
 
 #define type_is_array(typid)  (get_element_type(typid) != InvalidOid)
 /* type_is_array_domain accepts both plain arrays and domains over arrays */
