diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c index 8414b803722..5c64f519350 100644 --- a/src/backend/commands/indexcmds.c +++ b/src/backend/commands/indexcmds.c @@ -3788,6 +3788,7 @@ ReindexRelationConcurrently(const ReindexStmt *stmt, Oid relationOid, const Rein } ReindexIndexInfo; List *heapRelationIds = NIL; List *indexIds = NIL; + List *lockedIndexRels = NIL; List *newIndexIds = NIL; List *relationLocks = NIL; List *phase1Rels = NIL; @@ -4103,7 +4104,21 @@ ReindexRelationConcurrently(const ReindexStmt *stmt, Oid relationOid, const Rein * more detailed comments. */ + /* + * Open all indexes before phase 1 to prevent from potential index drop + * from the same transation during creating the new indexes. + */ foreach(lc, indexIds) + { + ReindexIndexInfo *idx = lfirst(lc); + Relation indexRel; + + indexRel = index_open(idx->indexId, ShareUpdateExclusiveLock); + + lockedIndexRels = lappend(lockedIndexRels, indexRel); + } + + forboth(lc, indexIds, lc2, lockedIndexRels) { char *concurrentName; ReindexIndexInfo *idx = lfirst(lc); @@ -4118,7 +4133,7 @@ ReindexRelationConcurrently(const ReindexStmt *stmt, Oid relationOid, const Rein LockRelId *lockrelid; Oid tablespaceid; - indexRel = index_open(idx->indexId, ShareUpdateExclusiveLock); + indexRel = lfirst(lc2); heapRel = table_open(indexRel->rd_index->indrelid, ShareUpdateExclusiveLock); @@ -4247,6 +4262,9 @@ ReindexRelationConcurrently(const ReindexStmt *stmt, Oid relationOid, const Rein } } + list_free(lockedIndexRels); + lockedIndexRels = NIL; + /* * Save the heap lock for following visibility checks with other backends * might conflict with this session. diff --git a/src/test/regress/expected/create_index.out b/src/test/regress/expected/create_index.out index 857603cd2b4..025eca2beb3 100644 --- a/src/test/regress/expected/create_index.out +++ b/src/test/regress/expected/create_index.out @@ -2914,9 +2914,9 @@ CREATE FUNCTION concur_reindex_ddl_f() RETURNS void LANGUAGE plpgsql AS CREATE FUNCTION concur_reindex_ddl_im(int) RETURNS int LANGUAGE plpgsql IMMUTABLE AS 'begin perform public.concur_reindex_ddl_f(); return $1; end'; -CREATE INDEX concur_reindex_ddl_ind1 ON concur_reindex_ddl_tab (i); CREATE INDEX concur_reindex_ddl_ind2 ON concur_reindex_ddl_tab ((i + concur_reindex_ddl_im(0))); +CREATE INDEX concur_reindex_ddl_ind1 ON concur_reindex_ddl_tab (i); CREATE OR REPLACE FUNCTION concur_reindex_ddl_f() RETURNS void LANGUAGE plpgsql AS 'begin DROP INDEX public.concur_reindex_ddl_ind1; end'; diff --git a/src/test/regress/sql/create_index.sql b/src/test/regress/sql/create_index.sql index 27e038fa808..a28a2dc3ba5 100644 --- a/src/test/regress/sql/create_index.sql +++ b/src/test/regress/sql/create_index.sql @@ -1173,9 +1173,9 @@ CREATE FUNCTION concur_reindex_ddl_f() RETURNS void LANGUAGE plpgsql AS CREATE FUNCTION concur_reindex_ddl_im(int) RETURNS int LANGUAGE plpgsql IMMUTABLE AS 'begin perform public.concur_reindex_ddl_f(); return $1; end'; -CREATE INDEX concur_reindex_ddl_ind1 ON concur_reindex_ddl_tab (i); CREATE INDEX concur_reindex_ddl_ind2 ON concur_reindex_ddl_tab ((i + concur_reindex_ddl_im(0))); +CREATE INDEX concur_reindex_ddl_ind1 ON concur_reindex_ddl_tab (i); CREATE OR REPLACE FUNCTION concur_reindex_ddl_f() RETURNS void LANGUAGE plpgsql AS 'begin DROP INDEX public.concur_reindex_ddl_ind1; end';