From ed12fd247ec382b6e1f248596d12ae0d897c8d17 Mon Sep 17 00:00:00 2001 From: Justin Pryzby Date: Mon, 16 Mar 2020 08:21:08 -0500 Subject: [PATCH v7 2/2] Use get_index_isclustered in cluster.c --- src/backend/commands/cluster.c | 41 +++------------------------------- 1 file changed, 3 insertions(+), 38 deletions(-) diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c index 11ce1bb404..2040023ad6 100644 --- a/src/backend/commands/cluster.c +++ b/src/backend/commands/cluster.c @@ -139,21 +139,9 @@ cluster(ClusterStmt *stmt, bool isTopLevel) /* We need to find the index that has indisclustered set. */ foreach(index, RelationGetIndexList(rel)) { - HeapTuple idxtuple; - Form_pg_index indexForm; - indexOid = lfirst_oid(index); - idxtuple = SearchSysCache1(INDEXRELID, - ObjectIdGetDatum(indexOid)); - if (!HeapTupleIsValid(idxtuple)) - elog(ERROR, "cache lookup failed for index %u", indexOid); - indexForm = (Form_pg_index) GETSTRUCT(idxtuple); - if (indexForm->indisclustered) - { - ReleaseSysCache(idxtuple); + if (get_index_isclustered(indexOid)) break; - } - ReleaseSysCache(idxtuple); indexOid = InvalidOid; } @@ -304,9 +292,6 @@ cluster_rel(Oid tableOid, Oid indexOid, int options) */ if (recheck) { - HeapTuple tuple; - Form_pg_index indexForm; - /* Check that the user still owns the relation */ if (!pg_class_ownercheck(tableOid, GetUserId())) { @@ -345,22 +330,12 @@ cluster_rel(Oid tableOid, Oid indexOid, int options) /* * Check that the index is still the one with indisclustered set. */ - tuple = SearchSysCache1(INDEXRELID, ObjectIdGetDatum(indexOid)); - if (!HeapTupleIsValid(tuple)) /* probably can't happen */ - { - relation_close(OldHeap, AccessExclusiveLock); - pgstat_progress_end_command(); - return; - } - indexForm = (Form_pg_index) GETSTRUCT(tuple); - if (!indexForm->indisclustered) + if (!get_index_isclustered(indexOid)) { - ReleaseSysCache(tuple); relation_close(OldHeap, AccessExclusiveLock); pgstat_progress_end_command(); return; } - ReleaseSysCache(tuple); } } @@ -519,18 +494,8 @@ mark_index_clustered(Relation rel, Oid indexOid, bool is_internal) */ if (OidIsValid(indexOid)) { - indexTuple = SearchSysCache1(INDEXRELID, ObjectIdGetDatum(indexOid)); - if (!HeapTupleIsValid(indexTuple)) - elog(ERROR, "cache lookup failed for index %u", indexOid); - indexForm = (Form_pg_index) GETSTRUCT(indexTuple); - - if (indexForm->indisclustered) - { - ReleaseSysCache(indexTuple); + if (get_index_isclustered(indexOid)) return; - } - - ReleaseSysCache(indexTuple); } /* -- 2.17.0