Add objectSubId parameter to deleteDependencyRecordsForClass()

Nikita Glukhov · Nikita Glukhov · commit 21428e40630c · 2017-05-02T21:37:58.000+03:00
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
@@ -1191,7 +1191,7 @@ index_constraint_create(Relation heapRelation,
 	 * index into a UNIQUE or PRIMARY KEY constraint.
 	 */
 	if (remove_old_dependencies)
-		deleteDependencyRecordsForClass(RelationRelationId, indexRelationId,
+		deleteDependencyRecordsForClass(RelationRelationId, indexRelationId, 0,
 										RelationRelationId, DEPENDENCY_AUTO);
 
 	/*
diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c
@@ -238,14 +238,15 @@ deleteDependencyRecordsFor(Oid classId, Oid objectId,
  * extension membership).
  */
 long
-deleteDependencyRecordsForClass(Oid classId, Oid objectId,
+deleteDependencyRecordsForClass(Oid classId, Oid objectId, int32 objectSubId,
 								Oid refclassId, char deptype)
 {
 	long		count = 0;
 	Relation	depRel;
-	ScanKeyData key[2];
+	ScanKeyData key[3];
 	SysScanDesc scan;
 	HeapTuple	tup;
+	int			nkeys;
 
 	depRel = heap_open(DependRelationId, RowExclusiveLock);
 
@@ -257,9 +258,19 @@ deleteDependencyRecordsForClass(Oid classId, Oid objectId,
 				Anum_pg_depend_objid,
 				BTEqualStrategyNumber, F_OIDEQ,
 				ObjectIdGetDatum(objectId));
+	if (objectSubId != 0)
+	{
+		ScanKeyInit(&key[2],
+					Anum_pg_depend_objsubid,
+					BTEqualStrategyNumber, F_INT4EQ,
+					Int32GetDatum(objectSubId));
+		nkeys = 3;
+	}
+	else
+		nkeys = 2;
 
 	scan = systable_beginscan(depRel, DependDependerIndexId, true,
-							  NULL, 2, key);
+							  NULL, nkeys, key);
 
 	while (HeapTupleIsValid(tup = systable_getnext(scan)))
 	{
diff --git a/src/backend/commands/extension.c b/src/backend/commands/extension.c
@@ -3115,7 +3115,7 @@ ApplyExtensionUpdates(Oid extensionOid,
 		/*
 		 * Remove and recreate dependencies on prerequisite extensions
 		 */
-		deleteDependencyRecordsForClass(ExtensionRelationId, extensionOid,
+		deleteDependencyRecordsForClass(ExtensionRelationId, extensionOid, 0,
 										ExtensionRelationId,
 										DEPENDENCY_NORMAL);
 
@@ -3257,7 +3257,7 @@ ExecAlterExtensionContentsStmt(AlterExtensionContentsStmt *stmt,
 		/*
 		 * OK, drop the dependency.
 		 */
-		if (deleteDependencyRecordsForClass(object.classId, object.objectId,
+		if (deleteDependencyRecordsForClass(object.classId, object.objectId, 0,
 											ExtensionRelationId,
 											DEPENDENCY_EXTENSION) != 1)
 			elog(ERROR, "unexpected number of extension dependency records");
diff --git a/src/backend/commands/foreigncmds.c b/src/backend/commands/foreigncmds.c
@@ -800,6 +800,7 @@ AlterForeignDataWrapper(AlterFdwStmt *stmt)
 		 */
 		deleteDependencyRecordsForClass(ForeignDataWrapperRelationId,
 										fdwId,
+										0,
 										ProcedureRelationId,
 										DEPENDENCY_NORMAL);
 
diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c
@@ -1727,7 +1727,7 @@ process_owned_by(Relation seqrel, List *owned_by, bool for_identity)
 	 * dependencies for the sequence, then optionally add a new one.
 	 */
 	deleteDependencyRecordsForClass(RelationRelationId, RelationGetRelid(seqrel),
-									RelationRelationId, deptype);
+									0, RelationRelationId, deptype);
 
 	if (tablerel)
 	{
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
@@ -6129,7 +6129,7 @@ ATExecDropIdentity(Relation rel, const char *colName, bool missing_ok, LOCKMODE
 
 	/* drop the internal sequence */
 	seqid = getOwnedSequence(RelationGetRelid(rel), attnum);
-	deleteDependencyRecordsForClass(RelationRelationId, seqid,
+	deleteDependencyRecordsForClass(RelationRelationId, seqid, 0,
 									RelationRelationId, DEPENDENCY_INTERNAL);
 	CommandCounterIncrement();
 	seqaddress.classId = RelationRelationId;
diff --git a/src/include/catalog/dependency.h b/src/include/catalog/dependency.h
@@ -231,6 +231,7 @@ extern long deleteDependencyRecordsFor(Oid classId, Oid objectId,
 						   bool skipExtensionDeps);
 
 extern long deleteDependencyRecordsForClass(Oid classId, Oid objectId,
+								int32 objectSubId,
 								Oid refclassId, char deptype);
 
 extern long changeDependencyFor(Oid classId, Oid objectId,

Original file line number	Diff line number	Diff line change
`@@ -1727,7 +1727,7 @@ process_owned_by(Relation seqrel, List *owned_by, bool for_identity)`
`1727`	`1727`	`* dependencies for the sequence, then optionally add a new one.`
`1728`	`1728`	`*/`
`1729`	`1729`	`deleteDependencyRecordsForClass(RelationRelationId, RelationGetRelid(seqrel),`
`1730`		`- RelationRelationId, deptype);`
	`1730`	`+ 0, RelationRelationId, deptype);`
`1731`	`1731`
`1732`	`1732`	`if (tablerel)`
`1733`	`1733`	`{`