Don't try to use a unopened relation

alvherre · alvherre · commit 9eb80f2ca75a · 2012-11-07T16:24:20.000-03:00
Commit 4c9d090 mistakenly introduced a call to TransferPredicateLocksToHeapRelation() on an index relation that had been closed a few lines above. Moving up an index_open() call that's below is enough to fix the problem. Discovered by me while testing an unrelated patch.
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
@@ -1464,6 +1464,8 @@ index_drop(Oid indexId, bool concurrent)
 		 * conflicts with existing predicate locks, so now is the time to move
 		 * them to the heap relation.
 		 */
+		userHeapRelation = heap_open(heapId, ShareUpdateExclusiveLock);
+		userIndexRelation = index_open(indexId, ShareUpdateExclusiveLock);
 		TransferPredicateLocksToHeapRelation(userIndexRelation);
 
 		/*
@@ -1473,9 +1475,6 @@ index_drop(Oid indexId, bool concurrent)
 		 */
 		indexRelation = heap_open(IndexRelationId, RowExclusiveLock);
 
-		userHeapRelation = heap_open(heapId, ShareUpdateExclusiveLock);
-		userIndexRelation = index_open(indexId, ShareUpdateExclusiveLock);
-
 		tuple = SearchSysCacheCopy1(INDEXRELID,
 									ObjectIdGetDatum(indexId));
 		if (!HeapTupleIsValid(tuple))
