diff --git a/doc/src/sgml/ref/reindex.sgml b/doc/src/sgml/ref/reindex.sgml index 7222665..2931329 100644 --- a/doc/src/sgml/ref/reindex.sgml +++ b/doc/src/sgml/ref/reindex.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation -REINDEX { INDEX | TABLE | DATABASE | SYSTEM } name [ FORCE ] +REINDEX { INDEX | TABLE | DATABASE | SYSTEM } name [ FORCE ] [ CONCURRENTLY ] @@ -68,9 +68,10 @@ REINDEX { INDEX | TABLE | DATABASE | SYSTEM } nam An index build with the CONCURRENTLY option failed, leaving an invalid index. Such indexes are useless but it can be convenient to use REINDEX to rebuild them. Note that - REINDEX will not perform a concurrent build. To build the - index without interfering with production you should drop the index and - reissue the CREATE INDEX CONCURRENTLY command. + REINDEX will not perform a concurrent build if + CONCURRENTLY is not specified. To build the index without interfering + with production you should drop the index and reissue the CREATE + INDEX CONCURRENTLY or REINDEX CONCURRENTLY command. @@ -139,6 +140,21 @@ REINDEX { INDEX | TABLE | DATABASE | SYSTEM } nam + CONCURRENTLY + + + When this option is used, PostgreSQL will rebuild the + index without taking any locks that prevent concurrent inserts, + updates, or deletes on the table; whereas a standard reindex build + locks out writes (but not reads) on the table until it's done. + There are several caveats to be aware of when using this option + — see . + + + + + FORCE @@ -231,6 +247,93 @@ REINDEX { INDEX | TABLE | DATABASE | SYSTEM } nam to be reindexed by separate commands. This is still possible, but redundant. + + + + Rebuilding Indexes Concurrently + + + index + rebuilding concurrently + + + + Rebuilding an index can interfere with regular operation of a database. + Normally PostgreSQL locks the table whose index is rebuilt + against writes and performs the entire index build with a single scan of the + table. Other transactions can still read the table, but if they try to + insert, update, or delete rows in the table they will block until the + index rebuild is finished. This could have a severe effect if the system is + a live production database. Very large tables can take many hours to be + indexed, and even for smaller tables, an index rebuild can lock out writers + for periods that are unacceptably long for a production system. + + + + PostgreSQL supports rebuilding indexes without locking + out writes. This method is invoked by specifying the + CONCURRENTLY option of REINDEX. + When this option is used, PostgreSQL must perform two + scans of the table for each index that needs to be rebuild and in + addition it must wait for all existing transactions that could potentially + use the index to terminate. This method requires more total work than a + standard index rebuild and takes significantly longer to complete as it + needs to wait for unfinished transactiions that might modify the index. + However, since it allows normal operations to continue while the index + is rebuilt, this method is useful for rebuilding indexes in a production + environment. Of course, the extra CPU, memory and I/O load imposed by + the index rebuild might slow other operations. + + + + In a concurrent index build, a new index that will replace the one to + be rebuild is actually entered into the system catalogs in one transaction, + then two table scans occur in two more transactions and to make the new + index valid from the other backends. Once this is performed, the old + and fresh indexes are swapped in, and the old index is marked as invalid + in a third transaction. Finally two additional transactions are used to mark + the old index as not ready and then drop it. + + + + If a problem arises while rebuilding the indexes, such as a + uniqueness violation in a unique index, the REINDEX + command will fail but leave behind an invalid new index on top + of the existing one. This index will be ignored for querying purposes + because it might be incomplete; however it will still consume update + overhead. The psql \d command will report + such an index as INVALID: + + +postgres=# \d tab + Table "public.tab" + Column | Type | Modifiers +--------+---------+----------- + col | integer | +Indexes: + "idx" btree (col) + "idx_cct" btree (col) INVALID + + + The recommended recovery method in such cases is to drop the concurrent + index and try again to perform REINDEX CONCURRENTLY once again. + The concurrent index created during the processing has a name finishing by + the suffix cct. + + + + Regular index builds permit other regular index builds on the + same table to occur in parallel, but only one concurrent index build + can occur on a table at a time. In both cases, no other types of schema + modification on the table are allowed meanwhile. Another difference + is that a regular REINDEX TABLE or REINDEX INDEX + command can be performed within a transaction block, but + REINDEX CONCURRENTLY cannot. REINDEX DATABASE is + by default not allowed to run inside a transaction block, so in this case + CONCURRENTLY is not supported. + + + diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c index 66012ac..90deb5c 100644 --- a/src/backend/catalog/index.c +++ b/src/backend/catalog/index.c @@ -671,6 +671,10 @@ UpdateIndexRelation(Oid indexoid, * will be marked "invalid" and the caller must take additional steps * to fix it up. * is_internal: if true, post creation hook for new index + * is_reindex: if true, create an index that is used as a duplicate of an + * existing index created during a concurrent operation. This index can + * also be a toast relation. Sufficient locks are normally taken on + * the related relations once this is called during a concurrent operation. * * Returns the OID of the created index. */ @@ -694,7 +698,8 @@ index_create(Relation heapRelation, bool allow_system_table_mods, bool skip_build, bool concurrent, - bool is_internal) + bool is_internal, + bool is_reindex) { Oid heapRelationId = RelationGetRelid(heapRelation); Relation pg_class; @@ -730,26 +735,31 @@ index_create(Relation heapRelation, if (!allow_system_table_mods && IsSystemRelation(heapRelation) && - IsNormalProcessingMode()) + IsNormalProcessingMode() && + !is_reindex) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("user-defined indexes on system catalog tables are not supported"))); /* * concurrent index build on a system catalog is unsafe because we tend to - * release locks before committing in catalogs + * release locks before committing in catalogs. If the index is created during + * a REINDEX CONCURRENTLY operation, sufficient locks are already taken. */ if (concurrent && - IsSystemRelation(heapRelation)) + IsSystemRelation(heapRelation) && + !is_reindex) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg("concurrent index creation on system catalog tables is not supported"))); /* * This case is currently not supported, but there's no way to ask for it - * in the grammar anyway, so it can't happen. + * in the grammar anyway, so it can't happen. This might be called during a + * conccurrent reindex operation, in this case sufficient locks are already + * taken on the related relations. */ - if (concurrent && is_exclusion) + if (concurrent && is_exclusion && !is_reindex) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), errmsg_internal("concurrent index creation for exclusion constraints is not supported"))); @@ -1095,6 +1105,243 @@ index_create(Relation heapRelation, return indexRelationId; } + +/* + * index_concurrent_create + * + * Create an index based on the given one that will be used for concurrent + * operations. The index is inserted into catalogs and needs to be built later + * on. This is called during concurrent index processing. The heap relation + * on which is based the index needs to be closed by the caller. + */ +Oid +index_concurrent_create(Relation heapRelation, Oid indOid, char *concurrentName) +{ + Relation indexRelation; + IndexInfo *indexInfo; + Oid concurrentOid = InvalidOid; + List *columnNames = NIL; + int i; + HeapTuple indexTuple; + Datum indclassDatum, indoptionDatum; + oidvector *indclass; + int2vector *indcoloptions; + bool isnull; + bool isconstraint; + bool initdeferred = false; + Oid constraintOid = get_index_constraint(indOid); + + indexRelation = index_open(indOid, RowExclusiveLock); + + /* Concurrent index uses the same index information as former index */ + indexInfo = BuildIndexInfo(indexRelation); + + /* + * Determine if index is initdeferred, this depends on its dependent + * constraint. + */ + if (OidIsValid(constraintOid)) + { + /* Look for the correct value */ + HeapTuple constTuple; + Form_pg_constraint constraint; + + constTuple = SearchSysCache1(CONSTROID, + ObjectIdGetDatum(constraintOid)); + if (!HeapTupleIsValid(constTuple)) + elog(ERROR, "cache lookup failed for constraint %u", + constraintOid); + constraint = (Form_pg_constraint) GETSTRUCT(constTuple); + initdeferred = constraint->condeferred; + + ReleaseSysCache(constTuple); + } + + /* Build the list of column names, necessary for index_create */ + for (i = 0; i < indexInfo->ii_NumIndexAttrs; i++) + { + AttrNumber attnum = indexInfo->ii_KeyAttrNumbers[i]; + Form_pg_attribute attform = heapRelation->rd_att->attrs[attnum - 1];; + + /* Pick up column name from the relation */ + columnNames = lappend(columnNames, pstrdup(NameStr(attform->attname))); + } + + /* + * Index is considered as a constraint if it is UNIQUE, PRIMARY KEY or + * EXCLUSION. + */ + isconstraint = indexRelation->rd_index->indisunique || + indexRelation->rd_index->indisprimary || + indexRelation->rd_index->indisexclusion; + + /* Get the array of class and column options IDs from index info */ + indexTuple = SearchSysCache1(INDEXRELID, ObjectIdGetDatum(indOid)); + if (!HeapTupleIsValid(indexTuple)) + elog(ERROR, "cache lookup failed for index %u", indOid); + indclassDatum = SysCacheGetAttr(INDEXRELID, indexTuple, + Anum_pg_index_indclass, &isnull); + Assert(!isnull); + indclass = (oidvector *) DatumGetPointer(indclassDatum); + + indoptionDatum = SysCacheGetAttr(INDEXRELID, indexTuple, + Anum_pg_index_indoption, &isnull); + Assert(!isnull); + indcoloptions = (int2vector *) DatumGetPointer(indoptionDatum); + + /* Now create the concurrent index */ + concurrentOid = index_create(heapRelation, + (const char*)concurrentName, + InvalidOid, + InvalidOid, + indexInfo, + columnNames, + indexRelation->rd_rel->relam, + indexRelation->rd_rel->reltablespace, + indexRelation->rd_indcollation, + indclass->values, + indcoloptions->values, + (Datum) indexRelation->rd_options, + indexRelation->rd_index->indisprimary, + isconstraint, /* is constraint? */ + !indexRelation->rd_index->indimmediate, /* is deferrable? */ + initdeferred, /* is initially deferred? */ + true, /* allow table to be a system catalog? */ + true, /* skip build? */ + true, /* concurrent? */ + false, /* is_internal */ + true); /* reindex? */ + + /* Close the relations used and clean up */ + index_close(indexRelation, RowExclusiveLock); + ReleaseSysCache(indexTuple); + + return concurrentOid; +} + + +/* + * index_concurrent_build + * + * Build index for a concurrent operation. Low-level locks are taken when this + * operation is performed to prevent only schema changes. + */ +void +index_concurrent_build(Oid heapOid, + Oid indexOid, + bool isprimary) +{ + Relation rel, + indexRelation; + IndexInfo *indexInfo; + + /* Open and lock the parent heap relation */ + rel = heap_open(heapOid, ShareUpdateExclusiveLock); + + /* And the target index relation */ + indexRelation = index_open(indexOid, RowExclusiveLock); + + /* We have to re-build the IndexInfo struct, since it was lost in commit */ + indexInfo = BuildIndexInfo(indexRelation); + Assert(!indexInfo->ii_ReadyForInserts); + indexInfo->ii_Concurrent = true; + indexInfo->ii_BrokenHotChain = false; + + /* Now build the index */ + index_build(rel, indexRelation, indexInfo, isprimary, false); + + /* Close both the relations, but keep the locks */ + heap_close(rel, NoLock); + index_close(indexRelation, NoLock); +} + + +/* + * index_concurrent_swap + * + * Replace old index by old index in a concurrent context. For the time being + * what is done here is switching the relation names of the indexes. If extra + * operations are necessary during a concurrent swap, processing should be + * added here. + */ +void +index_concurrent_swap(Oid newIndexOid, Oid oldIndexOid) +{ + char nameNew[NAMEDATALEN], + nameOld[NAMEDATALEN], + nameTemp[NAMEDATALEN]; + + /* The new index is going to use the name of the old index */ + snprintf(nameNew, NAMEDATALEN, "%s", get_rel_name(newIndexOid)); + snprintf(nameOld, NAMEDATALEN, "%s", get_rel_name(oldIndexOid)); + + /* Change the name of old index to something temporary */ + snprintf(nameTemp, NAMEDATALEN, "cct_%d", oldIndexOid); + RenameRelationInternal(oldIndexOid, nameTemp); + + /* Make the catalog update visible */ + CommandCounterIncrement(); + + /* Change the name of the new index with the old one */ + RenameRelationInternal(newIndexOid, nameOld); + + /* Make the catalog update visible */ + CommandCounterIncrement(); + + /* Finally change the name of old index with name of the new one */ + RenameRelationInternal(oldIndexOid, nameNew); + + /* Make the catalog update visible */ + CommandCounterIncrement(); +} + + +/* + * index_concurrent_drop + * + * Drop a list of indexes in a concurrent process. Deletion has to be done + * through performDeletion or dependencies of the index are not dropped. + */ +void +index_concurrent_drop(List *indexIds) +{ + ListCell *lc; + ObjectAddresses *objects = new_object_addresses(); + + Assert(indexIds != NIL); + + /* Scan the list of indexes and build object list for normal indexes */ + foreach(lc, indexIds) + { + Oid indexOid = lfirst_oid(lc); + Oid constraintOid = get_index_constraint(indexOid); + ObjectAddress object; + + /* Register constraint or index for drop */ + if (OidIsValid(constraintOid)) + { + object.classId = ConstraintRelationId; + object.objectId = constraintOid; + } + else + { + object.classId = RelationRelationId; + object.objectId = indexOid; + } + + object.objectSubId = 0; + + /* Add object to list */ + add_exact_object_address(&object, objects); + } + + /* Perform deletion for normal and toast indexes */ + performMultipleDeletions(objects, + PERFORM_DELETION_CONCURRENTLY, + 0); +} + + /* * index_constraint_create * @@ -1325,7 +1572,6 @@ index_drop(Oid indexId, bool concurrent) indexrelid; LOCKTAG heaplocktag; LOCKMODE lockmode; - VirtualTransactionId *old_lockholders; /* * To drop an index safely, we must grab exclusive lock on its parent @@ -1464,13 +1710,7 @@ index_drop(Oid indexId, bool concurrent) * not check for that. Also, prepared xacts are not reported, which * is fine since they certainly aren't going to do anything more. */ - old_lockholders = GetLockConflicts(&heaplocktag, AccessExclusiveLock); - - while (VirtualTransactionIdIsValid(*old_lockholders)) - { - VirtualXactLock(*old_lockholders, true); - old_lockholders++; - } + WaitForVirtualLocks(heaplocktag, AccessExclusiveLock); /* * No more predicate locks will be acquired on this index, and we're @@ -1514,13 +1754,7 @@ index_drop(Oid indexId, bool concurrent) * Wait till every transaction that saw the old index state has * finished. The logic here is the same as above. */ - old_lockholders = GetLockConflicts(&heaplocktag, AccessExclusiveLock); - - while (VirtualTransactionIdIsValid(*old_lockholders)) - { - VirtualXactLock(*old_lockholders, true); - old_lockholders++; - } + WaitForVirtualLocks(heaplocktag, AccessExclusiveLock); /* * Re-open relations to allow us to complete our actions. diff --git a/src/backend/catalog/toasting.c b/src/backend/catalog/toasting.c index 2979819..5181dbc 100644 --- a/src/backend/catalog/toasting.c +++ b/src/backend/catalog/toasting.c @@ -280,7 +280,7 @@ create_toast_table(Relation rel, Oid toastOid, Oid toastIndexOid, Datum reloptio rel->rd_rel->reltablespace, collationObjectId, classObjectId, coloptions, (Datum) 0, true, false, false, false, - true, false, false, true); + true, false, false, false, true); heap_close(toast_rel, NoLock); diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c index 75f9ff1..2bcf5b5 100644 --- a/src/backend/commands/indexcmds.c +++ b/src/backend/commands/indexcmds.c @@ -68,8 +68,9 @@ static void ComputeIndexAttrs(IndexInfo *indexInfo, static Oid GetIndexOpClass(List *opclass, Oid attrType, char *accessMethodName, Oid accessMethodId); static char *ChooseIndexName(const char *tabname, Oid namespaceId, - List *colnames, List *exclusionOpNames, - bool primary, bool isconstraint); + List *colnames, List *exclusionOpNames, + bool primary, bool isconstraint, + bool concurrent); static char *ChooseIndexNameAddition(List *colnames); static List *ChooseIndexColumnNames(List *indexElems); static void RangeVarCallbackForReindexIndex(const RangeVar *relation, @@ -311,7 +312,6 @@ DefineIndex(IndexStmt *stmt, Oid tablespaceId; List *indexColNames; Relation rel; - Relation indexRelation; HeapTuple tuple; Form_pg_am accessMethodForm; bool amcanorder; @@ -320,13 +320,9 @@ DefineIndex(IndexStmt *stmt, int16 *coloptions; IndexInfo *indexInfo; int numberOfAttributes; - VirtualTransactionId *old_lockholders; - VirtualTransactionId *old_snapshots; - int n_old_snapshots; LockRelId heaprelid; LOCKTAG heaplocktag; Snapshot snapshot; - int i; /* * count attributes in index @@ -452,7 +448,8 @@ DefineIndex(IndexStmt *stmt, indexColNames, stmt->excludeOpNames, stmt->primary, - stmt->isconstraint); + stmt->isconstraint, + false); /* * look up the access method, verify it can handle the requested features @@ -599,7 +596,7 @@ DefineIndex(IndexStmt *stmt, stmt->isconstraint, stmt->deferrable, stmt->initdeferred, allowSystemTableMods, skip_build || stmt->concurrent, - stmt->concurrent, !check_rights); + stmt->concurrent, !check_rights, false); /* Add any requested comment */ if (stmt->idxcomment != NULL) @@ -662,18 +659,8 @@ DefineIndex(IndexStmt *stmt, * one of the transactions in question is blocked trying to acquire an * exclusive lock on our table. The lock code will detect deadlock and * error out properly. - * - * Note: GetLockConflicts() never reports our own xid, hence we need not - * check for that. Also, prepared xacts are not reported, which is fine - * since they certainly aren't going to do anything more. */ - old_lockholders = GetLockConflicts(&heaplocktag, ShareLock); - - while (VirtualTransactionIdIsValid(*old_lockholders)) - { - VirtualXactLock(*old_lockholders, true); - old_lockholders++; - } + WaitForVirtualLocks(heaplocktag, ShareLock); /* * At this moment we are sure that there are no transactions with the @@ -693,27 +680,13 @@ DefineIndex(IndexStmt *stmt, * HOT-chain or the extension of the chain is HOT-safe for this index. */ - /* Open and lock the parent heap relation */ - rel = heap_openrv(stmt->relation, ShareUpdateExclusiveLock); - - /* And the target index relation */ - indexRelation = index_open(indexRelationId, RowExclusiveLock); - /* Set ActiveSnapshot since functions in the indexes may need it */ PushActiveSnapshot(GetTransactionSnapshot()); - /* We have to re-build the IndexInfo struct, since it was lost in commit */ - indexInfo = BuildIndexInfo(indexRelation); - Assert(!indexInfo->ii_ReadyForInserts); - indexInfo->ii_Concurrent = true; - indexInfo->ii_BrokenHotChain = false; - - /* Now build the index */ - index_build(rel, indexRelation, indexInfo, stmt->primary, false); - - /* Close both the relations, but keep the locks */ - heap_close(rel, NoLock); - index_close(indexRelation, NoLock); + /* Perform concurrent build of index */ + index_concurrent_build(RangeVarGetRelid(stmt->relation, NoLock, false), + indexRelationId, + stmt->primary); /* * Update the pg_index row to mark the index as ready for inserts. Once we @@ -737,13 +710,7 @@ DefineIndex(IndexStmt *stmt, * We once again wait until no transaction can have the table open with * the index marked as read-only for updates. */ - old_lockholders = GetLockConflicts(&heaplocktag, ShareLock); - - while (VirtualTransactionIdIsValid(*old_lockholders)) - { - VirtualXactLock(*old_lockholders, true); - old_lockholders++; - } + WaitForVirtualLocks(heaplocktag, ShareLock); /* * Now take the "reference snapshot" that will be used by validate_index() @@ -772,74 +739,9 @@ DefineIndex(IndexStmt *stmt, * The index is now valid in the sense that it contains all currently * interesting tuples. But since it might not contain tuples deleted just * before the reference snap was taken, we have to wait out any - * transactions that might have older snapshots. Obtain a list of VXIDs - * of such transactions, and wait for them individually. - * - * We can exclude any running transactions that have xmin > the xmin of - * our reference snapshot; their oldest snapshot must be newer than ours. - * We can also exclude any transactions that have xmin = zero, since they - * evidently have no live snapshot at all (and any one they might be in - * process of taking is certainly newer than ours). Transactions in other - * DBs can be ignored too, since they'll never even be able to see this - * index. - * - * We can also exclude autovacuum processes and processes running manual - * lazy VACUUMs, because they won't be fazed by missing index entries - * either. (Manual ANALYZEs, however, can't be excluded because they - * might be within transactions that are going to do arbitrary operations - * later.) - * - * Also, GetCurrentVirtualXIDs never reports our own vxid, so we need not - * check for that. - * - * If a process goes idle-in-transaction with xmin zero, we do not need to - * wait for it anymore, per the above argument. We do not have the - * infrastructure right now to stop waiting if that happens, but we can at - * least avoid the folly of waiting when it is idle at the time we would - * begin to wait. We do this by repeatedly rechecking the output of - * GetCurrentVirtualXIDs. If, during any iteration, a particular vxid - * doesn't show up in the output, we know we can forget about it. + * transactions that might have older snapshots. */ - old_snapshots = GetCurrentVirtualXIDs(snapshot->xmin, true, false, - PROC_IS_AUTOVACUUM | PROC_IN_VACUUM, - &n_old_snapshots); - - for (i = 0; i < n_old_snapshots; i++) - { - if (!VirtualTransactionIdIsValid(old_snapshots[i])) - continue; /* found uninteresting in previous cycle */ - - if (i > 0) - { - /* see if anything's changed ... */ - VirtualTransactionId *newer_snapshots; - int n_newer_snapshots; - int j; - int k; - - newer_snapshots = GetCurrentVirtualXIDs(snapshot->xmin, - true, false, - PROC_IS_AUTOVACUUM | PROC_IN_VACUUM, - &n_newer_snapshots); - for (j = i; j < n_old_snapshots; j++) - { - if (!VirtualTransactionIdIsValid(old_snapshots[j])) - continue; /* found uninteresting in previous cycle */ - for (k = 0; k < n_newer_snapshots; k++) - { - if (VirtualTransactionIdEquals(old_snapshots[j], - newer_snapshots[k])) - break; - } - if (k >= n_newer_snapshots) /* not there anymore */ - SetInvalidVirtualTransactionId(old_snapshots[j]); - } - pfree(newer_snapshots); - } - - if (VirtualTransactionIdIsValid(old_snapshots[i])) - VirtualXactLock(old_snapshots[i], true); - } + WaitForOldSnapshots(snapshot); /* * Index can now be marked valid -- update its pg_index entry @@ -852,7 +754,7 @@ DefineIndex(IndexStmt *stmt, * relcache inval on the parent table to force replanning of cached plans. * Otherwise existing sessions might fail to use the new index where it * would be useful. (Note that our earlier commits did not create reasons - * to replan; so relcache flush on the index itself was sufficient.) + * to replan; relcache flush on the index itself was sufficient.) */ CacheInvalidateRelcacheByRelid(heaprelid.relId); @@ -872,6 +774,447 @@ DefineIndex(IndexStmt *stmt, /* + * ReindexConcurrentIndexes + * + * Process REINDEX CONCURRENTLY for given list of indexes. + * Each reindexing step is done simultaneously for all the given + * indexes. If no list of indexes is given by the caller, all the + * indexes included in the relation will be reindexed. + */ +bool +ReindexConcurrentIndexes(Oid heapOid, List *indexIds) +{ + Relation heapRelation; + List *concurrentIndexIds = NIL, + *indexLocks = NIL, + *realIndexIds = NIL; + ListCell *lc, *lc2; + LockRelId heapLockId; + LOCKTAG heapLocktag; + Snapshot snapshot; + + /* + * Phase 1 of REINDEX CONCURRENTLY + * + * Here begins the process for rebuilding concurrently the indexes. + * We need first to create an index which is based on the same data + * as the former index except that it will be only registered in catalogs + * and will be built after. It is possible to perform all the operations + * on all the indexes at the same time for a parent relation including + * its indexes for toast relation. + */ + + /* + * Lock level used here should match index lock index_concurrent_create(), + * this prevents schema changes on the relation. + */ + heapRelation = heap_open(heapOid, ShareUpdateExclusiveLock); + + /* + * Get the list of indexes from relation if caller has not given anything + * Invalid indexes cannot be reindexed concurrently. Such indexes are simply + * bypassed if caller has not specified anything. + */ + if (indexIds == NIL) + { + ListCell *cell; + foreach(cell, RelationGetIndexList(heapRelation)) + { + Oid cellOid = lfirst_oid(cell); + Relation indexRelation = index_open(cellOid, ShareUpdateExclusiveLock); + + if (!indexRelation->rd_index->indisvalid) + ereport(ERROR, + (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), + errmsg("cannot reindex concurrently invalid index \"%s.%s\"", + get_namespace_name(get_rel_namespace(cellOid)), + get_rel_name(cellOid)))); + + index_close(indexRelation, ShareUpdateExclusiveLock); + realIndexIds = lappend_oid(realIndexIds, cellOid); + } + + /* Add also the toast indexes */ + if (OidIsValid(heapRelation->rd_rel->reltoastrelid)) + { + Oid toastOid = heapRelation->rd_rel->reltoastrelid; + Relation toastRelation = heap_open(toastOid, ShareUpdateExclusiveLock); + + foreach(cell, RelationGetIndexList(toastRelation)) + { + Oid cellOid = lfirst_oid(cell); + Relation indexRelation = index_open(cellOid, ShareUpdateExclusiveLock); + + if (!indexRelation->rd_index->indisvalid) + ereport(ERROR, + (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), + errmsg("cannot reindex concurrently invalid index \"%s.%s\"", + get_namespace_name(get_rel_namespace(cellOid)), + get_rel_name(cellOid)))); + + index_close(indexRelation, ShareUpdateExclusiveLock); + realIndexIds = lappend_oid(realIndexIds, cellOid); + } + + heap_close(toastRelation, ShareUpdateExclusiveLock); + } + } + else + { + ListCell *cell; + List *filteredList = NIL; + foreach(cell, indexIds) + { + Oid cellOid = lfirst_oid(cell); + Relation indexRelation = index_open(cellOid, ShareUpdateExclusiveLock); + + /* Invalid indexes are not reindexed */ + if (!indexRelation->rd_index->indisvalid) + ereport(WARNING, + (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), + errmsg("cannot reindex concurrently invalid index \"%s.%s\", bypassing", + get_namespace_name(get_rel_namespace(cellOid)), + get_rel_name(cellOid)))); + else + filteredList = lappend_oid(filteredList, cellOid); + + /* Close relation */ + index_close(indexRelation, ShareUpdateExclusiveLock); + } + realIndexIds = filteredList; + } + + /* Definetely no indexes, so leave */ + if (realIndexIds == NIL) + { + heap_close(heapRelation, NoLock); + return false; + } + + /* Relation on which is based index cannot be shared */ + if (heapRelation->rd_rel->relisshared) + ereport(ERROR, + (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), + errmsg("concurrent reindex is not supported for shared relations"))); + + /* Do the concurrent index creation for each index */ + foreach(lc, realIndexIds) + { + char *concurrentName; + Oid indOid = lfirst_oid(lc); + Oid concurrentOid = InvalidOid; + Relation indexRel, + indexParentRel, + indexConcurrentRel; + LockRelId lockrelid; + + indexRel = index_open(indOid, ShareUpdateExclusiveLock); + /* Open the index parent relation, might be a toast or parent relation */ + indexParentRel = heap_open(indexRel->rd_index->indrelid, + ShareUpdateExclusiveLock); + + /* Choose a relation name for concurrent index */ + concurrentName = ChooseIndexName(get_rel_name(indOid), + get_rel_namespace(indexRel->rd_index->indrelid), + NULL, + false, + false, + false, + true); + + /* Create concurrent index based on given index */ + concurrentOid = index_concurrent_create(indexParentRel, + indOid, + concurrentName); + + /* Now open the relation of concurrent index, a lock is also needed on it */ + indexConcurrentRel = index_open(concurrentOid, ShareUpdateExclusiveLock); + + /* Save the concurrent index Oid */ + concurrentIndexIds = lappend_oid(concurrentIndexIds, concurrentOid); + + /* + * Save lockrelid to protect each concurrent relation from drop + * then close relations. + */ + lockrelid = indexRel->rd_lockInfo.lockRelId; + indexLocks = lappend(indexLocks, &lockrelid); + lockrelid = indexConcurrentRel->rd_lockInfo.lockRelId; + indexLocks = lappend(indexLocks, &lockrelid); + + index_close(indexRel, NoLock); + index_close(indexConcurrentRel, NoLock); + heap_close(indexParentRel, NoLock); + } + + /* + * Save the heap lock for following visibility checks with other backends + * might conflict with this session. + */ + heapLockId = heapRelation->rd_lockInfo.lockRelId; + SET_LOCKTAG_RELATION(heapLocktag, heapLockId.dbId, heapLockId.relId); + + /* Close heap relation */ + heap_close(heapRelation, NoLock); + + /* + * For a concurrent build, it is necessary to make the catalog entries + * visible to the other transactions before actually building the index. + * This will prevent them from making incompatible HOT updates. The index + * is marked as not ready and invalid so as no other transactions will try + * to use it for INSERT or SELECT. + * + * Before committing, get a session level lock on the relation, the + * concurrent index and its copy to insure that none of them are dropped + * until the operation is done. + */ + LockRelationIdForSession(&heapLockId, ShareUpdateExclusiveLock); + + /* Lock each index and each concurrent index accordingly */ + foreach(lc, indexLocks) + { + LockRelId lockRel = * (LockRelId *) lfirst(lc); + LockRelationIdForSession(&lockRel, ShareUpdateExclusiveLock); + } + + PopActiveSnapshot(); + CommitTransactionCommand(); + StartTransactionCommand(); + + /* + * Phase 2 of REINDEX CONCURRENTLY + * + * We need to wait until no running transactions could have the table open with + * the old list of indexes. A concurrent build is done for each concurrent + * index that will replace the old indexes. All those indexes share the same + * snapshot and they are built in the same transaction. + */ + WaitForVirtualLocks(heapLocktag, ShareLock); + + /* Set ActiveSnapshot since functions in the indexes may need it */ + PushActiveSnapshot(GetTransactionSnapshot()); + + /* Get the first element of concurrent index list */ + lc2 = list_head(concurrentIndexIds); + + foreach(lc, realIndexIds) + { + Relation indexRel; + Oid indOid = lfirst_oid(lc); + Oid concurrentOid = lfirst_oid(lc2); + bool primary; + + /* Move to next concurrent item */ + lc2 = lnext(lc2); + + /* Index relation has been closed by previous commit, so reopen it */ + indexRel = index_open(indOid, ShareUpdateExclusiveLock); + primary = indexRel->rd_index->indisprimary; + index_close(indexRel, ShareUpdateExclusiveLock); + + /* Perform concurrent build of new index */ + index_concurrent_build(indexRel->rd_index->indrelid, + concurrentOid, + primary); + + /* + * Update the pg_index row of the concurrent index as ready for inserts. + * Once we commit this transaction, any new transactions that open the table + * must insert new entries into the index for insertions and non-HOT updates. + */ + index_set_state_flags(concurrentOid, INDEX_CREATE_SET_READY); + } + + /* we can do away with our snapshot */ + PopActiveSnapshot(); + + /* + * Commit this transaction to make the indisready update visible for + * concurrent index. + */ + CommitTransactionCommand(); + StartTransactionCommand(); + + /* + * Phase 3 of REINDEX CONCURRENTLY + * + * During this phase the concurrent indexes catch up with the INSERT that + * might have occurred in the parent table and are marked as valid once done. + * + * We once again wait until no transaction can have the table open with + * the index marked as read-only for updates. + */ + WaitForVirtualLocks(heapLocktag, ShareLock); + + /* + * Take the reference snapshot that will be used for the concurrent indexes + * validation. + */ + snapshot = RegisterSnapshot(GetTransactionSnapshot()); + PushActiveSnapshot(snapshot); + + /* + * Perform a scan of each concurrent index with the heap, then insert + * any missing index entries. + */ + foreach(lc, concurrentIndexIds) + { + Oid indOid = lfirst_oid(lc); + Oid relOid; + Relation indexRelation = index_open(indOid, ShareUpdateExclusiveLock); + relOid = indexRelation->rd_index->indrelid; + index_close(indexRelation, ShareUpdateExclusiveLock); + + /* Validate index, which might be a toast */ + validate_index(relOid, lfirst_oid(lc), snapshot); + } + + /* + * Concurrent indexes can now be marked valid -- update pg_index entries + */ + foreach(lc, concurrentIndexIds) + index_set_state_flags(lfirst_oid(lc), INDEX_CREATE_SET_VALID); + + /* + * The concurrent indexes are now valid as they contain all the tuples + * necessary. However, it might not have taken into account deleted tuples + * before the reference snapshot was taken, so we need to wait for the + * transactions that might have older snapshots than ours. + */ + WaitForOldSnapshots(snapshot); + + /* + * The pg_index update will cause backends to update its entries for the + * concurrent index but it is necessary to do the same whing + */ + CacheInvalidateRelcacheByRelid(heapLockId.relId); + + /* we can now do away with our active snapshot */ + PopActiveSnapshot(); + + /* And we can remove the validating snapshot too */ + UnregisterSnapshot(snapshot); + + /* Commit this transaction to make the concurrent index valid */ + CommitTransactionCommand(); + + /* + * Phase 4 of REINDEX CONCURRENTLY + * + * Now that the concurrent indexes are valid and can be used, we need to + * swap each concurrent index with its corresponding old index. The old + * index is marked as invalid once this is done, making it not usable + * by other backends once its associated transaction is committed. + */ + + /* Get the first element is concurrent index list */ + lc2 = list_head(concurrentIndexIds); + + /* Swap and mark all the indexes involved in the relation */ + foreach(lc, realIndexIds) + { + Oid indOid = lfirst_oid(lc); + Oid concurrentOid = lfirst_oid(lc2); + Relation indexRel, indexParentRel; + + /* Move to next concurrent item */ + lc2 = lnext(lc2); + + /* + * Each index needs to be swapped in a separate transaction, so start + * a new one. + */ + StartTransactionCommand(); + + /* + * Mark the old index as invalid, this needs to be done as the first + * action in this transaction. + */ + index_set_state_flags(indOid, INDEX_DROP_CLEAR_VALID); + + /* Swap old index and its concurrent */ + index_concurrent_swap(concurrentOid, indOid); + + /* + * Mark the cache of associated relation as invalid, open relation + * relations. + */ + indexRel = index_open(indOid, ShareUpdateExclusiveLock); + indexParentRel = heap_open(indexRel->rd_index->indrelid, + ShareUpdateExclusiveLock); + + /* + * Invalidate the relcache for the table, so that after this commit + * all sessions will refresh any cached plans that might reference the + * index. + */ + CacheInvalidateRelcache(indexParentRel); + + /* Close relations opened previously for cache invalidation */ + index_close(indexRel, ShareUpdateExclusiveLock); + heap_close(indexParentRel, ShareUpdateExclusiveLock); + + /* Commit this transaction and make old index invalidation visible */ + CommitTransactionCommand(); + } + + /* Continue process inside a new transaction block */ + StartTransactionCommand(); + + /* + * Phase 5 of REINDEX CONCURRENTLY + * + * The old indexes need to be marked as not ready. We need also to wait for + * transactions that might use them. + */ + WaitForVirtualLocks(heapLocktag, ShareLock); + + /* Get fresh snapshot for this step */ + PushActiveSnapshot(GetTransactionSnapshot()); + + /* Mark the old indexes as not ready */ + foreach(lc, realIndexIds) + index_set_state_flags(lfirst_oid(lc), INDEX_DROP_SET_DEAD); + + /* We can do away with our snapshot */ + PopActiveSnapshot(); + + /* + * Commit this transaction to make the indisready update visible. + */ + CommitTransactionCommand(); + StartTransactionCommand(); + + /* Get fresh snapshot for next step */ + PushActiveSnapshot(GetTransactionSnapshot()); + + /* + * Phase 6 of REINDEX CONCURRENTLY + * + * Drop the old indexes. This needs to be done through performDeletion + * or related dependencies will not be dropped for the old indexes. + */ + index_concurrent_drop(realIndexIds); + + /* + * Last thing to do is release the session-level lock on the parent table + * and the indexes of table. + */ + UnlockRelationIdForSession(&heapLockId, ShareUpdateExclusiveLock); + foreach(lc, indexLocks) + { + LockRelId lockRel = * (LockRelId *) lfirst(lc); + UnlockRelationIdForSession(&lockRel, ShareUpdateExclusiveLock); + } + + /* We can do away with our snapshot */ + PopActiveSnapshot(); + + return true; +} + + +/* * CheckMutability * Test whether given expression is mutable */ @@ -1534,7 +1877,8 @@ ChooseRelationName(const char *name1, const char *name2, static char * ChooseIndexName(const char *tabname, Oid namespaceId, List *colnames, List *exclusionOpNames, - bool primary, bool isconstraint) + bool primary, bool isconstraint, + bool concurrent) { char *indexname; @@ -1560,6 +1904,13 @@ ChooseIndexName(const char *tabname, Oid namespaceId, "key", namespaceId); } + else if (concurrent) + { + indexname = ChooseRelationName(tabname, + NULL, + "cct", + namespaceId); + } else { indexname = ChooseRelationName(tabname, @@ -1672,18 +2023,26 @@ ChooseIndexColumnNames(List *indexElems) * Recreate a specific index. */ void -ReindexIndex(RangeVar *indexRelation) +ReindexIndex(RangeVar *indexRelation, bool concurrent) { Oid indOid; Oid heapOid = InvalidOid; - /* lock level used here should match index lock reindex_index() */ - indOid = RangeVarGetRelidExtended(indexRelation, AccessExclusiveLock, - false, false, - RangeVarCallbackForReindexIndex, - (void *) &heapOid); + indOid = RangeVarGetRelidExtended(indexRelation, + concurrent ? ShareUpdateExclusiveLock : AccessExclusiveLock, + false, false, + RangeVarCallbackForReindexIndex, + (void *) &heapOid); - reindex_index(indOid, false); + /* This is all for the non-concurrent case */ + if (!concurrent) + { + reindex_index(indOid, false); + return; + } + + /* Continue through REINDEX CONCURRENTLY */ + ReindexConcurrentIndexes(heapOid, list_make1_oid(indOid)); } /* @@ -1745,18 +2104,30 @@ RangeVarCallbackForReindexIndex(const RangeVar *relation, } } + /* * ReindexTable * Recreate all indexes of a table (and of its toast table, if any) */ void -ReindexTable(RangeVar *relation) +ReindexTable(RangeVar *relation, bool concurrent) { Oid heapOid; /* The lock level used here should match reindex_relation(). */ - heapOid = RangeVarGetRelidExtended(relation, ShareLock, false, false, - RangeVarCallbackOwnsTable, NULL); + heapOid = RangeVarGetRelidExtended(relation, + concurrent ? ShareUpdateExclusiveLock : ShareLock, + false, false, + RangeVarCallbackOwnsTable, NULL); + + /* Run through the concurrent process if necessary */ + if (concurrent && !ReindexConcurrentIndexes(heapOid, NIL)) + { + ereport(NOTICE, + (errmsg("table \"%s\" has no indexes", + relation->relname))); + return; + } if (!reindex_relation(heapOid, REINDEX_REL_PROCESS_TOAST)) ereport(NOTICE, @@ -1773,7 +2144,10 @@ ReindexTable(RangeVar *relation) * That means this must not be called within a user transaction block! */ void -ReindexDatabase(const char *databaseName, bool do_system, bool do_user) +ReindexDatabase(const char *databaseName, + bool do_system, + bool do_user, + bool concurrent) { Relation relationRelation; HeapScanDesc scan; @@ -1785,6 +2159,12 @@ ReindexDatabase(const char *databaseName, bool do_system, bool do_user) AssertArg(databaseName); + /* CONCURRENTLY operation is not allowed for a database */ + if (concurrent && do_system) + ereport(ERROR, + (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), + errmsg("cannot reindex system concurrently"))); + if (strcmp(databaseName, get_database_name(MyDatabaseId)) != 0) ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c index 9387ee9..0685ae4 100644 --- a/src/backend/nodes/copyfuncs.c +++ b/src/backend/nodes/copyfuncs.c @@ -3601,6 +3601,7 @@ _copyReindexStmt(const ReindexStmt *from) COPY_STRING_FIELD(name); COPY_SCALAR_FIELD(do_system); COPY_SCALAR_FIELD(do_user); + COPY_SCALAR_FIELD(concurrent); return newnode; } diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c index 95a95f4..cdea86a 100644 --- a/src/backend/nodes/equalfuncs.c +++ b/src/backend/nodes/equalfuncs.c @@ -1840,6 +1840,7 @@ _equalReindexStmt(const ReindexStmt *a, const ReindexStmt *b) COMPARE_STRING_FIELD(name); COMPARE_SCALAR_FIELD(do_system); COMPARE_SCALAR_FIELD(do_user); + COMPARE_SCALAR_FIELD(concurrent); return true; } diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index ad98b36..db3a5f8 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -6670,15 +6670,16 @@ opt_if_exists: IF_P EXISTS { $$ = TRUE; } *****************************************************************************/ ReindexStmt: - REINDEX reindex_type qualified_name opt_force + REINDEX reindex_type qualified_name opt_force opt_concurrently { ReindexStmt *n = makeNode(ReindexStmt); n->kind = $2; n->relation = $3; n->name = NULL; + n->concurrent = $5; $$ = (Node *)n; } - | REINDEX SYSTEM_P name opt_force + | REINDEX SYSTEM_P name opt_force opt_concurrently { ReindexStmt *n = makeNode(ReindexStmt); n->kind = OBJECT_DATABASE; @@ -6686,9 +6687,10 @@ ReindexStmt: n->relation = NULL; n->do_system = true; n->do_user = false; + n->concurrent = $5; $$ = (Node *)n; } - | REINDEX DATABASE name opt_force + | REINDEX DATABASE name opt_force opt_concurrently { ReindexStmt *n = makeNode(ReindexStmt); n->kind = OBJECT_DATABASE; @@ -6696,6 +6698,7 @@ ReindexStmt: n->relation = NULL; n->do_system = true; n->do_user = true; + n->concurrent = $5; $$ = (Node *)n; } ; diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c index 94f58a9..40dedde 100644 --- a/src/backend/storage/ipc/procarray.c +++ b/src/backend/storage/ipc/procarray.c @@ -2528,6 +2528,114 @@ XidCacheRemoveRunningXids(TransactionId xid, LWLockRelease(ProcArrayLock); } + +/* + * WaitForVirtualLocks + * + * Wait until no transaction can have the table open with the index marked as + * read-only for updates. + * To do this, inquire which xacts currently would conflict with ShareLock on + * the table referred by the LOCKTAG -- ie, which ones have a lock that permits + * writing the table. Then wait for each of these xacts to commit or abort. + * Note: GetLockConflicts() never reports our own xid, hence we need not + * check for that. Also, prepared xacts are not reported, which is fine + * since they certainly aren't going to do anything more. + */ +void +WaitForVirtualLocks(LOCKTAG heaplocktag, LOCKMODE lockmode) +{ + VirtualTransactionId *old_lockholders; + + old_lockholders = GetLockConflicts(&heaplocktag, lockmode); + + while (VirtualTransactionIdIsValid(*old_lockholders)) + { + VirtualXactLock(*old_lockholders, true); + old_lockholders++; + } +} + + +/* + * WaitForOldSnapshots + * + * Wait for transactions that might have older snapshot than the given one, + * because is might not contain tuples deleted just before it has been taken. + * Obtain a list of VXIDs of such transactions, and wait for them + * individually. + * + * We can exclude any running transactions that have xmin > the xmin of + * our reference snapshot; their oldest snapshot must be newer than ours. + * We can also exclude any transactions that have xmin = zero, since they + * evidently have no live snapshot at all (and any one they might be in + * process of taking is certainly newer than ours). Transactions in other + * DBs can be ignored too, since they'll never even be able to see this + * index. + * + * We can also exclude autovacuum processes and processes running manual + * lazy VACUUMs, because they won't be fazed by missing index entries + * either. (Manual ANALYZEs, however, can't be excluded because they + * might be within transactions that are going to do arbitrary operations + * later.) + * + * Also, GetCurrentVirtualXIDs never reports our own vxid, so we need not + * check for that. + * + * If a process goes idle-in-transaction with xmin zero, we do not need to + * wait for it anymore, per the above argument. We do not have the + * infrastructure right now to stop waiting if that happens, but we can at + * least avoid the folly of waiting when it is idle at the time we would + * begin to wait. We do this by repeatedly rechecking the output of + * GetCurrentVirtualXIDs. If, during any iteration, a particular vxid + * doesn't show up in the output, we know we can forget about it. + */ +void +WaitForOldSnapshots(Snapshot snapshot) +{ + int i, n_old_snapshots; + VirtualTransactionId *old_snapshots; + + old_snapshots = GetCurrentVirtualXIDs(snapshot->xmin, true, false, + PROC_IS_AUTOVACUUM | PROC_IN_VACUUM, + &n_old_snapshots); + + for (i = 0; i < n_old_snapshots; i++) + { + if (!VirtualTransactionIdIsValid(old_snapshots[i])) + continue; /* found uninteresting in previous cycle */ + + if (i > 0) + { + /* see if anything's changed ... */ + VirtualTransactionId *newer_snapshots; + int n_newer_snapshots, j, k; + + newer_snapshots = GetCurrentVirtualXIDs(snapshot->xmin, + true, false, + PROC_IS_AUTOVACUUM | PROC_IN_VACUUM, + &n_newer_snapshots); + for (j = i; j < n_old_snapshots; j++) + { + if (!VirtualTransactionIdIsValid(old_snapshots[j])) + continue; /* found uninteresting in previous cycle */ + for (k = 0; k < n_newer_snapshots; k++) + { + if (VirtualTransactionIdEquals(old_snapshots[j], + newer_snapshots[k])) + break; + } + if (k >= n_newer_snapshots) /* not there anymore */ + SetInvalidVirtualTransactionId(old_snapshots[j]); + } + pfree(newer_snapshots); + } + + if (VirtualTransactionIdIsValid(old_snapshots[i])) + VirtualXactLock(old_snapshots[i], true); + } +} + + #ifdef XIDCACHE_DEBUG /* diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c index a42b8e9..9424140 100644 --- a/src/backend/tcop/utility.c +++ b/src/backend/tcop/utility.c @@ -1255,15 +1255,19 @@ standard_ProcessUtility(Node *parsetree, { ReindexStmt *stmt = (ReindexStmt *) parsetree; + if (stmt->concurrent) + PreventTransactionChain(isTopLevel, + "REINDEX CONCURRENTLY"); + /* we choose to allow this during "read only" transactions */ PreventCommandDuringRecovery("REINDEX"); switch (stmt->kind) { case OBJECT_INDEX: - ReindexIndex(stmt->relation); + ReindexIndex(stmt->relation, stmt->concurrent); break; case OBJECT_TABLE: - ReindexTable(stmt->relation); + ReindexTable(stmt->relation, stmt->concurrent); break; case OBJECT_DATABASE: @@ -1275,8 +1279,8 @@ standard_ProcessUtility(Node *parsetree, */ PreventTransactionChain(isTopLevel, "REINDEX DATABASE"); - ReindexDatabase(stmt->name, - stmt->do_system, stmt->do_user); + ReindexDatabase(stmt->name, stmt->do_system, + stmt->do_user, stmt->concurrent); break; default: elog(ERROR, "unrecognized object type: %d", diff --git a/src/include/catalog/index.h b/src/include/catalog/index.h index b96099f..539fc0a 100644 --- a/src/include/catalog/index.h +++ b/src/include/catalog/index.h @@ -60,7 +60,20 @@ extern Oid index_create(Relation heapRelation, bool allow_system_table_mods, bool skip_build, bool concurrent, - bool is_internal); + bool is_internal, + bool is_reindex); + +extern Oid index_concurrent_create(Relation heapRelation, + Oid indOid, + char *concurrentName); + +extern void index_concurrent_build(Oid heapOid, + Oid indexOid, + bool isprimary); + +extern void index_concurrent_swap(Oid indexOid1, Oid indexOid2); + +extern void index_concurrent_drop(List *IndexIds); extern void index_constraint_create(Relation heapRelation, Oid indexRelationId, diff --git a/src/include/commands/defrem.h b/src/include/commands/defrem.h index 2c81b78..43dfa15 100644 --- a/src/include/commands/defrem.h +++ b/src/include/commands/defrem.h @@ -26,10 +26,11 @@ extern Oid DefineIndex(IndexStmt *stmt, bool check_rights, bool skip_build, bool quiet); -extern void ReindexIndex(RangeVar *indexRelation); -extern void ReindexTable(RangeVar *relation); +extern void ReindexIndex(RangeVar *indexRelation, bool concurrent); +extern void ReindexTable(RangeVar *relation, bool concurrent); extern void ReindexDatabase(const char *databaseName, - bool do_system, bool do_user); + bool do_system, bool do_user, bool concurrent); +extern bool ReindexConcurrentIndexes(Oid heapOid, List *indexIds); extern char *makeObjectName(const char *name1, const char *name2, const char *label); extern char *ChooseRelationName(const char *name1, const char *name2, diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index 8834499..46bc532 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -2511,6 +2511,7 @@ typedef struct ReindexStmt const char *name; /* name of database to reindex */ bool do_system; /* include system tables in database case */ bool do_user; /* include user tables in database case */ + bool concurrent; /* reindex concurrently? */ } ReindexStmt; /* ---------------------- diff --git a/src/include/storage/procarray.h b/src/include/storage/procarray.h index 9933dad..2e2d9dc 100644 --- a/src/include/storage/procarray.h +++ b/src/include/storage/procarray.h @@ -76,4 +76,7 @@ extern void XidCacheRemoveRunningXids(TransactionId xid, int nxids, const TransactionId *xids, TransactionId latestXid); +extern void WaitForVirtualLocks(LOCKTAG heaplocktag, LOCKMODE lockmode); +extern void WaitForOldSnapshots(Snapshot snapshot); + #endif /* PROCARRAY_H */ diff --git a/src/test/regress/expected/create_index.out b/src/test/regress/expected/create_index.out index 2ae991e..26bd952 100644 --- a/src/test/regress/expected/create_index.out +++ b/src/test/regress/expected/create_index.out @@ -2721,3 +2721,43 @@ ORDER BY thousand; 1 | 1001 (2 rows) +-- +-- Check behavior of REINDEX and REINDEX CONCURRENTLY +-- +CREATE TABLE concur_reindex_tab (c1 int); +-- REINDEX +REINDEX TABLE concur_reindex_tab; -- notice +NOTICE: table "concur_reindex_tab" has no indexes +REINDEX TABLE concur_reindex_tab CONCURRENTLY; -- notice +NOTICE: table "concur_reindex_tab" has no indexes +ALTER TABLE concur_reindex_tab ADD COLUMN c2 text; -- add toast index +CREATE INDEX concur_reindex_tab1 ON concur_reindex_tab(c1); +CREATE INDEX concur_reindex_tab2 ON concur_reindex_tab(c2); +INSERT INTO concur_reindex_tab VALUES (1, 'a'); +INSERT INTO concur_reindex_tab VALUES (2, 'a'); +REINDEX INDEX concur_reindex_tab1 CONCURRENTLY; +REINDEX TABLE concur_reindex_tab CONCURRENTLY; +-- Check errors +-- Cannot run inside a transaction block +BEGIN; +REINDEX TABLE concur_reindex_tab CONCURRENTLY; +ERROR: REINDEX CONCURRENTLY cannot run inside a transaction block +COMMIT; +REINDEX TABLE pg_database CONCURRENTLY; -- no shared relation +ERROR: concurrent reindex is not supported for shared relations +REINDEX DATABASE postgres CONCURRENTLY; -- not allowed for DATABASE +ERROR: cannot reindex system concurrently +REINDEX SYSTEM postgres CONCURRENTLY; -- not allowed for SYSTEM +ERROR: cannot reindex system concurrently +-- Check the relation status, there should not be invalid indexes +\d concur_reindex_tab +Table "public.concur_reindex_tab" + Column | Type | Modifiers +--------+---------+----------- + c1 | integer | + c2 | text | +Indexes: + "concur_reindex_tab1" btree (c1) + "concur_reindex_tab2" btree (c2) + +DROP TABLE concur_reindex_tab; diff --git a/src/test/regress/sql/create_index.sql b/src/test/regress/sql/create_index.sql index 914e7a5..be9c5cc 100644 --- a/src/test/regress/sql/create_index.sql +++ b/src/test/regress/sql/create_index.sql @@ -912,3 +912,31 @@ ORDER BY thousand; SELECT thousand, tenthous FROM tenk1 WHERE thousand < 2 AND tenthous IN (1001,3000) ORDER BY thousand; + +-- +-- Check behavior of REINDEX and REINDEX CONCURRENTLY +-- +CREATE TABLE concur_reindex_tab (c1 int); +-- REINDEX +REINDEX TABLE concur_reindex_tab; -- notice +REINDEX TABLE concur_reindex_tab CONCURRENTLY; -- notice +ALTER TABLE concur_reindex_tab ADD COLUMN c2 text; -- add toast index +CREATE INDEX concur_reindex_tab1 ON concur_reindex_tab(c1); +CREATE INDEX concur_reindex_tab2 ON concur_reindex_tab(c2); +INSERT INTO concur_reindex_tab VALUES (1, 'a'); +INSERT INTO concur_reindex_tab VALUES (2, 'a'); +REINDEX INDEX concur_reindex_tab1 CONCURRENTLY; +REINDEX TABLE concur_reindex_tab CONCURRENTLY; + +-- Check errors +-- Cannot run inside a transaction block +BEGIN; +REINDEX TABLE concur_reindex_tab CONCURRENTLY; +COMMIT; +REINDEX TABLE pg_database CONCURRENTLY; -- no shared relation +REINDEX DATABASE postgres CONCURRENTLY; -- not allowed for DATABASE +REINDEX SYSTEM postgres CONCURRENTLY; -- not allowed for SYSTEM + +-- Check the relation status, there should not be invalid indexes +\d concur_reindex_tab +DROP TABLE concur_reindex_tab;